diff --git a/.hgtags b/.hgtags index df941df95c2..cb3ba5ed43e 100644 --- a/.hgtags +++ b/.hgtags @@ -268,3 +268,4 @@ c5495e25c7258ab5f96a1ae14610887d76d2be63 jdk9-b18 39cfdc2dcaf3f195c55398e4e677ab053b07e3d2 jdk9-b23 d9ce05f36ffec3e5e8af62a92455c1c66a63c320 jdk9-b24 13a5c76976fe48e55c9727c25fae2d2ce7c05da0 jdk9-b25 +cd6f4557e7fea5799ff3762ed7a80a743e75d5fd jdk9-b26 diff --git a/.hgtags-top-repo b/.hgtags-top-repo index fe5540a5d8e..d0fc930890e 100644 --- a/.hgtags-top-repo +++ b/.hgtags-top-repo @@ -268,3 +268,4 @@ ee4fd72b2ec3d92497f37163352f294aa695c6fb jdk9-b20 88567461a2cd9b7fb431fee6440005a694df1f47 jdk9-b23 1d4a293fbec19dc2d5790bbb2c7dd0ed8f265484 jdk9-b24 aefd8899a8d6615fb34ba99b2e38996a7145baa8 jdk9-b25 +d3ec8d048e6c3c46b6e0ee011cc551ad386dfba5 jdk9-b26 diff --git a/Makefile b/Makefile index 7fe922ba458..1e574940964 100644 --- a/Makefile +++ b/Makefile @@ -58,29 +58,70 @@ $(eval $(call ParseConfAndSpec)) ifeq ($(SPEC),) # Since we got past ParseConfAndSpec, we must be building a global target. Do nothing. else - ifeq ($(words $(SPEC)),1) - # We are building a single configuration. This is the normal case. Execute the Main.gmk file. - include $(root_dir)/make/Main.gmk - else - # We are building multiple configurations. - # First, find out the valid targets - # Run the makefile with an arbitrary SPEC using -p -q (quiet dry-run and dump rules) to find - # available PHONY targets. Use this list as valid targets to pass on to the repeated calls. - all_phony_targets=$(filter-out $(global_targets), $(strip $(shell \ - cd $(root_dir) && $(MAKE) -p -q FRC SPEC=$(firstword $(SPEC)) | \ - grep ^.PHONY: | head -n 1 | cut -d " " -f 2-))) - - $(all_phony_targets): - @$(foreach spec,$(SPEC),(cd $(root_dir) && $(MAKE) SPEC=$(spec) \ - $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $@) &&) true - - .PHONY: $(all_phony_targets) - + # In Cygwin, the MAKE variable gets messed up if the make executable is called with + # a Windows mixed path (c:/cygwin/bin/make.exe). If that's the case, fix it by removing + # the prepended root_dir. + ifneq ($(findstring :, $(MAKE)), ) + MAKE := $(patsubst $(root_dir)%, %, $(MAKE)) endif + + # We are potentially building multiple configurations. + # First, find out the valid targets + # Run the makefile with an arbitrary SPEC using -p -q (quiet dry-run and dump rules) to find + # available PHONY targets. Use this list as valid targets to pass on to the repeated calls. + all_phony_targets := $(sort $(filter-out $(global_targets), $(strip $(shell \ + cd $(root_dir)/make && $(MAKE) -f Main.gmk -p -q FRC SPEC=$(firstword $(SPEC)) | \ + grep "^.PHONY:" | head -n 1 | cut -d " " -f 2-)))) + + # Loop through the configurations and call the main-wrapper for each one. The wrapper + # target will execute with a single configuration loaded. + $(all_phony_targets): + @$(if $(TARGET_RUN),,\ + $(foreach spec,$(SPEC),\ + (cd $(root_dir) && $(MAKE) SPEC=$(spec) MAIN_TARGETS="$(call GetRealTarget)" \ + $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) main-wrapper) &&) true) + @echo > /dev/null + $(eval TARGET_RUN=true) + + .PHONY: $(all_phony_targets) + + ifneq ($(MAIN_TARGETS), ) + # The wrapper target was called so we now have a single configuration. Load the spec file + # and call the real Main.gmk. + include $(SPEC) + + ### Clean up from previous run + # Remove any build.log from a previous run, if they exist + ifneq (,$(BUILD_LOG)) + ifneq (,$(BUILD_LOG_PREVIOUS)) + # Rotate old log + $(shell $(RM) $(BUILD_LOG_PREVIOUS) 2> /dev/null) + $(shell $(MV) $(BUILD_LOG) $(BUILD_LOG_PREVIOUS) 2> /dev/null) + else + $(shell $(RM) $(BUILD_LOG) 2> /dev/null) + endif + $(shell $(RM) $(OUTPUT_ROOT)/build-trace-time.log 2> /dev/null) + endif + # Remove any javac server logs and port files. This + # prevents a new make run to reuse the previous servers. + ifneq (,$(SJAVAC_SERVER_DIR)) + $(shell $(MKDIR) -p $(SJAVAC_SERVER_DIR) && $(RM) -rf $(SJAVAC_SERVER_DIR)/*) + endif + + main-wrapper: + @$(if $(findstring clean, $(MAIN_TARGETS)), , $(call AtMakeStart)) + (cd $(root_dir)/make && $(BUILD_LOG_WRAPPER) $(MAKE) -f Main.gmk SPEC=$(SPEC) -j $(JOBS) \ + $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $(MAIN_TARGETS) \ + $(if $(filter true, $(OUTPUT_SYNC_SUPPORTED)), -O$(OUTPUT_SYNC))) + @$(if $(findstring clean, $(MAIN_TARGETS)), , $(call AtMakeEnd)) + + .PHONY: main-wrapper + + endif endif # Here are "global" targets, i.e. targets that can be executed without specifying a single configuration. -# If you addd more global targets, please update the variable global_targets in MakeHelpers. +# If you add more global targets, please update the variable global_targets in MakeHelpers. help: $(info ) @@ -88,12 +129,12 @@ help: $(info =====================) $(info ) $(info Common make targets) - $(info . make [default] # Compile all product in langtools, hotspot, jaxp, jaxws,) - $(info . # corba and jdk) - $(info . make all # Compile everything, all repos and images) + $(info . make [default] # Compile all modules in langtools, hotspot, jaxp, jaxws,) + $(info . # corba and jdk and create a runnable "exploded" image) + $(info . make all # Compile everything, all repos, docs and images) $(info . make images # Create complete j2sdk and j2re images) - $(info . make docs # Create javadocs) - $(info . make overlay-images # Create limited images for sparc 64 bit platforms) + $(info . make docs # Create all docs) + $(info . make docs-javadoc # Create just javadocs, depends on less than full docs) $(info . make profiles # Create complete j2re compact profile images) $(info . make bootcycle-images # Build images twice, second time with newly build JDK) $(info . make install # Install the generated images locally) @@ -103,12 +144,18 @@ help: $(info . make help # Give some help on using make) $(info . make test # Run tests, default is all tests (see TEST below)) $(info ) - $(info Targets for specific components) - $(info (Component is any of langtools, corba, jaxp, jaxws, hotspot, jdk, nashorn, images, overlay-images, docs or test)) - $(info . make # Build and everything it depends on. ) - $(info . make -only # Build only, without dependencies. This) + $(info Targets for specific modules) + $(info . make # Build and everything it depends on. ) + $(info . make -only # Build only, without dependencies. This) $(info . # is faster but can result in incorrect build results!) - $(info . make clean- # Remove files generated by make for ) + $(info . make -java # Compile java classes for and everything it) + $(info . # depends on) + $(info . make -libs # Build native libraries for and everything it) + $(info . # depends on) + $(info . make -launchers# Build native executables for and everything it) + $(info . # depends on) + $(info . make -gensrc # Execute the gensrc step for and everything it) + $(info . # depends on) $(info ) $(info Useful make variables) $(info . make CONF= # Build all configurations (note, assignment is empty)) diff --git a/common/autoconf/basics.m4 b/common/autoconf/basics.m4 index 00ee498ed82..79d54a231ee 100644 --- a/common/autoconf/basics.m4 +++ b/common/autoconf/basics.m4 @@ -759,6 +759,32 @@ AC_DEFUN([BASIC_CHECK_MAKE_VERSION], fi ]) +AC_DEFUN([BASIC_CHECK_MAKE_OUTPUT_SYNC], +[ + # Check if make supports the output sync option and if so, setup using it. + AC_MSG_CHECKING([if make --output-sync is supported]) + if $MAKE --version -O > /dev/null 2>&1; then + OUTPUT_SYNC_SUPPORTED=true + AC_MSG_RESULT([yes]) + AC_MSG_CHECKING([for output-sync value]) + AC_ARG_WITH([output-sync], [AS_HELP_STRING([--with-output-sync], + [set make output sync type if supported by make. @<:@recurse@:>@])], + [OUTPUT_SYNC=$with_output_sync]) + if test "x$OUTPUT_SYNC" = "x"; then + OUTPUT_SYNC=none + fi + AC_MSG_RESULT([$OUTPUT_SYNC]) + if ! $MAKE --version -O$OUTPUT_SYNC > /dev/null 2>&1; then + AC_MSG_ERROR([Make did not the support the value $OUTPUT_SYNC as output sync type.]) + fi + else + OUTPUT_SYNC_SUPPORTED=false + AC_MSG_RESULT([no]) + fi + AC_SUBST(OUTPUT_SYNC_SUPPORTED) + AC_SUBST(OUTPUT_SYNC) +]) + # Goes looking for a usable version of GNU make. AC_DEFUN([BASIC_CHECK_GNU_MAKE], [ @@ -805,6 +831,8 @@ AC_DEFUN([BASIC_CHECK_GNU_MAKE], MAKE=$FOUND_MAKE AC_SUBST(MAKE) AC_MSG_NOTICE([Using GNU make 3.81 (or later) at $FOUND_MAKE (version: $MAKE_VERSION_STRING)]) + + BASIC_CHECK_MAKE_OUTPUT_SYNC ]) AC_DEFUN([BASIC_CHECK_FIND_DELETE], diff --git a/common/autoconf/boot-jdk.m4 b/common/autoconf/boot-jdk.m4 index 6cd88e8d394..872e33fb609 100644 --- a/common/autoconf/boot-jdk.m4 +++ b/common/autoconf/boot-jdk.m4 @@ -401,4 +401,10 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS], JAVA_FLAGS_SMALL=$boot_jdk_jvmargs_small AC_SUBST(JAVA_FLAGS_SMALL) + + JAVA_TOOL_FLAGS_SMALL="" + for f in $JAVA_FLAGS_SMALL; do + JAVA_TOOL_FLAGS_SMALL="$JAVA_TOOL_FLAGS_SMALL -J$f" + done + AC_SUBST(JAVA_TOOL_FLAGS_SMALL) ]) diff --git a/common/autoconf/compare.sh.in b/common/autoconf/compare.sh.in index 6eec8fa88cc..4c6207176c5 100644 --- a/common/autoconf/compare.sh.in +++ b/common/autoconf/compare.sh.in @@ -45,7 +45,7 @@ EXPR="@EXPR@" FILE="@FILE@" FIND="@FIND@" GREP="@GREP@" -JAVAP="@FIXPATH@ @BOOT_JDK@/bin/javap" +JAVAP="@FIXPATH@ @BOOT_JDK@/bin/javap @JAVA_TOOL_FLAGS_SMALL@" LDD="@LDD@" MKDIR="@MKDIR@" NAWK="@NAWK@" diff --git a/common/autoconf/flags.m4 b/common/autoconf/flags.m4 index 6e9789642aa..6f69f0c53a2 100644 --- a/common/autoconf/flags.m4 +++ b/common/autoconf/flags.m4 @@ -668,12 +668,9 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK], # Setup some hard coded includes COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK \ - -I${JDK_OUTPUTDIR}/include \ - -I${JDK_OUTPUTDIR}/include/$OPENJDK_TARGET_OS \ - -I${JDK_TOPDIR}/src/share/javavm/export \ - -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_EXPORT_DIR/javavm/export \ - -I${JDK_TOPDIR}/src/share/native/common \ - -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_API_DIR/native/common" + -I${JDK_TOPDIR}/src/java.base/share/native/include \ + -I${JDK_TOPDIR}/src/java.base/$OPENJDK_TARGET_OS/native/include \ + -I${JDK_TOPDIR}/src/java.base/$OPENJDK_TARGET_OS_API_DIR/native/include" # The shared libraries are compiled using the picflag. CFLAGS_JDKLIB="$COMMON_CCXXFLAGS_JDK $CFLAGS_JDK $PICFLAG $CFLAGS_JDKLIB_EXTRA" diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index 39216b544a6..5b044dc241d 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -805,6 +805,7 @@ JAXWS_TOPDIR JAXP_TOPDIR CORBA_TOPDIR LANGTOOLS_TOPDIR +JAVA_TOOL_FLAGS_SMALL JAVA_FLAGS_SMALL JAVA_FLAGS_BIG JAVA_FLAGS @@ -865,6 +866,8 @@ LDD ZIP UNZIP FIND_DELETE +OUTPUT_SYNC +OUTPUT_SYNC_SUPPORTED MAKE CHECK_TOOLSDIR_MAKE CHECK_TOOLSDIR_GMAKE @@ -1044,6 +1047,7 @@ with_toolchain_path with_extra_path with_sdk_name with_conf_name +with_output_sync with_builddeps_conf with_builddeps_server with_builddeps_dir @@ -1881,6 +1885,8 @@ Optional Packages: --with-sdk-name use the platform SDK of the given name. [macosx] --with-conf-name use this as the name of the configuration [generated from important configuration options] + --with-output-sync set make output sync type if supported by make. + [recurse] --with-builddeps-conf use this configuration file for the builddeps --with-builddeps-server download and use build dependencies from this server url @@ -3487,6 +3493,8 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. # $2: the description on how we found this + + # Goes looking for a usable version of GNU make. @@ -4311,7 +4319,7 @@ TOOLCHAIN_DESCRIPTION_xlc="IBM XL C/C++" #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1405336663 +DATE_WHEN_GENERATED=1407143049 ############################################################################### # @@ -13924,7 +13932,7 @@ $as_echo "$COMPILE_TYPE" >&6; } # Setup OPENJDK_TARGET_OS_API_DIR, used in source paths. if test "x$OPENJDK_TARGET_OS_API" = xposix; then - OPENJDK_TARGET_OS_API_DIR="solaris" + OPENJDK_TARGET_OS_API_DIR="unix" fi if test "x$OPENJDK_TARGET_OS_API" = xwinapi; then OPENJDK_TARGET_OS_API_DIR="windows" @@ -17147,6 +17155,39 @@ $as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;} $as_echo "$as_me: Using GNU make 3.81 (or later) at $FOUND_MAKE (version: $MAKE_VERSION_STRING)" >&6;} + # Check if make supports the output sync option and if so, setup using it. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if make --output-sync is supported" >&5 +$as_echo_n "checking if make --output-sync is supported... " >&6; } + if $MAKE --version -O > /dev/null 2>&1; then + OUTPUT_SYNC_SUPPORTED=true + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for output-sync value" >&5 +$as_echo_n "checking for output-sync value... " >&6; } + +# Check whether --with-output-sync was given. +if test "${with_output_sync+set}" = set; then : + withval=$with_output_sync; OUTPUT_SYNC=$with_output_sync +fi + + if test "x$OUTPUT_SYNC" = "x"; then + OUTPUT_SYNC=none + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OUTPUT_SYNC" >&5 +$as_echo "$OUTPUT_SYNC" >&6; } + if ! $MAKE --version -O$OUTPUT_SYNC > /dev/null 2>&1; then + as_fn_error $? "Make did not the support the value $OUTPUT_SYNC as output sync type." "$LINENO" 5 + fi + else + OUTPUT_SYNC_SUPPORTED=false + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + + + + + # Test if find supports -delete { $as_echo "$as_me:${as_lineno-$LINENO}: checking if find supports -delete" >&5 @@ -19866,8 +19907,6 @@ fi if test "x$with_cacerts_file" != x; then CACERTS_FILE=$with_cacerts_file - else - CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts fi @@ -26378,6 +26417,12 @@ $as_echo "$boot_jdk_jvmargs_small" >&6; } JAVA_FLAGS_SMALL=$boot_jdk_jvmargs_small + JAVA_TOOL_FLAGS_SMALL="" + for f in $JAVA_FLAGS_SMALL; do + JAVA_TOOL_FLAGS_SMALL="$JAVA_TOOL_FLAGS_SMALL -J$f" + done + + ############################################################################### # @@ -42285,12 +42330,9 @@ fi # Setup some hard coded includes COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK \ - -I${JDK_OUTPUTDIR}/include \ - -I${JDK_OUTPUTDIR}/include/$OPENJDK_TARGET_OS \ - -I${JDK_TOPDIR}/src/share/javavm/export \ - -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_EXPORT_DIR/javavm/export \ - -I${JDK_TOPDIR}/src/share/native/common \ - -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_API_DIR/native/common" + -I${JDK_TOPDIR}/src/java.base/share/native/include \ + -I${JDK_TOPDIR}/src/java.base/$OPENJDK_TARGET_OS/native/include \ + -I${JDK_TOPDIR}/src/java.base/$OPENJDK_TARGET_OS_API_DIR/native/include" # The shared libraries are compiled using the picflag. CFLAGS_JDKLIB="$COMMON_CCXXFLAGS_JDK $CFLAGS_JDK $PICFLAG $CFLAGS_JDKLIB_EXTRA" @@ -49120,7 +49162,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking if elliptic curve crypto implementation is present" >&5 $as_echo_n "checking if elliptic curve crypto implementation is present... " >&6; } - if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then + if test -d "${SRC_ROOT}/jdk/src/jdk.crypto.ec/share/native/libsunec/impl"; then ENABLE_INTREE_EC=yes { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } diff --git a/common/autoconf/jdk-options.m4 b/common/autoconf/jdk-options.m4 index 75affdeeeef..f3dca31575d 100644 --- a/common/autoconf/jdk-options.m4 +++ b/common/autoconf/jdk-options.m4 @@ -414,8 +414,6 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS], [specify alternative cacerts file])]) if test "x$with_cacerts_file" != x; then CACERTS_FILE=$with_cacerts_file - else - CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts fi AC_SUBST(CACERTS_FILE) @@ -441,7 +439,7 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS], [ AC_MSG_CHECKING([if elliptic curve crypto implementation is present]) - if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then + if test -d "${SRC_ROOT}/jdk/src/jdk.crypto.ec/share/native/libsunec/impl"; then ENABLE_INTREE_EC=yes AC_MSG_RESULT([yes]) else diff --git a/common/autoconf/platform.m4 b/common/autoconf/platform.m4 index 54838a3e72c..ead832d5050 100644 --- a/common/autoconf/platform.m4 +++ b/common/autoconf/platform.m4 @@ -331,7 +331,7 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS], # Setup OPENJDK_TARGET_OS_API_DIR, used in source paths. if test "x$OPENJDK_TARGET_OS_API" = xposix; then - OPENJDK_TARGET_OS_API_DIR="solaris" + OPENJDK_TARGET_OS_API_DIR="unix" fi if test "x$OPENJDK_TARGET_OS_API" = xwinapi; then OPENJDK_TARGET_OS_API_DIR="windows" diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in index bc916f636c3..315c10615e4 100644 --- a/common/autoconf/spec.gmk.in +++ b/common/autoconf/spec.gmk.in @@ -74,6 +74,9 @@ ifeq (,$(findstring -I @TOPDIR@/make/common,$(MAKE))) MAKE:=$(MAKE) -I @TOPDIR@/make/common endif +OUTPUT_SYNC_SUPPORTED:=@OUTPUT_SYNC_SUPPORTED@ +OUTPUT_SYNC:=@OUTPUT_SYNC@ + # The "human readable" name of this configuration CONF_NAME:=@CONF_NAME@ @@ -240,6 +243,7 @@ HOTSPOT_OUTPUTDIR=$(BUILD_OUTPUT)/hotspot JDK_OUTPUTDIR=$(BUILD_OUTPUT)/jdk NASHORN_OUTPUTDIR=$(BUILD_OUTPUT)/nashorn IMAGES_OUTPUTDIR=$(BUILD_OUTPUT)/images +TESTMAKE_OUTPUTDIR=$(BUILD_OUTPUT)/testmake LANGTOOLS_DIST=$(LANGTOOLS_OUTPUTDIR)/dist CORBA_DIST=$(CORBA_OUTPUTDIR)/dist @@ -446,6 +450,7 @@ POST_MCS_CMD:=@POST_MCS_CMD@ JAVA_FLAGS:=@JAVA_FLAGS@ JAVA_FLAGS_BIG:=@JAVA_FLAGS_BIG@ JAVA_FLAGS_SMALL:=@JAVA_FLAGS_SMALL@ +JAVA_TOOL_FLAGS_SMALL:=@JAVA_TOOL_FLAGS_SMALL@ JAVA=@FIXPATH@ @JAVA@ $(JAVA_FLAGS_BIG) $(JAVA_FLAGS) JAVA_SMALL=@FIXPATH@ @JAVA@ $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS) @@ -459,7 +464,7 @@ JAVAH:=@FIXPATH@ @JAVAH@ JAR:=@FIXPATH@ @JAR@ -NATIVE2ASCII:=@FIXPATH@ @NATIVE2ASCII@ $(addprefix -J, $(JAVA_FLAGS_SMALL)) +NATIVE2ASCII:=@FIXPATH@ @NATIVE2ASCII@ $(JAVA_TOOL_FLAGS_SMALL) JARSIGNER:=@FIXPATH@ @JARSIGNER@ diff --git a/common/bin/compare.sh b/common/bin/compare.sh index ff88bb1fbb9..31ec560dd16 100644 --- a/common/bin/compare.sh +++ b/common/bin/compare.sh @@ -93,14 +93,16 @@ diff_text() { fi # Ignore date strings in class files. # On Macosx the system sources for generated java classes produce different output on - # consequtive invokations seemingly randomly. + # consequtive invocations seemingly randomly. # For example a method parameter randomly named "thePoint" or "aPoint". Ignore this. + # Anonymous lambda classes get randomly assigned counters in their names. if test "x$SUFFIX" = "xclass"; then # To improve performance when large diffs are found, do a rough filtering of classes # elibeble for these exceptions if $GREP -R -e '[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}' \ -e '[0-9]\{2\}/[0-9]\{2\}/[0-9]\{4\}' \ - -e thePoint -e aPoint -e setItemsPtr ${THIS_FILE} > /dev/null; then + -e thePoint -e aPoint -e setItemsPtr \ + -e 'lambda\$[a-zA-Z0-9]*\$[0-9]' ${THIS_FILE} > /dev/null; then $JAVAP -c -constants -l -p ${OTHER_FILE} > ${OTHER_FILE}.javap $JAVAP -c -constants -l -p ${THIS_FILE} > ${THIS_FILE}.javap TMP=$($DIFF ${OTHER_FILE}.javap ${THIS_FILE}.javap | \ @@ -109,7 +111,8 @@ diff_text() { -e '/[0-9]\{2\}\/[0-9]\{2\}\/[0-9]\{4\}/d' \ -e '/[<>].*Point Lcom\/apple\/jobjc\/foundation\/NSPoint;/d' \ -e '/[<>].*public com\.apple\.jobjc\.Pointer].*public void setItemsPtr(com\.apple\.jobjc\.Pointer].*public void setItemsPtr(com\.apple\.jobjc\.Pointer].*lambda\$[a-zA-Z0-9]*\$[0-9]*/d') fi fi if test "x$SUFFIX" = "xproperties"; then @@ -122,7 +125,16 @@ diff_text() { # -e :a -e '/\\$/N; s/\\\n//; ta' \ # -e 's/^[ \t]*//;s/[ \t]*$//' \ # -e 's/\\=/=/' | LC_ALL=C $SORT > $OTHER_FILE.cleaned - TMP=$(LC_ALL=C $DIFF $OTHER_FILE.cleaned $THIS_FILE) + # Filter out date string differences. + TMP=$(LC_ALL=C $DIFF $OTHER_FILE.cleaned $THIS_FILE | \ + $GREP '^[<>]' | \ + $SED -e '/[<>].*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d') + fi + if test "x$SUFFIX" = "xMF"; then + # Filter out date string differences. + TMP=$(LC_ALL=C $DIFF $OTHER_FILE $THIS_FILE | \ + $GREP '^[<>]' | \ + $SED -e '/[<>].*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d') fi if test -n "$TMP"; then echo Files $OTHER_FILE and $THIS_FILE differ @@ -145,7 +157,7 @@ compare_dirs() { (cd $OTHER_DIR && $FIND . -type d | $SORT > $WORK_DIR/dirs_other) (cd $THIS_DIR && $FIND . -type d | $SORT > $WORK_DIR/dirs_this) - $DIFF $WORK_DIR/dirs_other $WORK_DIR/dirs_other > $WORK_DIR/dirs_diff + $DIFF $WORK_DIR/dirs_other $WORK_DIR/dirs_this > $WORK_DIR/dirs_diff echo -n Directory structure... if [ -s $WORK_DIR/dirs_diff ]; then @@ -251,8 +263,8 @@ compare_file_types() { do if [ ! -f ${OTHER_DIR}/$f ]; then continue; fi if [ ! -f ${THIS_DIR}/$f ]; then continue; fi - OF=`cd ${OTHER_DIR} && $FILE -h $f` - TF=`cd ${THIS_DIR} && $FILE -h $f` + OF=`cd ${OTHER_DIR} && $FILE -h $f | $SED 's/BuildID[^,]*//g'` + TF=`cd ${THIS_DIR} && $FILE -h $f | $SED 's/BuildID[^,]*//g'` if [ "$f" = "./src.zip" ] || [[ "$f" = *"/Home/src.zip" ]] || [[ "$f" = *"/lib/JObjC.jar" ]] then if [ "`echo $OF | $GREP -ic zip`" -gt 0 -a "`echo $TF | $GREP -ic zip`" -gt 0 ] @@ -317,12 +329,14 @@ compare_general_files() { -e 's/[A-Z][a-z]*, [A-Z][a-z]* [0-9][0-9]*, [12][0-9]* [0-9][0-9:]* [AMP]\{2,2\} [A-Z][A-Z]*/(removed)/' \ -e 's/[A-Z][a-z]* [A-Z][a-z]* [0-9][0-9] [0-9][0-9:]* [A-Z][A-Z]* [12][0-9]*/(removed)/' \ -e 's/^\( from \).*\(\.idl\)$/\1(removed)\2/' \ + -e 's/^\(.*\)\( o'"'"'clock \)\([A-Z][A-Z][A-Z]\)/(removed)\2(removed)/' \ > $OTHER_FILE $CAT $THIS_DIR/$f | $SED -e 's/\(-- Generated by javadoc \).*\( --\)/\1(removed)\2/' \ -e 's/\(\)/\1(removed)\2/' \ -e 's/[A-Z][a-z]*, [A-Z][a-z]* [0-9][0-9]*, [12][0-9]* [0-9][0-9:]* [AMP]\{2,2\} [A-Z][A-Z]*/(removed)/' \ -e 's/[A-Z][a-z]* [A-Z][a-z]* [0-9][0-9] [0-9][0-9:]* [A-Z][A-Z]* [12][0-9]*/(removed)/' \ -e 's/^\( from \).*\(\.idl\)$/\1(removed)\2/' \ + -e 's/^\(.*\)\( o'"'"'clock \)\([A-Z][A-Z][A-Z]\)/(removed)\2(removed)/' \ > $THIS_FILE else OTHER_FILE=$OTHER_DIR/$f @@ -510,7 +524,8 @@ compare_all_jar_files() { WORK_DIR=$3 # TODO filter? - ZIPS=$(cd $THIS_DIR && $FIND . -type f -name "*.jar" -o -name "*.war" | $SORT | $FILTER) + ZIPS=$(cd $THIS_DIR && $FIND . -type f -name "*.jar" -o -name "*.war" \ + | $SORT | $FILTER) if [ -n "$ZIPS" ]; then echo Jar files... @@ -538,9 +553,14 @@ compare_bin_file() { OTHER_DIR=$2 WORK_DIR=$3 BIN_FILE=$4 + OTHER_BIN_FILE=$5 THIS_FILE=$THIS_DIR/$BIN_FILE - OTHER_FILE=$OTHER_DIR/$BIN_FILE + if [ -n "$OTHER_BIN_FILE" ]; then + OTHER_FILE=$OTHER_DIR/$OTHER_BIN_FILE + else + OTHER_FILE=$OTHER_DIR/$BIN_FILE + fi NAME=$(basename $BIN_FILE) WORK_FILE_BASE=$WORK_DIR/$BIN_FILE FILE_WORK_DIR=$(dirname $WORK_FILE_BASE) @@ -970,6 +990,8 @@ if [ -z "$1" ] || [ "$1" = "-h" ] || [ "$1" = "-?" ] || [ "$1" = "/h" ] || [ "$1 echo "bash ./common/bin/compareimages.sh CodePointIM.jar" echo "" echo "-2zips Compare two zip files only" + echo "-2bins Compare two binary files only" + echo "-2dirs Compare two directories as if they were images" echo "" exit 10 fi @@ -1032,6 +1054,15 @@ while [ -n "$1" ]; do -execs) CMP_EXECS=true ;; + -2dirs) + THIS="$(cd "$2" && pwd )" + OTHER="$(cd "$3" && pwd )" + THIS_BASE_DIR="$THIS" + OTHER_BASE_DIR="$OTHER" + SKIP_DEFAULT=true + shift + shift + ;; -2zips) CMP_2_ZIPS=true THIS_FILE=$2 @@ -1039,6 +1070,13 @@ while [ -n "$1" ]; do shift shift ;; + -2bins) + CMP_2_BINS=true + THIS_FILE=$2 + OTHER_FILE=$3 + shift + shift + ;; *) CMP_NAMES=false CMP_PERMS=false @@ -1069,6 +1107,18 @@ if [ "$CMP_2_ZIPS" = "true" ]; then exit fi +if [ "$CMP_2_BINS" = "true" ]; then + THIS_DIR="$(dirname $THIS_FILE)" + THIS_DIR="$(cd "$THIS_DIR" && pwd )" + OTHER_DIR="$(dirname $OTHER_FILE)" + OTHER_DIR="$(cd "$OTHER_DIR" && pwd )" + THIS_FILE_NAME="$(basename $THIS_FILE)" + OTHER_FILE_NAME="$(basename $OTHER_FILE)" + echo Comparing $THIS_DIR/$THIS_FILE_NAME and $OTHER_DIR/$OTHER_FILE_NAME + compare_bin_file $THIS_DIR $OTHER_DIR $COMPARE_ROOT/2bins $THIS_FILE_NAME $OTHER_FILE_NAME + exit +fi + if [ "$CMP_NAMES" = "false" ] && [ "$CMP_TYPES" = "false" ] && [ "$CMP_PERMS" = "false" ] && [ "$CMP_GENERAL" = "false" ] && [ "$CMP_ZIPS" = "false" ] && [ "$CMP_JARS" = "false" ] && [ "$CMP_LIBS" = "false" ] && [ "$CMP_EXECS" = "false" ]; then CMP_NAMES=true CMP_PERMS=true @@ -1084,151 +1134,154 @@ if [ -z "$FILTER" ]; then FILTER="$CAT" fi -if [ -z "$OTHER" ]; then - OTHER="$THIS/../$LEGACY_BUILD_DIR" - if [ -d "$OTHER" ]; then +if [ "$SKIP_DEFAULT" != "true" ]; then + if [ -z "$OTHER" ]; then + OTHER="$THIS/../$LEGACY_BUILD_DIR" + if [ -d "$OTHER" ]; then + OTHER="$( cd "$OTHER" && pwd )" + else + echo "Default old build directory does not exist:" + echo "$OTHER" + exit 1 + fi + echo "Comparing to default old build:" + echo "$OTHER" + echo + else + if [ ! -d "$OTHER" ]; then + echo "Other build directory does not exist:" + echo "$OTHER" + exit 1 + fi OTHER="$( cd "$OTHER" && pwd )" - else - echo "Default old build directory does not exist:" + echo "Comparing to:" echo "$OTHER" - exit 1 + echo fi - echo "Comparing to default old build:" - echo "$OTHER" - echo -else - if [ ! -d "$OTHER" ]; then - echo "Other build directory does not exist:" - echo "$OTHER" - exit 1 - fi - OTHER="$( cd "$OTHER" && pwd )" - echo "Comparing to:" - echo "$OTHER" - echo -fi -# Figure out the layout of the this build. Which kinds of images have been produced -if [ -d "$THIS/install/j2sdk-image" ]; then - THIS_J2SDK="$THIS/install/j2sdk-image" - THIS_J2RE="$THIS/install/j2re-image" - echo "Selecting install images in this build" -elif [ -d "$THIS/deploy/j2sdk-image" ]; then - THIS_J2SDK="$THIS/deploy/j2sdk-image" - THIS_J2RE="$THIS/deploy/j2re-image" - echo "Selecting deploy images in this build" -elif [ -d "$THIS/images/j2sdk-image" ]; then - THIS_J2SDK="$THIS/images/j2sdk-image" - THIS_J2RE="$THIS/images/j2re-image" - echo "Selecting jdk images in this build" -fi - -if [ -d "$THIS/images/j2sdk-overlay-image" ]; then + # Figure out the layout of the this build. Which kinds of images have been produced if [ -d "$THIS/install/j2sdk-image" ]; then - # If there is an install image, prefer that, it's also overlay - THIS_J2SDK_OVERLAY="$THIS/install/j2sdk-image" - THIS_J2RE_OVERLAY="$THIS/install/j2re-image" - echo "Selecting install overlay images in this build" - else - THIS_J2SDK_OVERLAY="$THIS/images/j2sdk-overlay-image" - THIS_J2RE_OVERLAY="$THIS/images/j2re-overlay-image" - echo "Selecting jdk overlay images in this build" + THIS_J2SDK="$THIS/install/j2sdk-image" + THIS_J2RE="$THIS/install/j2re-image" + echo "Selecting install images in this build" + elif [ -d "$THIS/deploy/j2sdk-image" ]; then + THIS_J2SDK="$THIS/deploy/j2sdk-image" + THIS_J2RE="$THIS/deploy/j2re-image" + echo "Selecting deploy images in this build" + elif [ -d "$THIS/images/j2sdk-image" ]; then + THIS_J2SDK="$THIS/images/j2sdk-image" + THIS_J2RE="$THIS/images/j2re-image" + echo "Selecting jdk images in this build" fi -fi -if [ -d "$THIS/images/j2sdk-bundle" ]; then - THIS_J2SDK_BUNDLE="$THIS/images/j2sdk-bundle" - THIS_J2RE_BUNDLE="$THIS/images/j2re-bundle" - echo "Selecting bundles in this build" -fi - -# Figure out the layout of the other build (old or new, normal or overlay image) -if [ -d "$OTHER/j2sdk-image" ]; then - if [ -f "$OTHER/j2sdk-image/LICENSE" ]; then - OTHER_J2SDK="$OTHER/j2sdk-image" - OTHER_J2RE="$OTHER/j2re-image" - echo "Selecting old-style images in other build" - else - OTHER_J2SDK_OVERLAY="$OTHER/j2sdk-image" - OTHER_J2RE_OVERLAY="$OTHER/j2re-image" - echo "Selecting overlay images in other build" + if [ -d "$THIS/images/j2sdk-overlay-image" ]; then + if [ -d "$THIS/install/j2sdk-image" ]; then + # If there is an install image, prefer that, it's also overlay + THIS_J2SDK_OVERLAY="$THIS/install/j2sdk-image" + THIS_J2RE_OVERLAY="$THIS/install/j2re-image" + echo "Selecting install overlay images in this build" + else + THIS_J2SDK_OVERLAY="$THIS/images/j2sdk-overlay-image" + THIS_J2RE_OVERLAY="$THIS/images/j2re-overlay-image" + echo "Selecting jdk overlay images in this build" + fi fi -elif [ -d "$OTHER/install/j2sdk-image" ]; then - OTHER_J2SDK="$OTHER/install/j2sdk-image" - OTHER_J2RE="$OTHER/install/j2re-image" - echo "Selecting install images in other build" -elif [ -d "$OTHER/deploy/j2sdk-image" ]; then - OTHER_J2SDK="$OTHER/deploy/j2sdk-image" - OTHER_J2RE="$OTHER/deploy/j2re-image" - echo "Selecting deploy images in other build" -elif [ -d "$OTHER/images/j2sdk-image" ]; then - OTHER_J2SDK="$OTHER/images/j2sdk-image" - OTHER_J2RE="$OTHER/images/j2re-image" - echo "Selecting jdk images in other build" -fi -if [ -d "$OTHER/j2sdk-bundle" ]; then - OTHER_J2SDK_BUNDLE="$OTHER/j2sdk-bundle" - OTHER_J2RE_BUNDLE="$OTHER/j2re-bundle" - echo "Selecting bundles in other build" -elif [ -d "$OTHER/images/j2sdk-bundle" ]; then - OTHER_J2SDK_BUNDLE="$OTHER/images/j2sdk-bundle" - OTHER_J2RE_BUNDLE="$OTHER/images/j2re-bundle" - echo "Selecting jdk bundles in other build" -fi + if [ -d "$THIS/images/j2sdk-bundle" ]; then + THIS_J2SDK_BUNDLE="$THIS/images/j2sdk-bundle" + THIS_J2RE_BUNDLE="$THIS/images/j2re-bundle" + echo "Selecting bundles in this build" + fi -if [ -z "$THIS_J2SDK" ] || [ -z "$THIS_J2RE" ]; then - if [ -z "$THIS_J2SDK_OVERLAY" ]; then - echo "Cannot locate images for this build. Are you sure you have run 'make images'?" + # Figure out the layout of the other build (old or new, normal or overlay image) + if [ -d "$OTHER/j2sdk-image" ]; then + if [ -f "$OTHER/j2sdk-image/LICENSE" ]; then + OTHER_J2SDK="$OTHER/j2sdk-image" + OTHER_J2RE="$OTHER/j2re-image" + echo "Selecting old-style images in other build" + else + OTHER_J2SDK_OVERLAY="$OTHER/j2sdk-image" + OTHER_J2RE_OVERLAY="$OTHER/j2re-image" + echo "Selecting overlay images in other build" + fi + elif [ -d "$OTHER/install/j2sdk-image" ]; then + OTHER_J2SDK="$OTHER/install/j2sdk-image" + OTHER_J2RE="$OTHER/install/j2re-image" + echo "Selecting install images in other build" + elif [ -d "$OTHER/deploy/j2sdk-image" ]; then + OTHER_J2SDK="$OTHER/deploy/j2sdk-image" + OTHER_J2RE="$OTHER/deploy/j2re-image" + echo "Selecting deploy images in other build" + elif [ -d "$OTHER/images/j2sdk-image" ]; then + OTHER_J2SDK="$OTHER/images/j2sdk-image" + OTHER_J2RE="$OTHER/images/j2re-image" + echo "Selecting jdk images in other build" + fi + + if [ -d "$OTHER/j2sdk-bundle" ]; then + OTHER_J2SDK_BUNDLE="$OTHER/j2sdk-bundle" + OTHER_J2RE_BUNDLE="$OTHER/j2re-bundle" + echo "Selecting bundles in other build" + elif [ -d "$OTHER/images/j2sdk-bundle" ]; then + OTHER_J2SDK_BUNDLE="$OTHER/images/j2sdk-bundle" + OTHER_J2RE_BUNDLE="$OTHER/images/j2re-bundle" + echo "Selecting jdk bundles in other build" + fi + + if [ -z "$THIS_J2SDK" ] || [ -z "$THIS_J2RE" ]; then + if [ -z "$THIS_J2SDK_OVERLAY" ]; then + echo "Cannot locate images for this build. Are you sure you have run 'make images'?" + exit 1 + fi + fi + + if [ -z "$OTHER_J2SDK" ] && [ -n "$OTHER_J2SDK_OVERLAY" ] && [ -z "$THIS_J2SDK_OVERLAY" ]; then + echo "OTHER build only has an overlay image while this build does not. Nothing to compare!" exit 1 fi -fi -if [ -z "$OTHER_J2SDK" ] && [ -n "$OTHER_J2SDK_OVERLAY" ] && [ -z "$THIS_J2SDK_OVERLAY" ]; then - echo "OTHER build only has an overlay image while this build does not. Nothing to compare!" - exit 1 -fi - -if [ -z "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then - echo "WARNING! OTHER build has bundles built while this build does not." - echo "Skipping bundle compare!" -fi - -if [ -d "$THIS/docs" ]; then - THIS_DOCS="$THIS/docs" -fi - -if [ -d "$OTHER/docs" ]; then - OTHER_DOCS="$OTHER/docs" -fi - -if [ -z "$THIS_DOCS" ]; then - echo "WARNING! Docs haven't been built and won't be compared." -fi - -if [ -z "$OTHER_DOCS" ]; then - echo "WARNING! Other build doesn't contain docs, skipping doc compare." -fi - -if [ -d "$OTHER/images" ]; then - OTHER_SEC_DIR="$OTHER/images" -else - OTHER_SEC_DIR="$OTHER/tmp" -fi -OTHER_SEC_BIN="$OTHER_SEC_DIR/sec-bin.zip" -THIS_SEC_DIR="$THIS/images" -THIS_SEC_BIN="$THIS_SEC_DIR/sec-bin.zip" -if [ "$OPENJDK_TARGET_OS" = "windows" ]; then - if [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then - JGSS_WINDOWS_BIN="jgss-windows-x64-bin.zip" - else - JGSS_WINDOWS_BIN="jgss-windows-i586-bin.zip" + if [ -z "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then + echo "WARNING! OTHER build has bundles built while this build does not." + echo "Skipping bundle compare!" fi - OTHER_SEC_WINDOWS_BIN="$OTHER_SEC_DIR/sec-windows-bin.zip" - OTHER_JGSS_WINDOWS_BIN="$OTHER_SEC_DIR/$JGSS_WINDOWS_BIN" - THIS_SEC_WINDOWS_BIN="$THIS_SEC_DIR/sec-windows-bin.zip" - THIS_JGSS_WINDOWS_BIN="$THIS_SEC_DIR/$JGSS_WINDOWS_BIN" + + if [ -d "$OTHER/images" ]; then + OTHER_SEC_DIR="$OTHER/images" + else + OTHER_SEC_DIR="$OTHER/tmp" + fi + OTHER_SEC_BIN="$OTHER_SEC_DIR/sec-bin.zip" + THIS_SEC_DIR="$THIS/images" + THIS_SEC_BIN="$THIS_SEC_DIR/sec-bin.zip" + if [ "$OPENJDK_TARGET_OS" = "windows" ]; then + if [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then + JGSS_WINDOWS_BIN="jgss-windows-x64-bin.zip" + else + JGSS_WINDOWS_BIN="jgss-windows-i586-bin.zip" + fi + OTHER_SEC_WINDOWS_BIN="$OTHER_SEC_DIR/sec-windows-bin.zip" + OTHER_JGSS_WINDOWS_BIN="$OTHER_SEC_DIR/$JGSS_WINDOWS_BIN" + THIS_SEC_WINDOWS_BIN="$THIS_SEC_DIR/sec-windows-bin.zip" + THIS_JGSS_WINDOWS_BIN="$THIS_SEC_DIR/$JGSS_WINDOWS_BIN" + fi + + if [ -d "$THIS/docs" ]; then + THIS_DOCS="$THIS/docs" + fi + + if [ -d "$OTHER/docs" ]; then + OTHER_DOCS="$OTHER/docs" + fi + + if [ -z "$THIS_DOCS" ]; then + echo "WARNING! Docs haven't been built and won't be compared." + fi + + if [ -z "$OTHER_DOCS" ]; then + echo "WARNING! Other build doesn't contain docs, skipping doc compare." + fi + fi ########################################################################################## @@ -1274,6 +1327,10 @@ if [ "$CMP_NAMES" = "true" ]; then echo -n "Docs " compare_files $THIS_DOCS $OTHER_DOCS $COMPARE_ROOT/docs fi + if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then + compare_dirs $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir + compare_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir + fi fi if [ "$CMP_PERMS" = "true" ]; then @@ -1295,6 +1352,9 @@ if [ "$CMP_PERMS" = "true" ]; then echo -n "J2RE Bundle " compare_permissions $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/j2re-bundle fi + if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then + compare_permissions $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir + fi fi if [ "$CMP_TYPES" = "true" ]; then @@ -1316,6 +1376,9 @@ if [ "$CMP_TYPES" = "true" ]; then echo -n "J2RE Bundle " compare_file_types $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/j2re-bundle fi + if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then + compare_file_types $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir + fi fi if [ "$CMP_GENERAL" = "true" ]; then @@ -1341,6 +1404,9 @@ if [ "$CMP_GENERAL" = "true" ]; then echo -n "Docs " compare_general_files $THIS_DOCS $OTHER_DOCS $COMPARE_ROOT/docs fi + if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then + compare_general_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir + fi fi if [ "$CMP_ZIPS" = "true" ]; then @@ -1365,12 +1431,18 @@ if [ "$CMP_ZIPS" = "true" ]; then compare_zip_file $THIS_SEC_DIR $OTHER_SEC_DIR $COMPARE_ROOT/sec-bin $JGSS_WINDOWS_BIN fi fi + if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then + compare_all_zip_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir + fi fi if [ "$CMP_JARS" = "true" ]; then if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then compare_all_jar_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk fi + if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then + compare_all_jar_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir + fi fi if [ "$CMP_LIBS" = "true" ]; then @@ -1386,6 +1458,9 @@ if [ "$CMP_LIBS" = "true" ]; then echo -n "Bundle " compare_all_libs $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay fi + if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then + compare_all_libs $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir + fi fi if [ "$CMP_EXECS" = "true" ]; then @@ -1396,6 +1471,9 @@ if [ "$CMP_EXECS" = "true" ]; then echo -n "Overlay " compare_all_execs $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay fi + if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then + compare_all_execs $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir + fi fi echo diff --git a/common/bin/unshuffle_list.txt b/common/bin/unshuffle_list.txt new file mode 100644 index 00000000000..66f1fcd7b3e --- /dev/null +++ b/common/bin/unshuffle_list.txt @@ -0,0 +1,1502 @@ +# +# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +corba/src/java.corba/share/classes/com/sun/corba/se : corba/src/share/classes/com/sun/corba/se +corba/src/java.corba/share/classes/com/sun/org/omg : corba/src/share/classes/com/sun/org/omg +corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl : corba/src/share/classes/com/sun/tools/corba/se/idl +corba/src/java.corba/share/classes/javax/activity : corba/src/share/classes/javax/activity +corba/src/java.corba/share/classes/javax/rmi : corba/src/share/classes/javax/rmi +corba/src/java.corba/share/classes/javax/transaction : corba/src/share/classes/javax/transaction +corba/src/java.corba/share/classes/org/omg : corba/src/share/classes/org/omg +corba/src/java.corba/share/classes/sun/corba : corba/src/share/classes/sun/corba +corba/src/java.sql/share/classes/javax/transaction/xa : corba/src/share/classes/javax/transaction/xa +corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop : corba/src/share/classes/sun/rmi/rmic/iiop +jaxp/src/java.xml/share/classes/com/sun/java_cup/internal/runtime : jaxp/src/com/sun/java_cup/internal/runtime +jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal : jaxp/src/com/sun/org/apache/bcel/internal +jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal : jaxp/src/com/sun/org/apache/regexp/internal +jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan : jaxp/src/com/sun/org/apache/xalan +jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces : jaxp/src/com/sun/org/apache/xerces +jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm : jaxp/src/com/sun/org/apache/xml/internal/dtm +jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res : jaxp/src/com/sun/org/apache/xml/internal/res +jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver : jaxp/src/com/sun/org/apache/xml/internal/resolver +jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize : jaxp/src/com/sun/org/apache/xml/internal/serialize +jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer : jaxp/src/com/sun/org/apache/xml/internal/serializer +jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils : jaxp/src/com/sun/org/apache/xml/internal/utils +jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath : jaxp/src/com/sun/org/apache/xpath +jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream : jaxp/src/com/sun/xml/internal/stream +jaxp/src/java.xml/share/classes/javax/xml/datatype : jaxp/src/javax/xml/datatype +jaxp/src/java.xml/share/classes/javax/xml/namespace : jaxp/src/javax/xml/namespace +jaxp/src/java.xml/share/classes/javax/xml/parsers : jaxp/src/javax/xml/parsers +jaxp/src/java.xml/share/classes/javax/xml/stream : jaxp/src/javax/xml/stream +jaxp/src/java.xml/share/classes/javax/xml/transform : jaxp/src/javax/xml/transform +jaxp/src/java.xml/share/classes/javax/xml/validation : jaxp/src/javax/xml/validation +jaxp/src/java.xml/share/classes/javax/xml/XMLConstants.java : jaxp/src/javax/xml/XMLConstants.java +jaxp/src/java.xml/share/classes/javax/xml/xpath : jaxp/src/javax/xml/xpath +jaxp/src/java.xml/share/classes/org/w3c/dom : jaxp/src/org/w3c/dom +jaxp/src/java.xml/share/classes/org/xml/sax : jaxp/src/org/xml/sax +jaxws/src/java.activation/share/classes/com/sun/activation/registries : jaxws/src/share/jaf_classes/com/sun/activation/registries +jaxws/src/java.activation/share/classes/javax/activation : jaxws/src/share/jaf_classes/javax/activation +jaxws/src/java.activation/share/classes/META-INF : jaxws/src/share/jaf_classes/META-INF +jaxws/src/java.annotations.common/share/classes/javax/annotation : jaxws/src/share/jaxws_classes/javax/annotation +jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal : jaxws/src/share/jaxws_classes/com/sun/istack/internal +jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/localization : jaxws/src/share/jaxws_classes/com/sun/istack/internal/localization +jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/logging/Logger.java : jaxws/src/share/jaxws_classes/com/sun/istack/internal/logging/Logger.java +jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind : jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind +jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset : jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset +jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org : jaxws/src/share/jaxws_classes/com/sun/xml/internal/org +jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2 : jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2 +jaxws/src/java.xml.bind/share/classes/javax/xml/bind : jaxws/src/share/jaxws_classes/javax/xml/bind +jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging : jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging +jaxws/src/java.xml.soap/share/classes/javax/xml/soap : jaxws/src/share/jaxws_classes/javax/xml/soap +jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal : jaxws/src/share/jaxws_classes/com/oracle/webservices/internal +jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal : jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal +jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish : jaxws/src/share/jaxws_classes/com/sun/org/glassfish +jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream : jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream +jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws : jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws +jaxws/src/java.xml.ws/share/classes/javax/jws : jaxws/src/share/jaxws_classes/javax/jws +jaxws/src/java.xml.ws/share/classes/javax/xml/ws : jaxws/src/share/jaxws_classes/javax/xml/ws +jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel : jaxws/src/share/jaxws_classes/com/sun/codemodel +jaxws/src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools : jaxws/src/share/jaxws_classes/com/sun/istack/internal/tools +jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal : jaxws/src/share/jaxws_classes/com/sun/tools/internal +jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser : jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser +jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom : jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom +jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom : jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom +jaxws/src/jdk.xml.bind/share/classes/META-INF/services/com.sun.tools.internal.xjc.Plugin : jaxws/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin +jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype : jaxws/src/share/jaxws_classes/org/relaxng/datatype +jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws : jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws +jaxws/src/jdk.xml.ws/share/classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin : jaxws/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin +jdk/src/demo/share : jdk/src/share/demo +jdk/src/demo/share/jpda/com/sun/tools/example : jdk/src/share/classes/com/sun/tools/example +jdk/src/demo/solaris/jni/Poller : jdk/src/solaris/demo/jni/Poller +jdk/src/demo/unix/jvmti/hprof/hprof_md.c : jdk/src/solaris/demo/jvmti/hprof/hprof_md.c +jdk/src/demo/windows/jvmti/hprof : jdk/src/windows/demo/jvmti/hprof +jdk/src/java.base/aix/conf/tzmappings : jdk/src/aix/lib/tzmappings +jdk/src/java.base/aix/native/libnet/java/net : jdk/src/aix/native/java/net +jdk/src/java.base/aix/native/libnio/ch : jdk/src/aix/native/sun/nio/ch +jdk/src/java.base/aix/native/libnio/fs/AixNativeDispatcher.c : jdk/src/aix/native/sun/nio/fs/AixNativeDispatcher.c +jdk/src/java.base/macosx/classes/java/lang/ClassLoaderHelper.java : jdk/src/macosx/classes/java/lang/ClassLoaderHelper.java +jdk/src/java.base/macosx/classes/java/net/DefaultInterface.java : jdk/src/macosx/classes/java/net/DefaultInterface.java +jdk/src/java.base/macosx/classes/sun/nio/ch : jdk/src/macosx/classes/sun/nio/ch +jdk/src/java.base/macosx/classes/sun/util/locale/provider : jdk/src/macosx/classes/sun/util/locale/provider +jdk/src/java.base/macosx/conf/x86_64/jvm.cfg : jdk/src/macosx/bin/x86_64/jvm.cfg +jdk/src/java.base/macosx/native/include/jni_md.h : jdk/src/macosx/javavm/export/jni_md.h +jdk/src/java.base/macosx/native/include/jvm_md.h : jdk/src/macosx/javavm/export/jvm_md.h +jdk/src/java.base/macosx/native/launcher/Info-cmdline.plist : jdk/src/macosx/lib/Info-cmdline.plist +jdk/src/java.base/macosx/native/launcher/Info-privileged.plist : jdk/src/macosx/lib/Info-privileged.plist +jdk/src/java.base/macosx/native/launcher/jexec.c : jdk/src/macosx/bin/jexec.c +jdk/src/java.base/macosx/native/libjava/HostLocaleProviderAdapter_md.c : jdk/src/macosx/native/sun/util/locale/provider/HostLocaleProviderAdapter_md.c +jdk/src/java.base/macosx/native/libjli/java_md_macosx.c : jdk/src/macosx/bin/java_md_macosx.c +jdk/src/java.base/macosx/native/libjli/java_md_macosx.h : jdk/src/macosx/bin/java_md_macosx.h +jdk/src/java.base/share/classes/com/sun/crypto/provider : jdk/src/share/classes/com/sun/crypto/provider +jdk/src/java.base/share/classes/com/sun/java/util/jar/pack : jdk/src/share/classes/com/sun/java/util/jar/pack +jdk/src/java.base/share/classes/com/sun/net/ssl/internal/ssl : jdk/src/share/classes/com/sun/net/ssl/internal/ssl +jdk/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https : jdk/src/share/classes/com/sun/net/ssl/internal/www/protocol/https +jdk/src/java.base/share/classes/com/sun/net/ssl : jdk/src/share/classes/com/sun/net/ssl +jdk/src/java.base/share/classes/com/sun/nio/file : jdk/src/share/classes/com/sun/nio/file +jdk/src/java.base/share/classes/com/sun/security/cert/internal/x509 : jdk/src/share/classes/com/sun/security/cert/internal/x509 +jdk/src/java.base/share/classes/com/sun/security/ntlm : jdk/src/share/classes/com/sun/security/ntlm +jdk/src/java.base/share/classes/java/io : jdk/src/share/classes/java/io +jdk/src/java.base/share/classes/java/lang/annotation : jdk/src/share/classes/java/lang/annotation +jdk/src/java.base/share/classes/java/lang/doc-files : jdk/src/share/classes/java/lang/doc-files +jdk/src/java.base/share/classes/java/lang/invoke : jdk/src/share/classes/java/lang/invoke +jdk/src/java.base/share/classes/java/lang : jdk/src/share/classes/java/lang +jdk/src/java.base/share/classes/java/lang/ref : jdk/src/share/classes/java/lang/ref +jdk/src/java.base/share/classes/java/lang/reflect : jdk/src/share/classes/java/lang/reflect +jdk/src/java.base/share/classes/java/math : jdk/src/share/classes/java/math +jdk/src/java.base/share/classes/java/net : jdk/src/share/classes/java/net +jdk/src/java.base/share/classes/java/nio : jdk/src/share/classes/java/nio +jdk/src/java.base/share/classes/java/security/cert : jdk/src/share/classes/java/security/cert +jdk/src/java.base/share/classes/java/security/interfaces : jdk/src/share/classes/java/security/interfaces +jdk/src/java.base/share/classes/java/security : jdk/src/share/classes/java/security +jdk/src/java.base/share/classes/java/security/spec : jdk/src/share/classes/java/security/spec +jdk/src/java.base/share/classes/java/text : jdk/src/share/classes/java/text +jdk/src/java.base/share/classes/java/time : jdk/src/share/classes/java/time +jdk/src/java.base/share/classes/java/util/concurrent : jdk/src/share/classes/java/util/concurrent +jdk/src/java.base/share/classes/java/util/function : jdk/src/share/classes/java/util/function +jdk/src/java.base/share/classes/java/util/jar : jdk/src/share/classes/java/util/jar +jdk/src/java.base/share/classes/java/util : jdk/src/share/classes/java/util +jdk/src/java.base/share/classes/java/util/regex : jdk/src/share/classes/java/util/regex +jdk/src/java.base/share/classes/java/util/spi : jdk/src/share/classes/java/util/spi +jdk/src/java.base/share/classes/java/util/stream : jdk/src/share/classes/java/util/stream +jdk/src/java.base/share/classes/java/util/zip : jdk/src/share/classes/java/util/zip +jdk/src/java.base/share/classes/javax/crypto : jdk/src/share/classes/javax/crypto +jdk/src/java.base/share/classes/javax/net : jdk/src/share/classes/javax/net +jdk/src/java.base/share/classes/javax/security/auth/callback : jdk/src/share/classes/javax/security/auth/callback +jdk/src/java.base/share/classes/javax/security/auth : jdk/src/share/classes/javax/security/auth +jdk/src/java.base/share/classes/javax/security/auth/login : jdk/src/share/classes/javax/security/auth/login +jdk/src/java.base/share/classes/javax/security/auth/spi : jdk/src/share/classes/javax/security/auth/spi +jdk/src/java.base/share/classes/javax/security/auth/x500 : jdk/src/share/classes/javax/security/auth/x500 +jdk/src/java.base/share/classes/javax/security/cert : jdk/src/share/classes/javax/security/cert +jdk/src/java.base/share/classes/jdk/internal/org/objectweb : jdk/src/share/classes/jdk/internal/org/objectweb +jdk/src/java.base/share/classes/jdk/internal/org/xml/sax : jdk/src/share/classes/jdk/internal/org/xml/sax +jdk/src/java.base/share/classes/jdk/internal/util/xml : jdk/src/share/classes/jdk/internal/util/xml +jdk/src/java.base/share/classes/jdk/net : jdk/src/share/classes/jdk/net +jdk/src/java.base/share/classes/overview-core.html : jdk/src/share/classes/overview-core.html +jdk/src/java.base/share/classes/sun/invoke : jdk/src/share/classes/sun/invoke +jdk/src/java.base/share/classes/sun/launcher : jdk/src/share/classes/sun/launcher +jdk/src/java.base/share/classes/sun/misc : jdk/src/share/classes/sun/misc +jdk/src/java.base/share/classes/sun/net/dns : jdk/src/share/classes/sun/net/dns +jdk/src/java.base/share/classes/sun/net/ftp/impl : jdk/src/share/classes/sun/net/ftp/impl +jdk/src/java.base/share/classes/sun/net/ftp : jdk/src/share/classes/sun/net/ftp +jdk/src/java.base/share/classes/sun/net/idn : jdk/src/share/classes/sun/net/idn +jdk/src/java.base/share/classes/sun/net : jdk/src/share/classes/sun/net +jdk/src/java.base/share/classes/sun/net/sdp : jdk/src/share/classes/sun/net/sdp +jdk/src/java.base/share/classes/sun/net/smtp : jdk/src/share/classes/sun/net/smtp +jdk/src/java.base/share/classes/sun/net/spi/DefaultProxySelector.java : jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java +jdk/src/java.base/share/classes/sun/net/spi/nameservice : jdk/src/share/classes/sun/net/spi/nameservice +jdk/src/java.base/share/classes/sun/net/util : jdk/src/share/classes/sun/net/util +jdk/src/java.base/share/classes/sun/net/www/content/text : jdk/src/share/classes/sun/net/www/content/text +jdk/src/java.base/share/classes/sun/net/www/http : jdk/src/share/classes/sun/net/www/http +jdk/src/java.base/share/classes/sun/net/www : jdk/src/share/classes/sun/net/www +jdk/src/java.base/share/classes/sun/net/www/protocol/file : jdk/src/share/classes/sun/net/www/protocol/file +jdk/src/java.base/share/classes/sun/net/www/protocol/ftp : jdk/src/share/classes/sun/net/www/protocol/ftp +jdk/src/java.base/share/classes/sun/net/www/protocol/http : jdk/src/share/classes/sun/net/www/protocol/http +jdk/src/java.base/share/classes/sun/net/www/protocol/http/ntlm : jdk/src/share/classes/sun/net/www/protocol/http/ntlm +jdk/src/java.base/share/classes/sun/net/www/protocol/https : jdk/src/share/classes/sun/net/www/protocol/https +jdk/src/java.base/share/classes/sun/net/www/protocol/jar : jdk/src/share/classes/sun/net/www/protocol/jar +jdk/src/java.base/share/classes/sun/net/www/protocol/mailto : jdk/src/share/classes/sun/net/www/protocol/mailto +jdk/src/java.base/share/classes/sun/net/www/protocol/netdoc/Handler.java : jdk/src/share/classes/sun/net/www/protocol/netdoc/Handler.java +jdk/src/java.base/share/classes/sun/nio/ByteBuffered.java : jdk/src/share/classes/sun/nio/ByteBuffered.java +jdk/src/java.base/share/classes/sun/nio/ch : jdk/src/share/classes/sun/nio/ch +jdk/src/java.base/share/classes/sun/nio/cs : jdk/src/share/classes/sun/nio/cs +jdk/src/java.base/share/classes/sun/nio/fs : jdk/src/share/classes/sun/nio/fs +jdk/src/java.base/share/classes/sun/reflect : jdk/src/share/classes/sun/reflect +jdk/src/java.base/share/classes/sun/security/action : jdk/src/share/classes/sun/security/action +jdk/src/java.base/share/classes/sun/security/internal : jdk/src/share/classes/sun/security/internal +jdk/src/java.base/share/classes/sun/security/jca : jdk/src/share/classes/sun/security/jca +jdk/src/java.base/share/classes/sun/security/pkcs10 : jdk/src/share/classes/sun/security/pkcs10 +jdk/src/java.base/share/classes/sun/security/pkcs12 : jdk/src/share/classes/sun/security/pkcs12 +jdk/src/java.base/share/classes/sun/security/pkcs : jdk/src/share/classes/sun/security/pkcs +jdk/src/java.base/share/classes/sun/security/provider/certpath : jdk/src/share/classes/sun/security/provider/certpath +jdk/src/java.base/share/classes/sun/security/provider/certpath/ssl : jdk/src/share/classes/sun/security/provider/certpath/ssl +jdk/src/java.base/share/classes/sun/security/provider : jdk/src/share/classes/sun/security/provider +jdk/src/java.base/share/classes/sun/security/rsa : jdk/src/share/classes/sun/security/rsa +jdk/src/java.base/share/classes/sun/security/ssl : jdk/src/share/classes/sun/security/ssl +jdk/src/java.base/share/classes/sun/security/timestamp : jdk/src/share/classes/sun/security/timestamp +jdk/src/java.base/share/classes/sun/security/tools : jdk/src/share/classes/sun/security/tools +jdk/src/java.base/share/classes/sun/security/tools/keytool : jdk/src/share/classes/sun/security/tools/keytool +jdk/src/java.base/share/classes/sun/security/util : jdk/src/share/classes/sun/security/util +jdk/src/java.base/share/classes/sun/security/validator : jdk/src/share/classes/sun/security/validator +jdk/src/java.base/share/classes/sun/security/x509 : jdk/src/share/classes/sun/security/x509 +jdk/src/java.base/share/classes/sun/text/bidi : jdk/src/share/classes/sun/text/bidi +jdk/src/java.base/share/classes/sun/text : jdk/src/share/classes/sun/text +jdk/src/java.base/share/classes/sun/text/normalizer : jdk/src/share/classes/sun/text/normalizer +jdk/src/java.base/share/classes/sun/text/resources/en : jdk/src/share/classes/sun/text/resources/en +jdk/src/java.base/share/classes/sun/text/resources : jdk/src/share/classes/sun/text/resources +jdk/src/java.base/share/classes/sun/util/calendar : jdk/src/share/classes/sun/util/calendar +jdk/src/java.base/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java : jdk/src/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java +jdk/src/java.base/share/classes/sun/util : jdk/src/share/classes/sun/util +jdk/src/java.base/share/classes/sun/util/locale : jdk/src/share/classes/sun/util/locale +jdk/src/java.base/share/classes/sun/util/locale/provider : jdk/src/share/classes/sun/util/locale/provider +jdk/src/java.base/share/classes/sun/util/logging : jdk/src/share/classes/sun/util/logging +jdk/src/java.base/share/classes/sun/util/resources/en : jdk/src/share/classes/sun/util/resources/en +jdk/src/java.base/share/classes/sun/util/resources : jdk/src/share/classes/sun/util/resources +jdk/src/java.base/share/classes/sun/util/spi : jdk/src/share/classes/sun/util/spi +jdk/src/java.base/share/conf/calendars.properties : jdk/src/share/lib/calendars.properties +jdk/src/java.base/share/conf/hijrah-config-umalqura.properties : jdk/src/share/lib/hijrah-config-umalqura.properties +jdk/src/java.base/share/conf/net.properties : jdk/src/share/lib/net.properties +jdk/src/java.base/share/conf/security : jdk/src/share/lib/security +jdk/src/java.base/share/native/include/classfile_constants.h : jdk/src/share/javavm/export/classfile_constants.h +jdk/src/java.base/share/native/include/jni.h : jdk/src/share/javavm/export/jni.h +jdk/src/java.base/share/native/include/jvm.h : jdk/src/share/javavm/export/jvm.h +jdk/src/java.base/share/native/include/jvmticmlr.h : jdk/src/share/javavm/export/jvmticmlr.h +jdk/src/java.base/share/native/include/jvmti.h : jdk/src/share/javavm/export/jvmti.h +jdk/src/java.base/share/native/launcher/defines.h : jdk/src/share/bin/defines.h +jdk/src/java.base/share/native/launcher/main.c : jdk/src/share/bin/main.c +jdk/src/java.base/share/native/libfdlibm/e_acos.c : jdk/src/share/native/java/lang/fdlibm/src/e_acos.c +jdk/src/java.base/share/native/libfdlibm/e_asin.c : jdk/src/share/native/java/lang/fdlibm/src/e_asin.c +jdk/src/java.base/share/native/libfdlibm/e_atan2.c : jdk/src/share/native/java/lang/fdlibm/src/e_atan2.c +jdk/src/java.base/share/native/libfdlibm/e_atanh.c : jdk/src/share/native/java/lang/fdlibm/src/e_atanh.c +jdk/src/java.base/share/native/libfdlibm/e_cosh.c : jdk/src/share/native/java/lang/fdlibm/src/e_cosh.c +jdk/src/java.base/share/native/libfdlibm/e_exp.c : jdk/src/share/native/java/lang/fdlibm/src/e_exp.c +jdk/src/java.base/share/native/libfdlibm/e_fmod.c : jdk/src/share/native/java/lang/fdlibm/src/e_fmod.c +jdk/src/java.base/share/native/libfdlibm/e_hypot.c : jdk/src/share/native/java/lang/fdlibm/src/e_hypot.c +jdk/src/java.base/share/native/libfdlibm/e_log10.c : jdk/src/share/native/java/lang/fdlibm/src/e_log10.c +jdk/src/java.base/share/native/libfdlibm/e_log.c : jdk/src/share/native/java/lang/fdlibm/src/e_log.c +jdk/src/java.base/share/native/libfdlibm/e_pow.c : jdk/src/share/native/java/lang/fdlibm/src/e_pow.c +jdk/src/java.base/share/native/libfdlibm/e_remainder.c : jdk/src/share/native/java/lang/fdlibm/src/e_remainder.c +jdk/src/java.base/share/native/libfdlibm/e_rem_pio2.c : jdk/src/share/native/java/lang/fdlibm/src/e_rem_pio2.c +jdk/src/java.base/share/native/libfdlibm/e_scalb.c : jdk/src/share/native/java/lang/fdlibm/src/e_scalb.c +jdk/src/java.base/share/native/libfdlibm/e_sinh.c : jdk/src/share/native/java/lang/fdlibm/src/e_sinh.c +jdk/src/java.base/share/native/libfdlibm/e_sqrt.c : jdk/src/share/native/java/lang/fdlibm/src/e_sqrt.c +jdk/src/java.base/share/native/libfdlibm/fdlibm.h : jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h +jdk/src/java.base/share/native/libfdlibm/jfdlibm.h : jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h +jdk/src/java.base/share/native/libfdlibm/k_cos.c : jdk/src/share/native/java/lang/fdlibm/src/k_cos.c +jdk/src/java.base/share/native/libfdlibm/k_rem_pio2.c : jdk/src/share/native/java/lang/fdlibm/src/k_rem_pio2.c +jdk/src/java.base/share/native/libfdlibm/k_sin.c : jdk/src/share/native/java/lang/fdlibm/src/k_sin.c +jdk/src/java.base/share/native/libfdlibm/k_standard.c : jdk/src/share/native/java/lang/fdlibm/src/k_standard.c +jdk/src/java.base/share/native/libfdlibm/k_tan.c : jdk/src/share/native/java/lang/fdlibm/src/k_tan.c +jdk/src/java.base/share/native/libfdlibm/s_atan.c : jdk/src/share/native/java/lang/fdlibm/src/s_atan.c +jdk/src/java.base/share/native/libfdlibm/s_cbrt.c : jdk/src/share/native/java/lang/fdlibm/src/s_cbrt.c +jdk/src/java.base/share/native/libfdlibm/s_ceil.c : jdk/src/share/native/java/lang/fdlibm/src/s_ceil.c +jdk/src/java.base/share/native/libfdlibm/s_copysign.c : jdk/src/share/native/java/lang/fdlibm/src/s_copysign.c +jdk/src/java.base/share/native/libfdlibm/s_cos.c : jdk/src/share/native/java/lang/fdlibm/src/s_cos.c +jdk/src/java.base/share/native/libfdlibm/s_expm1.c : jdk/src/share/native/java/lang/fdlibm/src/s_expm1.c +jdk/src/java.base/share/native/libfdlibm/s_fabs.c : jdk/src/share/native/java/lang/fdlibm/src/s_fabs.c +jdk/src/java.base/share/native/libfdlibm/s_finite.c : jdk/src/share/native/java/lang/fdlibm/src/s_finite.c +jdk/src/java.base/share/native/libfdlibm/s_floor.c : jdk/src/share/native/java/lang/fdlibm/src/s_floor.c +jdk/src/java.base/share/native/libfdlibm/s_frexp.c : jdk/src/share/native/java/lang/fdlibm/src/s_frexp.c +jdk/src/java.base/share/native/libfdlibm/s_ilogb.c : jdk/src/share/native/java/lang/fdlibm/src/s_ilogb.c +jdk/src/java.base/share/native/libfdlibm/s_isnan.c : jdk/src/share/native/java/lang/fdlibm/src/s_isnan.c +jdk/src/java.base/share/native/libfdlibm/s_ldexp.c : jdk/src/share/native/java/lang/fdlibm/src/s_ldexp.c +jdk/src/java.base/share/native/libfdlibm/s_lib_version.c : jdk/src/share/native/java/lang/fdlibm/src/s_lib_version.c +jdk/src/java.base/share/native/libfdlibm/s_log1p.c : jdk/src/share/native/java/lang/fdlibm/src/s_log1p.c +jdk/src/java.base/share/native/libfdlibm/s_logb.c : jdk/src/share/native/java/lang/fdlibm/src/s_logb.c +jdk/src/java.base/share/native/libfdlibm/s_matherr.c : jdk/src/share/native/java/lang/fdlibm/src/s_matherr.c +jdk/src/java.base/share/native/libfdlibm/s_modf.c : jdk/src/share/native/java/lang/fdlibm/src/s_modf.c +jdk/src/java.base/share/native/libfdlibm/s_nextafter.c : jdk/src/share/native/java/lang/fdlibm/src/s_nextafter.c +jdk/src/java.base/share/native/libfdlibm/s_rint.c : jdk/src/share/native/java/lang/fdlibm/src/s_rint.c +jdk/src/java.base/share/native/libfdlibm/s_scalbn.c : jdk/src/share/native/java/lang/fdlibm/src/s_scalbn.c +jdk/src/java.base/share/native/libfdlibm/s_signgam.c : jdk/src/share/native/java/lang/fdlibm/src/s_signgam.c +jdk/src/java.base/share/native/libfdlibm/s_significand.c : jdk/src/share/native/java/lang/fdlibm/src/s_significand.c +jdk/src/java.base/share/native/libfdlibm/s_sin.c : jdk/src/share/native/java/lang/fdlibm/src/s_sin.c +jdk/src/java.base/share/native/libfdlibm/s_tan.c : jdk/src/share/native/java/lang/fdlibm/src/s_tan.c +jdk/src/java.base/share/native/libfdlibm/s_tanh.c : jdk/src/share/native/java/lang/fdlibm/src/s_tanh.c +jdk/src/java.base/share/native/libfdlibm/w_acos.c : jdk/src/share/native/java/lang/fdlibm/src/w_acos.c +jdk/src/java.base/share/native/libfdlibm/w_asin.c : jdk/src/share/native/java/lang/fdlibm/src/w_asin.c +jdk/src/java.base/share/native/libfdlibm/w_atan2.c : jdk/src/share/native/java/lang/fdlibm/src/w_atan2.c +jdk/src/java.base/share/native/libfdlibm/w_atanh.c : jdk/src/share/native/java/lang/fdlibm/src/w_atanh.c +jdk/src/java.base/share/native/libfdlibm/w_cosh.c : jdk/src/share/native/java/lang/fdlibm/src/w_cosh.c +jdk/src/java.base/share/native/libfdlibm/w_exp.c : jdk/src/share/native/java/lang/fdlibm/src/w_exp.c +jdk/src/java.base/share/native/libfdlibm/w_fmod.c : jdk/src/share/native/java/lang/fdlibm/src/w_fmod.c +jdk/src/java.base/share/native/libfdlibm/w_hypot.c : jdk/src/share/native/java/lang/fdlibm/src/w_hypot.c +jdk/src/java.base/share/native/libfdlibm/w_log10.c : jdk/src/share/native/java/lang/fdlibm/src/w_log10.c +jdk/src/java.base/share/native/libfdlibm/w_log.c : jdk/src/share/native/java/lang/fdlibm/src/w_log.c +jdk/src/java.base/share/native/libfdlibm/w_pow.c : jdk/src/share/native/java/lang/fdlibm/src/w_pow.c +jdk/src/java.base/share/native/libfdlibm/w_remainder.c : jdk/src/share/native/java/lang/fdlibm/src/w_remainder.c +jdk/src/java.base/share/native/libfdlibm/w_scalb.c : jdk/src/share/native/java/lang/fdlibm/src/w_scalb.c +jdk/src/java.base/share/native/libfdlibm/w_sinh.c : jdk/src/share/native/java/lang/fdlibm/src/w_sinh.c +jdk/src/java.base/share/native/libfdlibm/w_sqrt.c : jdk/src/share/native/java/lang/fdlibm/src/w_sqrt.c +jdk/src/java.base/share/native/libjava/AccessController.c : jdk/src/share/native/java/security/AccessController.c +jdk/src/java.base/share/native/libjava/Array.c : jdk/src/share/native/java/lang/reflect/Array.c +jdk/src/java.base/share/native/libjava/AtomicLong.c : jdk/src/share/native/java/util/concurrent/atomic/AtomicLong.c +jdk/src/java.base/share/native/libjava/Bits.c : jdk/src/share/native/java/nio/Bits.c +jdk/src/java.base/share/native/libjava/check_version.c : jdk/src/share/native/common/check_version.c +jdk/src/java.base/share/native/libjava/Class.c : jdk/src/share/native/java/lang/Class.c +jdk/src/java.base/share/native/libjava/ClassLoader.c : jdk/src/share/native/java/lang/ClassLoader.c +jdk/src/java.base/share/native/libjava/Compiler.c : jdk/src/share/native/java/lang/Compiler.c +jdk/src/java.base/share/native/libjava/ConstantPool.c : jdk/src/share/native/sun/reflect/ConstantPool.c +jdk/src/java.base/share/native/libjava/Double.c : jdk/src/share/native/java/lang/Double.c +jdk/src/java.base/share/native/libjava/Executable.c : jdk/src/share/native/java/lang/reflect/Executable.c +jdk/src/java.base/share/native/libjava/Field.c : jdk/src/share/native/java/lang/reflect/Field.c +jdk/src/java.base/share/native/libjava/FileInputStream.c : jdk/src/share/native/java/io/FileInputStream.c +jdk/src/java.base/share/native/libjava/Float.c : jdk/src/share/native/java/lang/Float.c +jdk/src/java.base/share/native/libjava/GC.c : jdk/src/share/native/sun/misc/GC.c +jdk/src/java.base/share/native/libjava/gdefs.h : jdk/src/share/native/common/gdefs.h +jdk/src/java.base/share/native/libjava/io_util.c : jdk/src/share/native/java/io/io_util.c +jdk/src/java.base/share/native/libjava/io_util.h : jdk/src/share/native/java/io/io_util.h +jdk/src/java.base/share/native/libjava/java_props.h : jdk/src/share/native/java/lang/java_props.h +jdk/src/java.base/share/native/libjava/jdk_util.c : jdk/src/share/native/common/jdk_util.c +jdk/src/java.base/share/native/libjava/jdk_util.h : jdk/src/share/native/common/jdk_util.h +jdk/src/java.base/share/native/libjava/jio.c : jdk/src/share/native/common/jio.c +jdk/src/java.base/share/native/libjava/jlong.h : jdk/src/share/native/common/jlong.h +jdk/src/java.base/share/native/libjava/jni_util.c : jdk/src/share/native/common/jni_util.c +jdk/src/java.base/share/native/libjava/jni_util.h : jdk/src/share/native/common/jni_util.h +jdk/src/java.base/share/native/libjava/MessageUtils.c : jdk/src/share/native/sun/misc/MessageUtils.c +jdk/src/java.base/share/native/libjava/NativeAccessors.c : jdk/src/share/native/sun/reflect/NativeAccessors.c +jdk/src/java.base/share/native/libjava/NativeSignalHandler.c : jdk/src/share/native/sun/misc/NativeSignalHandler.c +jdk/src/java.base/share/native/libjava/Object.c : jdk/src/share/native/java/lang/Object.c +jdk/src/java.base/share/native/libjava/ObjectInputStream.c : jdk/src/share/native/java/io/ObjectInputStream.c +jdk/src/java.base/share/native/libjava/ObjectOutputStream.c : jdk/src/share/native/java/io/ObjectOutputStream.c +jdk/src/java.base/share/native/libjava/ObjectStreamClass.c : jdk/src/share/native/java/io/ObjectStreamClass.c +jdk/src/java.base/share/native/libjava/Package.c : jdk/src/share/native/java/lang/Package.c +jdk/src/java.base/share/native/libjava/Proxy.c : jdk/src/share/native/java/lang/reflect/Proxy.c +jdk/src/java.base/share/native/libjava/RandomAccessFile.c : jdk/src/share/native/java/io/RandomAccessFile.c +jdk/src/java.base/share/native/libjava/Reflection.c : jdk/src/share/native/sun/reflect/Reflection.c +jdk/src/java.base/share/native/libjava/Runtime.c : jdk/src/share/native/java/lang/Runtime.c +jdk/src/java.base/share/native/libjava/SecurityManager.c : jdk/src/share/native/java/lang/SecurityManager.c +jdk/src/java.base/share/native/libjava/Shutdown.c : jdk/src/share/native/java/lang/Shutdown.c +jdk/src/java.base/share/native/libjava/Signal.c : jdk/src/share/native/sun/misc/Signal.c +jdk/src/java.base/share/native/libjava/sizecalc.h : jdk/src/share/native/common/sizecalc.h +jdk/src/java.base/share/native/libjava/StrictMath.c : jdk/src/share/native/java/lang/StrictMath.c +jdk/src/java.base/share/native/libjava/String.c : jdk/src/share/native/java/lang/String.c +jdk/src/java.base/share/native/libjava/System.c : jdk/src/share/native/java/lang/System.c +jdk/src/java.base/share/native/libjava/Thread.c : jdk/src/share/native/java/lang/Thread.c +jdk/src/java.base/share/native/libjava/Throwable.c : jdk/src/share/native/java/lang/Throwable.c +jdk/src/java.base/share/native/libjava/TimeZone.c : jdk/src/share/native/java/util/TimeZone.c +jdk/src/java.base/share/native/libjava/verify_stub.c : jdk/src/share/native/common/verify_stub.c +jdk/src/java.base/share/native/libjava/Version.c : jdk/src/share/native/sun/misc/Version.c +jdk/src/java.base/share/native/libjava/VM.c : jdk/src/share/native/sun/misc/VM.c +jdk/src/java.base/share/native/libjava/VMSupport.c : jdk/src/share/native/sun/misc/VMSupport.c +jdk/src/java.base/share/native/libjli/emessages.h : jdk/src/share/bin/emessages.h +jdk/src/java.base/share/native/libjli/java.c : jdk/src/share/bin/java.c +jdk/src/java.base/share/native/libjli/java.h : jdk/src/share/bin/java.h +jdk/src/java.base/share/native/libjli/jli_util.c : jdk/src/share/bin/jli_util.c +jdk/src/java.base/share/native/libjli/jli_util.h : jdk/src/share/bin/jli_util.h +jdk/src/java.base/share/native/libjli/manifest_info.h : jdk/src/share/bin/manifest_info.h +jdk/src/java.base/share/native/libjli/parse_manifest.c : jdk/src/share/bin/parse_manifest.c +jdk/src/java.base/share/native/libjli/splashscreen.h : jdk/src/share/bin/splashscreen.h +jdk/src/java.base/share/native/libjli/splashscreen_stubs.c : jdk/src/share/bin/splashscreen_stubs.c +jdk/src/java.base/share/native/libjli/version_comp.c : jdk/src/share/bin/version_comp.c +jdk/src/java.base/share/native/libjli/version_comp.h : jdk/src/share/bin/version_comp.h +jdk/src/java.base/share/native/libjli/wildcard.c : jdk/src/share/bin/wildcard.c +jdk/src/java.base/share/native/libjli/wildcard.h : jdk/src/share/bin/wildcard.h +jdk/src/java.base/share/native/libnet : jdk/src/share/native/java/net +jdk/src/java.base/share/native/libnio/ch/nio.h : jdk/src/share/native/sun/nio/ch/nio.h +jdk/src/java.base/share/native/libverify/check_code.c : jdk/src/share/native/common/check_code.c +jdk/src/java.base/share/native/libverify/check_format.c : jdk/src/share/native/common/check_format.c +jdk/src/java.base/share/native/libverify/opcodes.in_out : jdk/src/share/native/common/opcodes.in_out +jdk/src/java.base/share/native/libzip : jdk/src/share/native/java/util/zip +jdk/src/java.base/share/native/libzip/zlib-1.2.8 : jdk/src/share/native/java/util/zip/zlib-1.2.8 +jdk/src/java.base/share/native/libzip/zlib-1.2.8/patches/ChangeLog_java : jdk/src/share/native/java/util/zip/zlib-1.2.8/patches/ChangeLog_java +jdk/src/java.base/unix/classes/java/io : jdk/src/solaris/classes/java/io +jdk/src/java.base/unix/classes/java/lang : jdk/src/solaris/classes/java/lang +jdk/src/java.base/unix/classes/java/net : jdk/src/solaris/classes/java/net +jdk/src/java.base/unix/classes/sun/misc : jdk/src/solaris/classes/sun/misc +jdk/src/java.base/unix/classes/sun/net/dns/ResolverConfigurationImpl.java : jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java +jdk/src/java.base/unix/classes/sun/net : jdk/src/solaris/classes/sun/net +jdk/src/java.base/unix/classes/sun/net/sdp/SdpProvider.java : jdk/src/solaris/classes/sun/net/sdp/SdpProvider.java +jdk/src/java.base/unix/classes/sun/net/www/content-types.properties : jdk/src/solaris/classes/sun/net/www/content-types.properties +jdk/src/java.base/unix/classes/sun/net/www/protocol/file/Handler.java : jdk/src/solaris/classes/sun/net/www/protocol/file/Handler.java +jdk/src/java.base/unix/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java : jdk/src/solaris/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java +jdk/src/java.base/unix/classes/sun/net/www/protocol/jar/JarFileFactory.java : jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java +jdk/src/java.base/unix/classes/sun/nio/ch : jdk/src/solaris/classes/sun/nio/ch +jdk/src/java.base/unix/classes/sun/nio/fs : jdk/src/solaris/classes/sun/nio/fs +jdk/src/java.base/unix/classes/sun/security/provider : jdk/src/solaris/classes/sun/security/provider +jdk/src/java.base/unix/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java : jdk/src/solaris/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java +jdk/src/java.base/unix/conf/amd64/jvm.cfg : jdk/src/solaris/bin/amd64/jvm.cfg +jdk/src/java.base/unix/conf/arm/jvm.cfg : jdk/src/solaris/bin/arm/jvm.cfg +jdk/src/java.base/unix/conf/i586/jvm.cfg : jdk/src/solaris/bin/i586/jvm.cfg +jdk/src/java.base/unix/conf/ia64/jvm.cfg : jdk/src/solaris/bin/ia64/jvm.cfg +jdk/src/java.base/unix/conf/ppc64/jvm.cfg : jdk/src/solaris/bin/ppc64/jvm.cfg +jdk/src/java.base/unix/conf/ppc/jvm.cfg : jdk/src/solaris/bin/ppc/jvm.cfg +jdk/src/java.base/unix/conf/sdp/sdp.conf.template : jdk/src/solaris/lib/sdp/sdp.conf.template +jdk/src/java.base/unix/conf/sparc/jvm.cfg : jdk/src/solaris/bin/sparc/jvm.cfg +jdk/src/java.base/unix/conf/sparcv9/jvm.cfg : jdk/src/solaris/bin/sparcv9/jvm.cfg +jdk/src/java.base/unix/conf/zero/jvm.cfg : jdk/src/solaris/bin/zero/jvm.cfg +jdk/src/java.base/unix/native/include/jni_md.h : jdk/src/solaris/javavm/export/jni_md.h +jdk/src/java.base/unix/native/include/jvm_md.h : jdk/src/solaris/javavm/export/jvm_md.h +jdk/src/java.base/unix/native/jspawnhelper/jspawnhelper.c : jdk/src/solaris/native/java/lang/jspawnhelper.c +jdk/src/java.base/unix/native/launcher/jexec.c : jdk/src/solaris/bin/jexec.c +jdk/src/java.base/unix/native/libjava/canonicalize_md.c : jdk/src/solaris/native/java/io/canonicalize_md.c +jdk/src/java.base/unix/native/libjava/childproc.c : jdk/src/solaris/native/java/lang/childproc.c +jdk/src/java.base/unix/native/libjava/childproc.h : jdk/src/solaris/native/java/lang/childproc.h +jdk/src/java.base/unix/native/libjava/Console_md.c : jdk/src/solaris/native/java/io/Console_md.c +jdk/src/java.base/unix/native/libjava/FileDescriptor_md.c : jdk/src/solaris/native/java/io/FileDescriptor_md.c +jdk/src/java.base/unix/native/libjava/FileInputStream_md.c : jdk/src/solaris/native/java/io/FileInputStream_md.c +jdk/src/java.base/unix/native/libjava/FileOutputStream_md.c : jdk/src/solaris/native/java/io/FileOutputStream_md.c +jdk/src/java.base/unix/native/libjava/gdefs_md.h : jdk/src/solaris/native/common/gdefs_md.h +jdk/src/java.base/unix/native/libjava/io_util_md.c : jdk/src/solaris/native/java/io/io_util_md.c +jdk/src/java.base/unix/native/libjava/io_util_md.h : jdk/src/solaris/native/java/io/io_util_md.h +jdk/src/java.base/unix/native/libjava/java_props_macosx.c : jdk/src/solaris/native/java/lang/java_props_macosx.c +jdk/src/java.base/unix/native/libjava/java_props_macosx.h : jdk/src/solaris/native/java/lang/java_props_macosx.h +jdk/src/java.base/unix/native/libjava/java_props_md.c : jdk/src/solaris/native/java/lang/java_props_md.c +jdk/src/java.base/unix/native/libjava/jdk_util_md.c : jdk/src/solaris/native/common/jdk_util_md.c +jdk/src/java.base/unix/native/libjava/jdk_util_md.h : jdk/src/solaris/native/common/jdk_util_md.h +jdk/src/java.base/unix/native/libjava/jlong_md.h : jdk/src/solaris/native/common/jlong_md.h +jdk/src/java.base/unix/native/libjava/jni_util_md.c : jdk/src/solaris/native/common/jni_util_md.c +jdk/src/java.base/unix/native/libjava/locale_str.h : jdk/src/solaris/native/java/lang/locale_str.h +jdk/src/java.base/unix/native/libjava/ProcessEnvironment_md.c : jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c +jdk/src/java.base/unix/native/libjava/RandomAccessFile_md.c : jdk/src/solaris/native/java/io/RandomAccessFile_md.c +jdk/src/java.base/unix/native/libjava/TimeZone_md.c : jdk/src/solaris/native/java/util/TimeZone_md.c +jdk/src/java.base/unix/native/libjava/TimeZone_md.h : jdk/src/solaris/native/java/util/TimeZone_md.h +jdk/src/java.base/unix/native/libjava/UnixFileSystem_md.c : jdk/src/solaris/native/java/io/UnixFileSystem_md.c +jdk/src/java.base/unix/native/libjava/UNIXProcess_md.c : jdk/src/solaris/native/java/lang/UNIXProcess_md.c +jdk/src/java.base/unix/native/libjava/VM_md.c : jdk/src/solaris/native/sun/misc/VM_md.c +jdk/src/java.base/unix/native/libjli/ergo.c : jdk/src/solaris/bin/ergo.c +jdk/src/java.base/unix/native/libjli/ergo.h : jdk/src/solaris/bin/ergo.h +jdk/src/java.base/unix/native/libjli/ergo_i586.c : jdk/src/solaris/bin/ergo_i586.c +jdk/src/java.base/unix/native/libjli/java_md_common.c : jdk/src/solaris/bin/java_md_common.c +jdk/src/java.base/unix/native/libjli/java_md.h : jdk/src/solaris/bin/java_md.h +jdk/src/java.base/unix/native/libjli/java_md_solinux.c : jdk/src/solaris/bin/java_md_solinux.c +jdk/src/java.base/unix/native/libjli/java_md_solinux.h : jdk/src/solaris/bin/java_md_solinux.h +jdk/src/java.base/unix/native/libnet/bsd_close.c : jdk/src/solaris/native/java/net/bsd_close.c +jdk/src/java.base/unix/native/libnet/DefaultProxySelector.c : jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c +jdk/src/java.base/unix/native/libnet/ExtendedOptionsImpl.c : jdk/src/solaris/native/java/net/ExtendedOptionsImpl.c +jdk/src/java.base/unix/native/libnet/Inet4AddressImpl.c : jdk/src/solaris/native/java/net/Inet4AddressImpl.c +jdk/src/java.base/unix/native/libnet/Inet6AddressImpl.c : jdk/src/solaris/native/java/net/Inet6AddressImpl.c +jdk/src/java.base/unix/native/libnet/InetAddressImplFactory.c : jdk/src/solaris/native/java/net/InetAddressImplFactory.c +jdk/src/java.base/unix/native/libnet/linux_close.c : jdk/src/solaris/native/java/net/linux_close.c +jdk/src/java.base/unix/native/libnet/net_util_md.c : jdk/src/solaris/native/java/net/net_util_md.c +jdk/src/java.base/unix/native/libnet/net_util_md.h : jdk/src/solaris/native/java/net/net_util_md.h +jdk/src/java.base/unix/native/libnet/NetworkInterface.c : jdk/src/solaris/native/java/net/NetworkInterface.c +jdk/src/java.base/unix/native/libnet/PlainDatagramSocketImpl.c : jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c +jdk/src/java.base/unix/native/libnet/PlainSocketImpl.c : jdk/src/solaris/native/java/net/PlainSocketImpl.c +jdk/src/java.base/unix/native/libnet/portconfig.c : jdk/src/solaris/native/sun/net/portconfig.c +jdk/src/java.base/unix/native/libnet/ResolverConfigurationImpl.c : jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c +jdk/src/java.base/unix/native/libnet/SdpSupport.c : jdk/src/solaris/native/sun/net/sdp/SdpSupport.c +jdk/src/java.base/unix/native/libnet/SocketInputStream.c : jdk/src/solaris/native/java/net/SocketInputStream.c +jdk/src/java.base/unix/native/libnet/SocketOutputStream.c : jdk/src/solaris/native/java/net/SocketOutputStream.c +jdk/src/java.base/unix/native/libnet/solaris_close.c : jdk/src/solaris/native/java/net/solaris_close.c +jdk/src/java.base/unix/native/libnio/ch : jdk/src/solaris/native/sun/nio/ch +jdk/src/java.base/unix/native/libnio/fs : jdk/src/solaris/native/sun/nio/fs +jdk/src/java.base/unix/native/libnio/MappedByteBuffer.c : jdk/src/solaris/native/java/nio/MappedByteBuffer.c +jdk/src/java.base/windows/classes/java/io : jdk/src/windows/classes/java/io +jdk/src/java.base/windows/classes/java/lang : jdk/src/windows/classes/java/lang +jdk/src/java.base/windows/classes/java/net : jdk/src/windows/classes/java/net +jdk/src/java.base/windows/classes/sun/misc : jdk/src/windows/classes/sun/misc +jdk/src/java.base/windows/classes/sun/net/dns/ResolverConfigurationImpl.java : jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java +jdk/src/java.base/windows/classes/sun/net : jdk/src/windows/classes/sun/net +jdk/src/java.base/windows/classes/sun/net/www/content-types.properties : jdk/src/windows/classes/sun/net/www/content-types.properties +jdk/src/java.base/windows/classes/sun/net/www/protocol/file/Handler.java : jdk/src/windows/classes/sun/net/www/protocol/file/Handler.java +jdk/src/java.base/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java : jdk/src/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java +jdk/src/java.base/windows/classes/sun/net/www/protocol/jar/JarFileFactory.java : jdk/src/windows/classes/sun/net/www/protocol/jar/JarFileFactory.java +jdk/src/java.base/windows/classes/sun/nio/ch : jdk/src/windows/classes/sun/nio/ch +jdk/src/java.base/windows/classes/sun/nio/fs : jdk/src/windows/classes/sun/nio/fs +jdk/src/java.base/windows/classes/sun/security/provider : jdk/src/windows/classes/sun/security/provider +jdk/src/java.base/windows/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java : jdk/src/windows/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java +jdk/src/java.base/windows/conf/amd64/jvm.cfg : jdk/src/windows/bin/amd64/jvm.cfg +jdk/src/java.base/windows/conf/i586/jvm.cfg : jdk/src/windows/bin/i586/jvm.cfg +jdk/src/java.base/windows/conf/ia64/jvm.cfg : jdk/src/windows/bin/ia64/jvm.cfg +jdk/src/java.base/windows/conf/tzmappings : jdk/src/windows/lib/tzmappings +jdk/src/java.base/windows/native/common/version.rc : jdk/src/windows/resource/version.rc +jdk/src/java.base/windows/native/include/jni_md.h : jdk/src/windows/javavm/export/jni_md.h +jdk/src/java.base/windows/native/include/jvm_md.h : jdk/src/windows/javavm/export/jvm_md.h +jdk/src/java.base/windows/native/launcher/icons/awt.ico : jdk/src/windows/resource/icons/awt.ico +jdk/src/java.base/windows/native/launcher/java.manifest : jdk/src/windows/resource/java.manifest +jdk/src/java.base/windows/native/launcher/java.rc : jdk/src/windows/resource/java.rc +jdk/src/java.base/windows/native/libjava/canonicalize_md.c : jdk/src/windows/native/java/io/canonicalize_md.c +jdk/src/java.base/windows/native/libjava/Console_md.c : jdk/src/windows/native/java/io/Console_md.c +jdk/src/java.base/windows/native/libjava/dirent_md.c : jdk/src/windows/native/java/io/dirent_md.c +jdk/src/java.base/windows/native/libjava/dirent_md.h : jdk/src/windows/native/java/io/dirent_md.h +jdk/src/java.base/windows/native/libjava/FileDescriptor_md.c : jdk/src/windows/native/java/io/FileDescriptor_md.c +jdk/src/java.base/windows/native/libjava/FileInputStream_md.c : jdk/src/windows/native/java/io/FileInputStream_md.c +jdk/src/java.base/windows/native/libjava/FileOutputStream_md.c : jdk/src/windows/native/java/io/FileOutputStream_md.c +jdk/src/java.base/windows/native/libjava/gdefs_md.h : jdk/src/windows/native/common/gdefs_md.h +jdk/src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c : jdk/src/windows/native/sun/util/locale/provider/HostLocaleProviderAdapter_md.c +jdk/src/java.base/windows/native/libjava/io_util_md.c : jdk/src/windows/native/java/io/io_util_md.c +jdk/src/java.base/windows/native/libjava/io_util_md.h : jdk/src/windows/native/java/io/io_util_md.h +jdk/src/java.base/windows/native/libjava/java_main_md.h : jdk/src/windows/native/common/java_main_md.h +jdk/src/java.base/windows/native/libjava/java_props_md.c : jdk/src/windows/native/java/lang/java_props_md.c +jdk/src/java.base/windows/native/libjava/jdk_util_md.c : jdk/src/windows/native/common/jdk_util_md.c +jdk/src/java.base/windows/native/libjava/jdk_util_md.h : jdk/src/windows/native/common/jdk_util_md.h +jdk/src/java.base/windows/native/libjava/jlong_md.h : jdk/src/windows/native/common/jlong_md.h +jdk/src/java.base/windows/native/libjava/jni_util_md.c : jdk/src/windows/native/common/jni_util_md.c +jdk/src/java.base/windows/native/libjava/locale_str.h : jdk/src/windows/native/common/locale_str.h +jdk/src/java.base/windows/native/libjava/ProcessEnvironment_md.c : jdk/src/windows/native/java/lang/ProcessEnvironment_md.c +jdk/src/java.base/windows/native/libjava/ProcessImpl_md.c : jdk/src/windows/native/java/lang/ProcessImpl_md.c +jdk/src/java.base/windows/native/libjava/RandomAccessFile_md.c : jdk/src/windows/native/java/io/RandomAccessFile_md.c +jdk/src/java.base/windows/native/libjava/TimeZone_md.c : jdk/src/windows/native/java/util/TimeZone_md.c +jdk/src/java.base/windows/native/libjava/TimeZone_md.h : jdk/src/windows/native/java/util/TimeZone_md.h +jdk/src/java.base/windows/native/libjava/VM_md.c : jdk/src/windows/native/sun/misc/VM_md.c +jdk/src/java.base/windows/native/libjava/Win32ErrorMode.c : jdk/src/windows/native/sun/io/Win32ErrorMode.c +jdk/src/java.base/windows/native/libjava/WinCAPISeedGenerator.c : jdk/src/windows/native/sun/security/provider/WinCAPISeedGenerator.c +jdk/src/java.base/windows/native/libjava/WinNTFileSystem_md.c : jdk/src/windows/native/java/io/WinNTFileSystem_md.c +jdk/src/java.base/windows/native/libjli : jdk/src/windows/bin +jdk/src/java.base/windows/native/libnet/DefaultProxySelector.c : jdk/src/windows/native/sun/net/spi/DefaultProxySelector.c +jdk/src/java.base/windows/native/libnet/DualStackPlainDatagramSocketImpl.c : jdk/src/windows/native/java/net/DualStackPlainDatagramSocketImpl.c +jdk/src/java.base/windows/native/libnet/DualStackPlainSocketImpl.c : jdk/src/windows/native/java/net/DualStackPlainSocketImpl.c +jdk/src/java.base/windows/native/libnet/ExtendedOptionsImpl.c : jdk/src/windows/native/java/net/ExtendedOptionsImpl.c +jdk/src/java.base/windows/native/libnet/icmp.h : jdk/src/windows/native/java/net/icmp.h +jdk/src/java.base/windows/native/libnet/Inet4AddressImpl.c : jdk/src/windows/native/java/net/Inet4AddressImpl.c +jdk/src/java.base/windows/native/libnet/Inet6AddressImpl.c : jdk/src/windows/native/java/net/Inet6AddressImpl.c +jdk/src/java.base/windows/native/libnet/InetAddressImplFactory.c : jdk/src/windows/native/java/net/InetAddressImplFactory.c +jdk/src/java.base/windows/native/libnet/net_util_md.c : jdk/src/windows/native/java/net/net_util_md.c +jdk/src/java.base/windows/native/libnet/net_util_md.h : jdk/src/windows/native/java/net/net_util_md.h +jdk/src/java.base/windows/native/libnet/NetworkInterface.c : jdk/src/windows/native/java/net/NetworkInterface.c +jdk/src/java.base/windows/native/libnet/NetworkInterface.h : jdk/src/windows/native/java/net/NetworkInterface.h +jdk/src/java.base/windows/native/libnet/NetworkInterface_winXP.c : jdk/src/windows/native/java/net/NetworkInterface_winXP.c +jdk/src/java.base/windows/native/libnet/NTLMAuthSequence.c : jdk/src/windows/native/sun/net/www/protocol/http/ntlm/NTLMAuthSequence.c +jdk/src/java.base/windows/native/libnet/portconfig.c : jdk/src/windows/native/sun/net/portconfig.c +jdk/src/java.base/windows/native/libnet/ResolverConfigurationImpl.c : jdk/src/windows/native/sun/net/dns/ResolverConfigurationImpl.c +jdk/src/java.base/windows/native/libnet/SocketInputStream.c : jdk/src/windows/native/java/net/SocketInputStream.c +jdk/src/java.base/windows/native/libnet/SocketOutputStream.c : jdk/src/windows/native/java/net/SocketOutputStream.c +jdk/src/java.base/windows/native/libnet/TwoStacksPlainDatagramSocketImpl.c : jdk/src/windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c +jdk/src/java.base/windows/native/libnet/TwoStacksPlainSocketImpl.c : jdk/src/windows/native/java/net/TwoStacksPlainSocketImpl.c +jdk/src/java.base/windows/native/libnio/ch : jdk/src/windows/native/sun/nio/ch +jdk/src/java.base/windows/native/libnio/fs : jdk/src/windows/native/sun/nio/fs +jdk/src/java.base/windows/native/libnio/MappedByteBuffer.c : jdk/src/windows/native/java/nio/MappedByteBuffer.c +jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming : jdk/src/share/classes/com/sun/jndi/cosnaming +jdk/src/java.corba/share/classes/com/sun/jndi/toolkit/corba : jdk/src/share/classes/com/sun/jndi/toolkit/corba +jdk/src/java.corba/share/classes/com/sun/jndi/url/corbaname : jdk/src/share/classes/com/sun/jndi/url/corbaname +jdk/src/java.corba/share/classes/com/sun/jndi/url/iiop : jdk/src/share/classes/com/sun/jndi/url/iiop +jdk/src/java.corba/share/classes/com/sun/jndi/url/iiopname : jdk/src/share/classes/com/sun/jndi/url/iiopname +jdk/src/java.desktop/aix/native/libawt : jdk/src/aix/porting +jdk/src/java.desktop/linux/conf/oblique-fonts/fonts.dir : jdk/src/solaris/classes/sun/awt/motif/java.oblique-fonts.dir +jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/package.html : jdk/src/macosx/classes/com/apple/eawt/event/package.html +jdk/src/java.desktop/macosx/classes/com/apple/eawt/package.html : jdk/src/macosx/classes/com/apple/eawt/package.html +jdk/src/java.desktop/macosx/classes/com/apple/eio/package.html : jdk/src/macosx/classes/com/apple/eio/package.html +jdk/src/java.desktop/macosx/classes/com/apple/laf/resources : jdk/src/macosx/classes/com/apple/laf/resources +jdk/src/java.desktop/macosx/classes/sun/awt/resources/awtosx.properties : jdk/src/macosx/classes/sun/awt/resources/awtosx.properties +jdk/src/java.desktop/macosx/classes/sun/java2d/BackBufferCapsProvider.java : jdk/src/macosx/classes/sun/java2d/BackBufferCapsProvider.java +jdk/src/java.desktop/macosx/conf/flavormap.properties : jdk/src/macosx/lib/flavormap.properties +jdk/src/java.desktop/macosx/native/include/jawt_md.h : jdk/src/macosx/javavm/export/jawt_md.h +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/ApplicationDelegate.h : jdk/src/macosx/native/sun/awt/ApplicationDelegate.h +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/ApplicationDelegate.m : jdk/src/macosx/native/sun/awt/ApplicationDelegate.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/awt_DrawingSurface.m : jdk/src/macosx/native/sun/awt/awt_DrawingSurface.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTEvent.h : jdk/src/macosx/native/sun/awt/AWTEvent.h +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTEvent.m : jdk/src/macosx/native/sun/awt/AWTEvent.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/awt.m : jdk/src/macosx/native/sun/awt/awt.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTSurfaceLayers.h : jdk/src/macosx/native/sun/awt/AWTSurfaceLayers.h +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTSurfaceLayers.m : jdk/src/macosx/native/sun/awt/AWTSurfaceLayers.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTView.h : jdk/src/macosx/native/sun/awt/AWTView.h +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTView.m : jdk/src/macosx/native/sun/awt/AWTView.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTWindow.h : jdk/src/macosx/native/sun/awt/AWTWindow.h +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTWindow.m : jdk/src/macosx/native/sun/awt/AWTWindow.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CClipboard.m : jdk/src/macosx/native/sun/awt/CClipboard.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CCursorManager.m : jdk/src/macosx/native/sun/awt/CCursorManager.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDataTransferer.h : jdk/src/macosx/native/sun/awt/CDataTransferer.h +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDataTransferer.m : jdk/src/macosx/native/sun/awt/CDataTransferer.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDesktopPeer.m : jdk/src/macosx/native/sun/awt/CDesktopPeer.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDragSourceContextPeer.m : jdk/src/macosx/native/sun/awt/CDragSourceContextPeer.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDragSource.h : jdk/src/macosx/native/sun/awt/CDragSource.h +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDragSource.m : jdk/src/macosx/native/sun/awt/CDragSource.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDropTargetContextPeer.m : jdk/src/macosx/native/sun/awt/CDropTargetContextPeer.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDropTarget.h : jdk/src/macosx/native/sun/awt/CDropTarget.h +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDropTarget.m : jdk/src/macosx/native/sun/awt/CDropTarget.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CFileDialog.h : jdk/src/macosx/native/sun/awt/CFileDialog.h +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CFileDialog.m : jdk/src/macosx/native/sun/awt/CFileDialog.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CFRetainedResource.m : jdk/src/macosx/native/sun/awt/CFRetainedResource.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CGraphicsConfig.m : jdk/src/macosx/native/sun/awt/CGraphicsConfig.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CGraphicsDevice.m : jdk/src/macosx/native/sun/awt/CGraphicsDevice.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CGraphicsEnv.m : jdk/src/macosx/native/sun/awt/CGraphicsEnv.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CImage.m : jdk/src/macosx/native/sun/awt/CImage.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CInputMethod.m : jdk/src/macosx/native/sun/awt/CInputMethod.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuBar.h : jdk/src/macosx/native/sun/awt/CMenuBar.h +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuBar.m : jdk/src/macosx/native/sun/awt/CMenuBar.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuComponent.h : jdk/src/macosx/native/sun/awt/CMenuComponent.h +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuComponent.m : jdk/src/macosx/native/sun/awt/CMenuComponent.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenu.h : jdk/src/macosx/native/sun/awt/CMenu.h +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuItem.h : jdk/src/macosx/native/sun/awt/CMenuItem.h +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuItem.m : jdk/src/macosx/native/sun/awt/CMenuItem.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenu.m : jdk/src/macosx/native/sun/awt/CMenu.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CPopupMenu.h : jdk/src/macosx/native/sun/awt/CPopupMenu.h +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CPopupMenu.m : jdk/src/macosx/native/sun/awt/CPopupMenu.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CPrinterJob.m : jdk/src/macosx/native/sun/awt/CPrinterJob.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CRobot.m : jdk/src/macosx/native/sun/awt/CRobot.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CSystemColors.h : jdk/src/macosx/native/sun/awt/CSystemColors.h +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CSystemColors.m : jdk/src/macosx/native/sun/awt/CSystemColors.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CTextPipe.m : jdk/src/macosx/native/sun/awt/CTextPipe.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CTrayIcon.h : jdk/src/macosx/native/sun/awt/CTrayIcon.h +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CTrayIcon.m : jdk/src/macosx/native/sun/awt/CTrayIcon.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CWrapper.m : jdk/src/macosx/native/sun/awt/CWrapper.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/DnDUtilities.h : jdk/src/macosx/native/sun/awt/DnDUtilities.h +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/DnDUtilities.m : jdk/src/macosx/native/sun/awt/DnDUtilities.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/GeomUtilities.h : jdk/src/macosx/native/sun/awt/GeomUtilities.h +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/GeomUtilities.m : jdk/src/macosx/native/sun/awt/GeomUtilities.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/ImageSurfaceData.h : jdk/src/macosx/native/sun/awt/ImageSurfaceData.h +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/ImageSurfaceData.m : jdk/src/macosx/native/sun/awt/ImageSurfaceData.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/InitIDs.h : jdk/src/macosx/native/sun/awt/InitIDs.h +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/InitIDs.m : jdk/src/macosx/native/sun/awt/InitIDs.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaAccessibilityAction.h : jdk/src/macosx/native/sun/awt/JavaAccessibilityAction.h +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaAccessibilityAction.m : jdk/src/macosx/native/sun/awt/JavaAccessibilityAction.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaAccessibilityUtilities.h : jdk/src/macosx/native/sun/awt/JavaAccessibilityUtilities.h +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaAccessibilityUtilities.m : jdk/src/macosx/native/sun/awt/JavaAccessibilityUtilities.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaComponentAccessibility.h : jdk/src/macosx/native/sun/awt/JavaComponentAccessibility.h +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaComponentAccessibility.m : jdk/src/macosx/native/sun/awt/JavaComponentAccessibility.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaTextAccessibility.h : jdk/src/macosx/native/sun/awt/JavaTextAccessibility.h +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaTextAccessibility.m : jdk/src/macosx/native/sun/awt/JavaTextAccessibility.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/LWCToolkit.h : jdk/src/macosx/native/sun/awt/LWCToolkit.h +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/LWCToolkit.m : jdk/src/macosx/native/sun/awt/LWCToolkit.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/OSVersion.h : jdk/src/macosx/native/sun/awt/OSVersion.h +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/OSVersion.m : jdk/src/macosx/native/sun/awt/OSVersion.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrinterSurfaceData.h : jdk/src/macosx/native/sun/awt/PrinterSurfaceData.h +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrinterSurfaceData.m : jdk/src/macosx/native/sun/awt/PrinterSurfaceData.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrinterView.h : jdk/src/macosx/native/sun/awt/PrinterView.h +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrinterView.m : jdk/src/macosx/native/sun/awt/PrinterView.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrintModel.h : jdk/src/macosx/native/sun/awt/PrintModel.h +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrintModel.m : jdk/src/macosx/native/sun/awt/PrintModel.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/QuartzRenderer.m : jdk/src/macosx/native/sun/awt/QuartzRenderer.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/QuartzSurfaceData.h : jdk/src/macosx/native/sun/awt/QuartzSurfaceData.h +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/QuartzSurfaceData.m : jdk/src/macosx/native/sun/awt/QuartzSurfaceData.m +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font : jdk/src/macosx/native/sun/font +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/J2D_GL/cglext.h : jdk/src/macosx/native/sun/java2d/opengl/J2D_GL/cglext.h +jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl : jdk/src/macosx/native/sun/java2d/opengl +jdk/src/java.desktop/macosx/native/libjawt/jawt.m : jdk/src/macosx/native/sun/awt/jawt.m +jdk/src/java.desktop/macosx/native/libjsound : jdk/src/macosx/native/com/sun/media/sound +jdk/src/java.desktop/macosx/native/libosxapp : jdk/src/macosx/native/sun/osxapp +jdk/src/java.desktop/macosx/native/libosxui : jdk/src/macosx/native/com/apple/laf +jdk/src/java.desktop/macosx/native/libsplashscreen : jdk/src/macosx/native/sun/awt/splashscreen +jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources : jdk/src/share/classes/com/sun/accessibility/internal/resources +jdk/src/java.desktop/share/classes/com/sun/awt : jdk/src/share/classes/com/sun/awt +jdk/src/java.desktop/share/classes/com/sun/beans/decoder : jdk/src/share/classes/com/sun/beans/decoder +jdk/src/java.desktop/share/classes/com/sun/beans/editors : jdk/src/share/classes/com/sun/beans/editors +jdk/src/java.desktop/share/classes/com/sun/beans/finder : jdk/src/share/classes/com/sun/beans/finder +jdk/src/java.desktop/share/classes/com/sun/beans/infos : jdk/src/share/classes/com/sun/beans/infos +jdk/src/java.desktop/share/classes/com/sun/beans : jdk/src/share/classes/com/sun/beans +jdk/src/java.desktop/share/classes/com/sun/beans/util : jdk/src/share/classes/com/sun/beans/util +jdk/src/java.desktop/share/classes/com/sun/imageio : jdk/src/share/classes/com/sun/imageio +jdk/src/java.desktop/share/classes/com/sun/java/swing : jdk/src/share/classes/com/sun/java/swing +jdk/src/java.desktop/share/classes/com/sun/media/sound : jdk/src/share/classes/com/sun/media/sound +jdk/src/java.desktop/share/classes/com/sun/swing : jdk/src/share/classes/com/sun/swing +jdk/src/java.desktop/share/classes/java/applet : jdk/src/share/classes/java/applet +jdk/src/java.desktop/share/classes/java/awt : jdk/src/share/classes/java/awt +jdk/src/java.desktop/share/classes/java/beans : jdk/src/share/classes/java/beans +jdk/src/java.desktop/share/classes/javax/accessibility : jdk/src/share/classes/javax/accessibility +jdk/src/java.desktop/share/classes/javax/imageio : jdk/src/share/classes/javax/imageio +jdk/src/java.desktop/share/classes/javax/print : jdk/src/share/classes/javax/print +jdk/src/java.desktop/share/classes/javax/sound : jdk/src/share/classes/javax/sound +jdk/src/java.desktop/share/classes/javax/swing : jdk/src/share/classes/javax/swing +jdk/src/java.desktop/share/classes/META-INF/services : jdk/src/share/classes/com/sun/media/sound/services +jdk/src/java.desktop/share/classes/sun/applet : jdk/src/share/classes/sun/applet +jdk/src/java.desktop/share/classes/sun/audio : jdk/src/share/classes/sun/audio +jdk/src/java.desktop/share/classes/sun/awt : jdk/src/share/classes/sun/awt +jdk/src/java.desktop/share/classes/sun/font : jdk/src/share/classes/sun/font +jdk/src/java.desktop/share/classes/sun/java2d : jdk/src/share/classes/sun/java2d +jdk/src/java.desktop/share/classes/sun/net/www/content/audio : jdk/src/share/classes/sun/net/www/content/audio +jdk/src/java.desktop/share/classes/sun/net/www/content/image : jdk/src/share/classes/sun/net/www/content/image +jdk/src/java.desktop/share/classes/sun/print/AttributeUpdater.java : jdk/src/share/classes/sun/print/AttributeUpdater.java +jdk/src/java.desktop/share/classes/sun/print/BackgroundLookupListener.java : jdk/src/share/classes/sun/print/BackgroundLookupListener.java +jdk/src/java.desktop/share/classes/sun/print/BackgroundServiceLookup.java : jdk/src/share/classes/sun/print/BackgroundServiceLookup.java +jdk/src/java.desktop/share/classes/sun/print/CustomMediaSizeName.java : jdk/src/share/classes/sun/print/CustomMediaSizeName.java +jdk/src/java.desktop/share/classes/sun/print/CustomMediaTray.java : jdk/src/share/classes/sun/print/CustomMediaTray.java +jdk/src/java.desktop/share/classes/sun/print/DialogOwner.java : jdk/src/share/classes/sun/print/DialogOwner.java +jdk/src/java.desktop/share/classes/sun/print/DocumentPropertiesUI.java : jdk/src/share/classes/sun/print/DocumentPropertiesUI.java +jdk/src/java.desktop/share/classes/sun/print/ImagePrinter.java : jdk/src/share/classes/sun/print/ImagePrinter.java +jdk/src/java.desktop/share/classes/sun/print/OpenBook.java : jdk/src/share/classes/sun/print/OpenBook.java +jdk/src/java.desktop/share/classes/sun/print/PageableDoc.java : jdk/src/share/classes/sun/print/PageableDoc.java +jdk/src/java.desktop/share/classes/sun/print/PathGraphics.java : jdk/src/share/classes/sun/print/PathGraphics.java +jdk/src/java.desktop/share/classes/sun/print/PeekGraphics.java : jdk/src/share/classes/sun/print/PeekGraphics.java +jdk/src/java.desktop/share/classes/sun/print/PeekMetrics.java : jdk/src/share/classes/sun/print/PeekMetrics.java +jdk/src/java.desktop/share/classes/sun/print/PrinterGraphicsConfig.java : jdk/src/share/classes/sun/print/PrinterGraphicsConfig.java +jdk/src/java.desktop/share/classes/sun/print/PrinterGraphicsDevice.java : jdk/src/share/classes/sun/print/PrinterGraphicsDevice.java +jdk/src/java.desktop/share/classes/sun/print/PrinterJobWrapper.java : jdk/src/share/classes/sun/print/PrinterJobWrapper.java +jdk/src/java.desktop/share/classes/sun/print/PrintJob2D.java : jdk/src/share/classes/sun/print/PrintJob2D.java +jdk/src/java.desktop/share/classes/sun/print/PrintJobAttributeException.java : jdk/src/share/classes/sun/print/PrintJobAttributeException.java +jdk/src/java.desktop/share/classes/sun/print/PrintJobFlavorException.java : jdk/src/share/classes/sun/print/PrintJobFlavorException.java +jdk/src/java.desktop/share/classes/sun/print/ProxyGraphics2D.java : jdk/src/share/classes/sun/print/ProxyGraphics2D.java +jdk/src/java.desktop/share/classes/sun/print/ProxyGraphics.java : jdk/src/share/classes/sun/print/ProxyGraphics.java +jdk/src/java.desktop/share/classes/sun/print/ProxyPrintGraphics.java : jdk/src/share/classes/sun/print/ProxyPrintGraphics.java +jdk/src/java.desktop/share/classes/sun/print/PSPathGraphics.java : jdk/src/share/classes/sun/print/PSPathGraphics.java +jdk/src/java.desktop/share/classes/sun/print/PSPrinterJob.java : jdk/src/share/classes/sun/print/PSPrinterJob.java +jdk/src/java.desktop/share/classes/sun/print/PSStreamPrinterFactory.java : jdk/src/share/classes/sun/print/PSStreamPrinterFactory.java +jdk/src/java.desktop/share/classes/sun/print/PSStreamPrintJob.java : jdk/src/share/classes/sun/print/PSStreamPrintJob.java +jdk/src/java.desktop/share/classes/sun/print/PSStreamPrintService.java : jdk/src/share/classes/sun/print/PSStreamPrintService.java +jdk/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java : jdk/src/share/classes/sun/print/RasterPrinterJob.java +jdk/src/java.desktop/share/classes/sun/print/resources : jdk/src/share/classes/sun/print/resources +jdk/src/java.desktop/share/classes/sun/print/ServiceDialog.java : jdk/src/share/classes/sun/print/ServiceDialog.java +jdk/src/java.desktop/share/classes/sun/print/ServiceNotifier.java : jdk/src/share/classes/sun/print/ServiceNotifier.java +jdk/src/java.desktop/share/classes/sun/print/SunAlternateMedia.java : jdk/src/share/classes/sun/print/SunAlternateMedia.java +jdk/src/java.desktop/share/classes/sun/print/SunMinMaxPage.java : jdk/src/share/classes/sun/print/SunMinMaxPage.java +jdk/src/java.desktop/share/classes/sun/print/SunPageSelection.java : jdk/src/share/classes/sun/print/SunPageSelection.java +jdk/src/java.desktop/share/classes/sun/print/SunPrinterJobService.java : jdk/src/share/classes/sun/print/SunPrinterJobService.java +jdk/src/java.desktop/share/classes/sun/swing : jdk/src/share/classes/sun/swing +jdk/src/java.desktop/share/conf/cmm/lcms : jdk/src/share/lib/cmm/lcms +jdk/src/java.desktop/share/conf/images/cursors : jdk/src/share/lib/images/cursors +jdk/src/java.desktop/share/conf/psfontj2d.properties : jdk/src/share/classes/sun/print/psfontj2d.properties +jdk/src/java.desktop/share/conf/psfont.properties.ja : jdk/src/share/classes/sun/print/psfont.properties.ja +jdk/src/java.desktop/share/conf/sound.properties : jdk/src/share/lib/sound.properties +jdk/src/java.desktop/share/native/common/sun/awt/debug : jdk/src/share/native/sun/awt/debug +jdk/src/java.desktop/share/native/common/sun/awt/medialib/mlib_ImageCopy_Bit.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c +jdk/src/java.desktop/share/native/common/sun/awt/medialib/mlib_ImageCreate.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageCreate.c +jdk/src/java.desktop/share/native/common/sun/awt/medialib/mlib_sys.c : jdk/src/share/native/sun/awt/medialib/mlib_sys.c +jdk/src/java.desktop/share/native/common/sun/awt/utility/rect.c : jdk/src/share/native/sun/awt/utility/rect.c +jdk/src/java.desktop/share/native/common/sun/font/AccelGlyphCache.c : jdk/src/share/native/sun/font/AccelGlyphCache.c +jdk/src/java.desktop/share/native/common/sun/font/AccelGlyphCache.h : jdk/src/share/native/sun/font/AccelGlyphCache.h +jdk/src/java.desktop/share/native/common/sun/font/fontscalerdefs.h : jdk/src/share/native/sun/font/fontscalerdefs.h +jdk/src/java.desktop/share/native/common/sun/font/sunfontids.h : jdk/src/share/native/sun/font/sunfontids.h +jdk/src/java.desktop/share/native/common/sun/java2d/opengl/J2D_GL : jdk/src/share/native/sun/java2d/opengl/J2D_GL +jdk/src/java.desktop/share/native/common/sun/java2d/opengl : jdk/src/share/native/sun/java2d/opengl +jdk/src/java.desktop/share/native/include/jawt.h : jdk/src/share/javavm/export/jawt.h +jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils : jdk/src/share/native/sun/awt/image/cvutils +jdk/src/java.desktop/share/native/libawt/sun/awt/image/gif/gifdecoder.c : jdk/src/share/native/sun/awt/image/gif/gifdecoder.c +jdk/src/java.desktop/share/native/libawt/sun/awt/image : jdk/src/share/native/sun/awt/image +jdk/src/java.desktop/share/native/libawt/sun/awt/medialib/awt_ImagingLib.c : jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c +jdk/src/java.desktop/share/native/libawt/sun/awt/medialib/awt_ImagingLib.h : jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.h +jdk/src/java.desktop/share/native/libawt/sun/java2d : jdk/src/share/native/sun/java2d +jdk/src/java.desktop/share/native/libawt/sun/java2d/loops : jdk/src/share/native/sun/java2d/loops +jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe : jdk/src/share/native/sun/java2d/pipe +jdk/src/java.desktop/share/native/libfontmanager/DrawGlyphList.c : jdk/src/share/native/sun/font/DrawGlyphList.c +jdk/src/java.desktop/share/native/libfontmanager/FontInstanceAdapter.cpp : jdk/src/share/native/sun/font/FontInstanceAdapter.cpp +jdk/src/java.desktop/share/native/libfontmanager/FontInstanceAdapter.h : jdk/src/share/native/sun/font/FontInstanceAdapter.h +jdk/src/java.desktop/share/native/libfontmanager/fontscaler.h : jdk/src/share/native/sun/font/fontscaler.h +jdk/src/java.desktop/share/native/libfontmanager/freetypeScaler.c : jdk/src/share/native/sun/font/freetypeScaler.c +jdk/src/java.desktop/share/native/libfontmanager/glyphblitting.h : jdk/src/share/native/sun/font/glyphblitting.h +jdk/src/java.desktop/share/native/libfontmanager/layout : jdk/src/share/native/sun/font/layout +jdk/src/java.desktop/share/native/libfontmanager/sunFont.c : jdk/src/share/native/sun/font/sunFont.c +jdk/src/java.desktop/share/native/libjavajpeg : jdk/src/share/native/sun/awt/image/jpeg +jdk/src/java.desktop/share/native/libjsound : jdk/src/share/native/com/sun/media/sound +jdk/src/java.desktop/share/native/liblcms : jdk/src/share/native/sun/java2d/cmm/lcms +jdk/src/java.desktop/share/native/libmlib_image/j2d_names.h : jdk/src/share/native/sun/awt/medialib/j2d_names.h +jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BC.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BC_S16.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC_S16.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BC_U16.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC_U16.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BL.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BL_S16.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL_S16.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BL_U16.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL_U16.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffineIndex_BC.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffineIndex_BC.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffineIndex_BL.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffineIndex_BL.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_NN.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_NN.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageBlendTable.h : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageBlendTable.h +jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConvClearEdge.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConvClearEdge.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConvCopyEdge.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConvCopyEdge.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConv_f.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConv_f.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConv.h : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConv.h +jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConvVersion.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConvVersion.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageCopy.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageLookUp.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageLookUp_f.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageLookUp.h : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp.h +jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageThresh1.h : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageThresh1.h +jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageThresh1_U8.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageThresh1_U8.c +jdk/src/java.desktop/share/native/libmlib_image/mlib.h : jdk/src/share/native/sun/awt/medialib/mlib.h +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BC_D64.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_D64.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BC_F32.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_F32.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BC_S32.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_S32.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BL_D64.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_D64.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BL_F32.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_F32.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BL_S32.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_S32.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffineEdge.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageAffineEdge.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine.h +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_NN_Bit.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_NN_Bit.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_NN.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_NN.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_image_blend_proto.h : jdk/src/share/native/sun/awt/medialib/mlib_image_blend_proto.h +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageCheck.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageCheck.h +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageClipping.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageClipping.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageClipping.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageClipping.h +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageColormap.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageColormap.h +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageColorTrue2Index.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageColorTrue2Index.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16ext.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16nw.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv2x2_f.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_32nw.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_32nw.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8ext.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8nw.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvClearEdge_Bit.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConvClearEdge_Bit.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvClearEdge_Fp.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConvClearEdge_Fp.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvCopyEdge_Bit.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConvCopyEdge_Bit.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_D64nw.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_D64nw.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvEdge.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageConvEdge.h +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_F32nw.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_F32nw.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageConv.h +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvKernelConvert.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConvKernelConvert.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConvMxN.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN_ext.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConvMxN_ext.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN_Fp.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConvMxN_Fp.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16ext.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16nw.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageCopy.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy.h +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageCreate.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageCreate.h +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageDivTables.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageDivTables.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageDivTables.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageDivTables.h +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageFilters.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageFilters.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageFilters.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageFilters.h +jdk/src/java.desktop/share/native/libmlib_image/mlib_image_get.h : jdk/src/share/native/sun/awt/medialib/mlib_image_get.h +jdk/src/java.desktop/share/native/libmlib_image/mlib_image.h : jdk/src/share/native/sun/awt/medialib/mlib_image.h +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageLookUp_64.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageLookUp_Bit.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageLookUp.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp.h +jdk/src/java.desktop/share/native/libmlib_image/mlib_image_proto.h : jdk/src/share/native/sun/awt/medialib/mlib_image_proto.h +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageRowTable.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageRowTable.h +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageScanPoly.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageScanPoly.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_image_types.h : jdk/src/share/native/sun/awt/medialib/mlib_image_types.h +jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageUtils.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c +jdk/src/java.desktop/share/native/libmlib_image/mlib_status.h : jdk/src/share/native/sun/awt/medialib/mlib_status.h +jdk/src/java.desktop/share/native/libmlib_image/mlib_sys.h : jdk/src/share/native/sun/awt/medialib/mlib_sys.h +jdk/src/java.desktop/share/native/libmlib_image/mlib_SysMath.h : jdk/src/share/native/sun/awt/medialib/mlib_SysMath.h +jdk/src/java.desktop/share/native/libmlib_image/mlib_sys_proto.h : jdk/src/share/native/sun/awt/medialib/mlib_sys_proto.h +jdk/src/java.desktop/share/native/libmlib_image/mlib_types.h : jdk/src/share/native/sun/awt/medialib/mlib_types.h +jdk/src/java.desktop/share/native/libmlib_image/safe_alloc.h : jdk/src/share/native/sun/awt/medialib/safe_alloc.h +jdk/src/java.desktop/share/native/libmlib_image/safe_math.h : jdk/src/share/native/sun/awt/medialib/safe_math.h +jdk/src/java.desktop/share/native/libsplashscreen/giflib : jdk/src/share/native/sun/awt/giflib +jdk/src/java.desktop/share/native/libsplashscreen : jdk/src/share/native/sun/awt/splashscreen +jdk/src/java.desktop/share/native/libsplashscreen/libpng : jdk/src/share/native/sun/awt/libpng +jdk/src/java.desktop/unix/classes/META-INF/services : jdk/src/solaris/classes/sun/print/services +jdk/src/java.desktop/unix/classes/sun/awt : jdk/src/solaris/classes/sun/awt +jdk/src/java.desktop/unix/classes/sun/awt/motif/MFontConfiguration.java : jdk/src/solaris/classes/sun/awt/motif/MFontConfiguration.java +jdk/src/java.desktop/unix/classes/sun/awt/motif/X11CNS11643.java : jdk/src/solaris/classes/sun/awt/motif/X11CNS11643.java +jdk/src/java.desktop/unix/classes/sun/awt/motif/X11CNS11643P1.java : jdk/src/solaris/classes/sun/awt/motif/X11CNS11643P1.java +jdk/src/java.desktop/unix/classes/sun/awt/motif/X11CNS11643P2.java : jdk/src/solaris/classes/sun/awt/motif/X11CNS11643P2.java +jdk/src/java.desktop/unix/classes/sun/awt/motif/X11CNS11643P3.java : jdk/src/solaris/classes/sun/awt/motif/X11CNS11643P3.java +jdk/src/java.desktop/unix/classes/sun/awt/motif/X11Dingbats.java : jdk/src/solaris/classes/sun/awt/motif/X11Dingbats.java +jdk/src/java.desktop/unix/classes/sun/awt/motif/X11GB18030_0.java : jdk/src/solaris/classes/sun/awt/motif/X11GB18030_0.java +jdk/src/java.desktop/unix/classes/sun/awt/motif/X11GB18030_1.java : jdk/src/solaris/classes/sun/awt/motif/X11GB18030_1.java +jdk/src/java.desktop/unix/classes/sun/awt/motif/X11GB2312.java : jdk/src/solaris/classes/sun/awt/motif/X11GB2312.java +jdk/src/java.desktop/unix/classes/sun/awt/motif/X11GBK.java : jdk/src/solaris/classes/sun/awt/motif/X11GBK.java +jdk/src/java.desktop/unix/classes/sun/awt/motif/X11JIS0201.java : jdk/src/solaris/classes/sun/awt/motif/X11JIS0201.java +jdk/src/java.desktop/unix/classes/sun/awt/motif/X11JIS0208.java : jdk/src/solaris/classes/sun/awt/motif/X11JIS0208.java +jdk/src/java.desktop/unix/classes/sun/awt/motif/X11JIS0212.java : jdk/src/solaris/classes/sun/awt/motif/X11JIS0212.java +jdk/src/java.desktop/unix/classes/sun/awt/motif/X11Johab.java : jdk/src/solaris/classes/sun/awt/motif/X11Johab.java +jdk/src/java.desktop/unix/classes/sun/awt/motif/X11KSC5601.java : jdk/src/solaris/classes/sun/awt/motif/X11KSC5601.java +jdk/src/java.desktop/unix/classes/sun/awt/motif/X11SunUnicode_0.java : jdk/src/solaris/classes/sun/awt/motif/X11SunUnicode_0.java +jdk/src/java.desktop/unix/classes/sun/awt/windows/ThemeReader.java : jdk/src/solaris/classes/sun/awt/windows/ThemeReader.java +jdk/src/java.desktop/unix/classes/sun/awt/X11/doc-files/Modality.txt : jdk/src/solaris/classes/sun/awt/X11/doc-files/Modality.txt +jdk/src/java.desktop/unix/classes/sun/awt/X11 : jdk/src/solaris/classes/sun/awt/X11 +jdk/src/java.desktop/unix/classes/sun/font : jdk/src/solaris/classes/sun/font +jdk/src/java.desktop/unix/classes/sun/java2d : jdk/src/solaris/classes/sun/java2d +jdk/src/java.desktop/unix/classes/sun/java2d/jules : jdk/src/solaris/classes/sun/java2d/jules +jdk/src/java.desktop/unix/classes/sun/java2d/opengl : jdk/src/solaris/classes/sun/java2d/opengl +jdk/src/java.desktop/unix/classes/sun/java2d/x11 : jdk/src/solaris/classes/sun/java2d/x11 +jdk/src/java.desktop/unix/classes/sun/java2d/xr : jdk/src/solaris/classes/sun/java2d/xr +jdk/src/java.desktop/unix/classes/sun/print : jdk/src/solaris/classes/sun/print +jdk/src/java.desktop/unix/conf/flavormap.properties : jdk/src/solaris/lib/flavormap.properties +jdk/src/java.desktop/unix/conf/fonts/fonts.dir : jdk/src/solaris/classes/sun/awt/motif/java.fonts.dir +jdk/src/java.desktop/unix/conf/images/cursors/cursors.properties : jdk/src/solaris/lib/images/cursors/cursors.properties +jdk/src/java.desktop/unix/native/common/sun/awt/awt_Component.h : jdk/src/solaris/native/sun/awt/awt_Component.h +jdk/src/java.desktop/unix/native/common/sun/awt/awt_DrawingSurface.h : jdk/src/solaris/native/sun/awt/awt_DrawingSurface.h +jdk/src/java.desktop/unix/native/common/sun/awt/awt_Font.c : jdk/src/solaris/native/sun/awt/awt_Font.c +jdk/src/java.desktop/unix/native/common/sun/awt/awt_Font.h : jdk/src/solaris/native/sun/awt/awt_Font.h +jdk/src/java.desktop/unix/native/common/sun/awt/awt_GraphicsEnv.h : jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h +jdk/src/java.desktop/unix/native/common/sun/awt/awt.h : jdk/src/solaris/native/sun/awt/awt.h +jdk/src/java.desktop/unix/native/common/sun/awt/awt_Mlib.h : jdk/src/solaris/native/sun/awt/awt_Mlib.h +jdk/src/java.desktop/unix/native/common/sun/awt/awt_p.h : jdk/src/solaris/native/sun/awt/awt_p.h +jdk/src/java.desktop/unix/native/common/sun/awt/awt_util.h : jdk/src/solaris/native/sun/awt/awt_util.h +jdk/src/java.desktop/unix/native/common/sun/awt/colordata.h : jdk/src/solaris/native/sun/awt/colordata.h +jdk/src/java.desktop/unix/native/common/sun/awt/color.h : jdk/src/solaris/native/sun/awt/color.h +jdk/src/java.desktop/unix/native/common/sun/awt/CUPSfuncs.c : jdk/src/solaris/native/sun/awt/CUPSfuncs.c +jdk/src/java.desktop/unix/native/common/sun/awt/fontconfig.h : jdk/src/solaris/native/sun/awt/fontconfig.h +jdk/src/java.desktop/unix/native/common/sun/awt/fontpath.c : jdk/src/solaris/native/sun/awt/fontpath.c +jdk/src/java.desktop/unix/native/common/sun/awt/img_util_md.h : jdk/src/solaris/native/sun/awt/img_util_md.h +jdk/src/java.desktop/unix/native/common/sun/awt/initIDs.c : jdk/src/solaris/native/sun/awt/initIDs.c +jdk/src/java.desktop/unix/native/common/sun/awt/medialib/mlib_v_ImageCopy_f.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_f.c +jdk/src/java.desktop/unix/native/common/sun/awt/medialib/mlib_v_ImageCopy_f.h : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_f.h +jdk/src/java.desktop/unix/native/common/sun/awt/medialib/vis_proto.h : jdk/src/solaris/native/sun/awt/medialib/vis_proto.h +jdk/src/java.desktop/unix/native/common/sun/awt/utility/rect.h : jdk/src/solaris/native/sun/awt/utility/rect.h +jdk/src/java.desktop/unix/native/common/sun/awt/X11Color.c : jdk/src/solaris/native/sun/awt/X11Color.c +jdk/src/java.desktop/unix/native/common/sun/font/X11FontScaler.h : jdk/src/solaris/native/sun/font/X11FontScaler.h +jdk/src/java.desktop/unix/native/common/sun/java2d/opengl/J2D_GL : jdk/src/solaris/native/sun/java2d/opengl/J2D_GL +jdk/src/java.desktop/unix/native/common/sun/java2d/opengl : jdk/src/solaris/native/sun/java2d/opengl +jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11FontScaler_md.c : jdk/src/solaris/native/sun/java2d/x11/X11FontScaler_md.c +jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11PMBlitLoops.c : jdk/src/solaris/native/sun/java2d/x11/X11PMBlitLoops.c +jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11Renderer.c : jdk/src/solaris/native/sun/java2d/x11/X11Renderer.c +jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11SurfaceData.c : jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c +jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11SurfaceData.h : jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.h +jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11TextRenderer_md.c : jdk/src/solaris/native/sun/java2d/x11/X11TextRenderer_md.c +jdk/src/java.desktop/unix/native/include/jawt_md.h : jdk/src/solaris/javavm/export/jawt_md.h +jdk/src/java.desktop/unix/native/libawt_headless/sun/awt/HeadlessToolkit.c : jdk/src/solaris/native/sun/awt/HeadlessToolkit.c +jdk/src/java.desktop/unix/native/libawt_headless/sun/awt/VDrawingArea.c : jdk/src/solaris/native/sun/awt/VDrawingArea.c +jdk/src/java.desktop/unix/native/libawt/sun/awt/awt_LoadLibrary.c : jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c +jdk/src/java.desktop/unix/native/libawt/sun/awt/awt_Mlib.c : jdk/src/solaris/native/sun/awt/awt_Mlib.c +jdk/src/java.desktop/unix/native/libawt/sun/awt/medialib/mlib_v_ImageCopy_blk.s : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_blk.s +jdk/src/java.desktop/unix/native/libawt/sun/awt/medialib/mlib_v_ImageCopy.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy.c +jdk/src/java.desktop/unix/native/libawt/sun/awt/medialib/vis_asi.h : jdk/src/solaris/native/sun/awt/medialib/vis_asi.h +jdk/src/java.desktop/unix/native/libawt/sun/java2d/j2d_md.h : jdk/src/solaris/native/sun/java2d/j2d_md.h +jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops : jdk/src/solaris/native/sun/java2d/loops +jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_AWTEvent.c : jdk/src/solaris/native/sun/awt/awt_AWTEvent.c +jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_AWTEvent.h : jdk/src/solaris/native/sun/awt/awt_AWTEvent.h +jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_DrawingSurface.c : jdk/src/solaris/native/sun/awt/awt_DrawingSurface.c +jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Event.c : jdk/src/solaris/native/sun/awt/awt_Event.c +jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Event.h : jdk/src/solaris/native/sun/awt/awt_Event.h +jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_GraphicsEnv.c : jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c +jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_InputMethod.c : jdk/src/solaris/native/sun/awt/awt_InputMethod.c +jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Insets.c : jdk/src/solaris/native/sun/awt/awt_Insets.c +jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Insets.h : jdk/src/solaris/native/sun/awt/awt_Insets.h +jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_MenuComponent.h : jdk/src/solaris/native/sun/awt/awt_MenuComponent.h +jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Robot.c : jdk/src/solaris/native/sun/awt/awt_Robot.c +jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_UNIXToolkit.c : jdk/src/solaris/native/sun/awt/awt_UNIXToolkit.c +jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_util.c : jdk/src/solaris/native/sun/awt/awt_util.c +jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/canvas.h : jdk/src/solaris/native/sun/awt/canvas.h +jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/gtk2_interface.c : jdk/src/solaris/native/sun/awt/gtk2_interface.c +jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/gtk2_interface.h : jdk/src/solaris/native/sun/awt/gtk2_interface.h +jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/HPkeysym.h : jdk/src/solaris/native/sun/awt/HPkeysym.h +jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/list.c : jdk/src/solaris/native/sun/awt/list.c +jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/list.h : jdk/src/solaris/native/sun/awt/list.h +jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/multi_font.c : jdk/src/solaris/native/sun/awt/multi_font.c +jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/multi_font.h : jdk/src/solaris/native/sun/awt/multi_font.h +jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/multiVis.c : jdk/src/solaris/native/sun/awt/multiVis.c +jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/multiVis.h : jdk/src/solaris/native/sun/awt/multiVis.h +jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/randr.h : jdk/src/solaris/native/sun/awt/randr.h +jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/robot_common.c : jdk/src/solaris/native/sun/awt/robot_common.c +jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/robot_common.h : jdk/src/solaris/native/sun/awt/robot_common.h +jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/sun_awt_X11_GtkFileDialogPeer.c : jdk/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c +jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/swing_GTKEngine.c : jdk/src/solaris/native/sun/awt/swing_GTKEngine.c +jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/swing_GTKStyle.c : jdk/src/solaris/native/sun/awt/swing_GTKStyle.c +jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/wsutils.h : jdk/src/solaris/native/sun/awt/wsutils.h +jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/Xrandr.h : jdk/src/solaris/native/sun/awt/Xrandr.h +jdk/src/java.desktop/unix/native/libawt_xawt/sun/java2d/x11/XRBackendNative.c : jdk/src/solaris/native/sun/java2d/x11/XRBackendNative.c +jdk/src/java.desktop/unix/native/libawt_xawt/sun/java2d/x11/XRSurfaceData.c : jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c +jdk/src/java.desktop/unix/native/libawt_xawt/sun/xawt : jdk/src/solaris/native/sun/xawt +jdk/src/java.desktop/unix/native/libfontmanager/X11FontScaler.c : jdk/src/solaris/native/sun/font/X11FontScaler.c +jdk/src/java.desktop/unix/native/libfontmanager/X11TextRenderer.c : jdk/src/solaris/native/sun/font/X11TextRenderer.c +jdk/src/java.desktop/unix/native/libjawt/jawt.c : jdk/src/solaris/native/sun/awt/jawt.c +jdk/src/java.desktop/unix/native/libjsound : jdk/src/solaris/native/com/sun/media/sound +jdk/src/java.desktop/unix/native/libmlib_image/mlib_ImageConvCopyEdge_Fp.c : jdk/src/solaris/native/sun/awt/medialib/mlib_ImageConvCopyEdge_Fp.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BC.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BC.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BC_S16.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BC_S16.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BC_U16.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BC_U16.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BL.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_S16.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BL_S16.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_S16.h : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BL_S16.h +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_U16.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BL_U16.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffineIndex_BC.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffineIndex_BC.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_NN.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_NN.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract_1.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract_1.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract_43.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract_43.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract.h : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract.h +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert_1.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelInsert_1.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert.h : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelInsert.h +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConv_8nw.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConv_8nw.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvClearEdge.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvClearEdge.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvCopyEdge.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvCopyEdge.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConv.h : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConv.h +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvMxN_8.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvMxN_8.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvMxN_8ext.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvMxN_8ext.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvVersion.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvVersion.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageFilters.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageFilters.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageFilters.h : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageFilters.h +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUp.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUp.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpFunc.h : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpFunc.h +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16S16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS16S16Func.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16S32Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS16S32Func.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16U16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS16U16Func.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16U8Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS16U8Func.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32S16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32S16Func.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32S32Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32S32Func.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32U16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32U16Func.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32U8Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32U8Func.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16S16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS16S16Func.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16S32Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS16S32Func.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16U16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS16U16Func.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16U8Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS16U8Func.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32S16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32S16Func.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32S32Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32S32Func.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32U16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32U16Func.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32U8Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32U8Func.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16S16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU16S16Func.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16S32Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU16S32Func.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16U16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU16U16Func.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16U8Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU16U8Func.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8S16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU8S16Func.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8S32Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU8S32Func.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8U16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU8U16Func.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8U8Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU8U8Func.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16S16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU16S16Func.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16S32Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU16S32Func.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16U16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU16U16Func.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16U8Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU16U8Func.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8S16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8S16Func.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8S32Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8S32Func.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8U16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8U16Func.c +jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8U8Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8U8Func.c +jdk/src/java.desktop/unix/native/libmlib_image/vis_32.il : jdk/src/solaris/native/sun/awt/medialib/vis_32.il +jdk/src/java.desktop/unix/native/libmlib_image/vis_64.il : jdk/src/solaris/native/sun/awt/medialib/vis_64.il +jdk/src/java.desktop/unix/native/libsplashscreen : jdk/src/solaris/native/sun/awt/splashscreen +jdk/src/java.desktop/unix/native/libsunwjdga : jdk/src/solaris/native/sun/jdga +jdk/src/java.desktop/windows/classes/META-INF/services : jdk/src/windows/classes/sun/print/services +jdk/src/java.desktop/windows/classes/sun/awt/windows/ThemeReader.java : jdk/src/windows/classes/sun/awt/windows/ThemeReader.java +jdk/src/java.desktop/windows/classes/sun/font : jdk/src/windows/classes/sun/font +jdk/src/java.desktop/windows/conf/flavormap.properties : jdk/src/windows/lib/flavormap.properties +jdk/src/java.desktop/windows/conf/images/cursors/cursors.properties : jdk/src/windows/lib/images/cursors/cursors.properties +jdk/src/java.desktop/windows/native/common/sun/awt/utility/rect.h : jdk/src/windows/native/sun/awt/utility/rect.h +jdk/src/java.desktop/windows/native/include/jawt_md.h : jdk/src/windows/javavm/export/jawt_md.h +jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d : jdk/src/windows/native/sun/java2d/d3d +jdk/src/java.desktop/windows/native/libawt/sun/java2d : jdk/src/windows/native/sun/java2d +jdk/src/java.desktop/windows/native/libawt/sun/windows/alloc.h : jdk/src/windows/native/sun/windows/alloc.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_AWTEvent.cpp : jdk/src/windows/native/sun/windows/awt_AWTEvent.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_AWTEvent.h : jdk/src/windows/native/sun/windows/awt_AWTEvent.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_BitmapUtil.cpp : jdk/src/windows/native/sun/windows/awt_BitmapUtil.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_BitmapUtil.h : jdk/src/windows/native/sun/windows/awt_BitmapUtil.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Brush.cpp : jdk/src/windows/native/sun/windows/awt_Brush.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Brush.h : jdk/src/windows/native/sun/windows/awt_Brush.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Button.cpp : jdk/src/windows/native/sun/windows/awt_Button.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Button.h : jdk/src/windows/native/sun/windows/awt_Button.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Canvas.cpp : jdk/src/windows/native/sun/windows/awt_Canvas.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Canvas.h : jdk/src/windows/native/sun/windows/awt_Canvas.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Checkbox.cpp : jdk/src/windows/native/sun/windows/awt_Checkbox.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Checkbox.h : jdk/src/windows/native/sun/windows/awt_Checkbox.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Choice.cpp : jdk/src/windows/native/sun/windows/awt_Choice.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Choice.h : jdk/src/windows/native/sun/windows/awt_Choice.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Clipboard.cpp : jdk/src/windows/native/sun/windows/awt_Clipboard.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Clipboard.h : jdk/src/windows/native/sun/windows/awt_Clipboard.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Color.cpp : jdk/src/windows/native/sun/windows/awt_Color.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Color.h : jdk/src/windows/native/sun/windows/awt_Color.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Component.cpp : jdk/src/windows/native/sun/windows/awt_Component.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Component.h : jdk/src/windows/native/sun/windows/awt_Component.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Container.cpp : jdk/src/windows/native/sun/windows/awt_Container.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Container.h : jdk/src/windows/native/sun/windows/awt_Container.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Cursor.cpp : jdk/src/windows/native/sun/windows/awt_Cursor.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Cursor.h : jdk/src/windows/native/sun/windows/awt_Cursor.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_CustomPaletteDef.h : jdk/src/windows/native/sun/windows/awt_CustomPaletteDef.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DataTransferer.cpp : jdk/src/windows/native/sun/windows/awt_DataTransferer.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DataTransferer.h : jdk/src/windows/native/sun/windows/awt_DataTransferer.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DCHolder.cpp : jdk/src/windows/native/sun/windows/awt_DCHolder.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DCHolder.h : jdk/src/windows/native/sun/windows/awt_DCHolder.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Debug.cpp : jdk/src/windows/native/sun/windows/awt_Debug.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Debug.h : jdk/src/windows/native/sun/windows/awt_Debug.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Desktop.cpp : jdk/src/windows/native/sun/windows/awt_Desktop.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DesktopProperties.cpp : jdk/src/windows/native/sun/windows/awt_DesktopProperties.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DesktopProperties.h : jdk/src/windows/native/sun/windows/awt_DesktopProperties.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Dialog.cpp : jdk/src/windows/native/sun/windows/awt_Dialog.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Dialog.h : jdk/src/windows/native/sun/windows/awt_Dialog.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Dimension.cpp : jdk/src/windows/native/sun/windows/awt_Dimension.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Dimension.h : jdk/src/windows/native/sun/windows/awt_Dimension.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DnDDS.cpp : jdk/src/windows/native/sun/windows/awt_DnDDS.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DnDDS.h : jdk/src/windows/native/sun/windows/awt_DnDDS.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DnDDT.cpp : jdk/src/windows/native/sun/windows/awt_DnDDT.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DnDDT.h : jdk/src/windows/native/sun/windows/awt_DnDDT.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DrawingSurface.cpp : jdk/src/windows/native/sun/windows/awt_DrawingSurface.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DrawingSurface.h : jdk/src/windows/native/sun/windows/awt_DrawingSurface.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Event.cpp : jdk/src/windows/native/sun/windows/awt_Event.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Event.h : jdk/src/windows/native/sun/windows/awt_Event.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_FileDialog.cpp : jdk/src/windows/native/sun/windows/awt_FileDialog.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_FileDialog.h : jdk/src/windows/native/sun/windows/awt_FileDialog.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Font.cpp : jdk/src/windows/native/sun/windows/awt_Font.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Font.h : jdk/src/windows/native/sun/windows/awt_Font.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Frame.cpp : jdk/src/windows/native/sun/windows/awt_Frame.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Frame.h : jdk/src/windows/native/sun/windows/awt_Frame.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_GDIObject.cpp : jdk/src/windows/native/sun/windows/awt_GDIObject.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_GDIObject.h : jdk/src/windows/native/sun/windows/awt_GDIObject.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt.h : jdk/src/windows/native/sun/windows/awt.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_IconCursor.cpp : jdk/src/windows/native/sun/windows/awt_IconCursor.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_IconCursor.h : jdk/src/windows/native/sun/windows/awt_IconCursor.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputEvent.cpp : jdk/src/windows/native/sun/windows/awt_InputEvent.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputEvent.h : jdk/src/windows/native/sun/windows/awt_InputEvent.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputMethod.cpp : jdk/src/windows/native/sun/windows/awt_InputMethod.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputTextInfor.cpp : jdk/src/windows/native/sun/windows/awt_InputTextInfor.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputTextInfor.h : jdk/src/windows/native/sun/windows/awt_InputTextInfor.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Insets.cpp : jdk/src/windows/native/sun/windows/awt_Insets.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Insets.h : jdk/src/windows/native/sun/windows/awt_Insets.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_KeyboardFocusManager.cpp : jdk/src/windows/native/sun/windows/awt_KeyboardFocusManager.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_KeyEvent.cpp : jdk/src/windows/native/sun/windows/awt_KeyEvent.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_KeyEvent.h : jdk/src/windows/native/sun/windows/awt_KeyEvent.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Label.cpp : jdk/src/windows/native/sun/windows/awt_Label.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Label.h : jdk/src/windows/native/sun/windows/awt_Label.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_List.cpp : jdk/src/windows/native/sun/windows/awt_List.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_List.h : jdk/src/windows/native/sun/windows/awt_List.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuBar.cpp : jdk/src/windows/native/sun/windows/awt_MenuBar.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuBar.h : jdk/src/windows/native/sun/windows/awt_MenuBar.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Menu.cpp : jdk/src/windows/native/sun/windows/awt_Menu.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Menu.h : jdk/src/windows/native/sun/windows/awt_Menu.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuItem.cpp : jdk/src/windows/native/sun/windows/awt_MenuItem.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuItem.h : jdk/src/windows/native/sun/windows/awt_MenuItem.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Mlib.cpp : jdk/src/windows/native/sun/windows/awt_Mlib.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Mlib.h : jdk/src/windows/native/sun/windows/awt_Mlib.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MouseEvent.cpp : jdk/src/windows/native/sun/windows/awt_MouseEvent.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MouseEvent.h : jdk/src/windows/native/sun/windows/awt_MouseEvent.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awtmsg.h : jdk/src/windows/native/sun/windows/awtmsg.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_new.cpp : jdk/src/windows/native/sun/windows/awt_new.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_new.h : jdk/src/windows/native/sun/windows/awt_new.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Object.cpp : jdk/src/windows/native/sun/windows/awt_Object.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Object.h : jdk/src/windows/native/sun/windows/awt_Object.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_ole.cpp : jdk/src/windows/native/sun/windows/awt_ole.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_ole.h : jdk/src/windows/native/sun/windows/awt_ole.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Palette.cpp : jdk/src/windows/native/sun/windows/awt_Palette.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Palette.h : jdk/src/windows/native/sun/windows/awt_Palette.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Panel.cpp : jdk/src/windows/native/sun/windows/awt_Panel.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Panel.h : jdk/src/windows/native/sun/windows/awt_Panel.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Pen.cpp : jdk/src/windows/native/sun/windows/awt_Pen.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Pen.h : jdk/src/windows/native/sun/windows/awt_Pen.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PopupMenu.cpp : jdk/src/windows/native/sun/windows/awt_PopupMenu.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PopupMenu.h : jdk/src/windows/native/sun/windows/awt_PopupMenu.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintControl.cpp : jdk/src/windows/native/sun/windows/awt_PrintControl.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintControl.h : jdk/src/windows/native/sun/windows/awt_PrintControl.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintDialog.cpp : jdk/src/windows/native/sun/windows/awt_PrintDialog.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintDialog.h : jdk/src/windows/native/sun/windows/awt_PrintDialog.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintJob.cpp : jdk/src/windows/native/sun/windows/awt_PrintJob.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt.rc : jdk/src/windows/native/sun/windows/awt.rc +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Rectangle.cpp : jdk/src/windows/native/sun/windows/awt_Rectangle.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Rectangle.h : jdk/src/windows/native/sun/windows/awt_Rectangle.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Robot.cpp : jdk/src/windows/native/sun/windows/awt_Robot.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Robot.h : jdk/src/windows/native/sun/windows/awt_Robot.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Scrollbar.cpp : jdk/src/windows/native/sun/windows/awt_Scrollbar.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Scrollbar.h : jdk/src/windows/native/sun/windows/awt_Scrollbar.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_ScrollPane.cpp : jdk/src/windows/native/sun/windows/awt_ScrollPane.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_ScrollPane.h : jdk/src/windows/native/sun/windows/awt_ScrollPane.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextArea.cpp : jdk/src/windows/native/sun/windows/awt_TextArea.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextArea.h : jdk/src/windows/native/sun/windows/awt_TextArea.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextComponent.cpp : jdk/src/windows/native/sun/windows/awt_TextComponent.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextComponent.h : jdk/src/windows/native/sun/windows/awt_TextComponent.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextField.cpp : jdk/src/windows/native/sun/windows/awt_TextField.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextField.h : jdk/src/windows/native/sun/windows/awt_TextField.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Toolkit.cpp : jdk/src/windows/native/sun/windows/awt_Toolkit.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Toolkit.h : jdk/src/windows/native/sun/windows/awt_Toolkit.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TrayIcon.cpp : jdk/src/windows/native/sun/windows/awt_TrayIcon.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TrayIcon.h : jdk/src/windows/native/sun/windows/awt_TrayIcon.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsConfig.cpp : jdk/src/windows/native/sun/windows/awt_Win32GraphicsConfig.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsConfig.h : jdk/src/windows/native/sun/windows/awt_Win32GraphicsConfig.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsDevice.cpp : jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsDevice.h : jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsEnv.cpp : jdk/src/windows/native/sun/windows/awt_Win32GraphicsEnv.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Window.cpp : jdk/src/windows/native/sun/windows/awt_Window.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Window.h : jdk/src/windows/native/sun/windows/awt_Window.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/check.bmp : jdk/src/windows/native/sun/windows/check.bmp +jdk/src/java.desktop/windows/native/libawt/sun/windows/CmdIDList.cpp : jdk/src/windows/native/sun/windows/CmdIDList.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/CmdIDList.h : jdk/src/windows/native/sun/windows/CmdIDList.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/colordata.h : jdk/src/windows/native/sun/windows/colordata.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/ComCtl32Util.cpp : jdk/src/windows/native/sun/windows/ComCtl32Util.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/ComCtl32Util.h : jdk/src/windows/native/sun/windows/ComCtl32Util.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/Devices.cpp : jdk/src/windows/native/sun/windows/Devices.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/Devices.h : jdk/src/windows/native/sun/windows/Devices.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/DllUtil.cpp : jdk/src/windows/native/sun/windows/DllUtil.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/DllUtil.h : jdk/src/windows/native/sun/windows/DllUtil.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/GDIHashtable.cpp : jdk/src/windows/native/sun/windows/GDIHashtable.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/GDIHashtable.h : jdk/src/windows/native/sun/windows/GDIHashtable.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/hand.cur : jdk/src/windows/native/sun/windows/hand.cur +jdk/src/java.desktop/windows/native/libawt/sun/windows/Hashtable.cpp : jdk/src/windows/native/sun/windows/Hashtable.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/Hashtable.h : jdk/src/windows/native/sun/windows/Hashtable.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/img_util_md.h : jdk/src/windows/native/sun/windows/img_util_md.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/initIDs.cpp : jdk/src/windows/native/sun/windows/initIDs.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/mlib_types_md.h : jdk/src/windows/native/sun/windows/mlib_types_md.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/MouseInfo.cpp : jdk/src/windows/native/sun/windows/MouseInfo.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/ObjectList.cpp : jdk/src/windows/native/sun/windows/ObjectList.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/ObjectList.h : jdk/src/windows/native/sun/windows/ObjectList.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/README.JNI : jdk/src/windows/native/sun/windows/README.JNI +jdk/src/java.desktop/windows/native/libawt/sun/windows/security_warning_bw.ico : jdk/src/windows/native/sun/windows/security_warning_bw.ico +jdk/src/java.desktop/windows/native/libawt/sun/windows/security_warning.ico : jdk/src/windows/native/sun/windows/security_warning.ico +jdk/src/java.desktop/windows/native/libawt/sun/windows/security_warning_int.ico : jdk/src/windows/native/sun/windows/security_warning_int.ico +jdk/src/java.desktop/windows/native/libawt/sun/windows/ShellFolder2.cpp : jdk/src/windows/native/sun/windows/ShellFolder2.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/stdhdrs.h : jdk/src/windows/native/sun/windows/stdhdrs.h +jdk/src/java.desktop/windows/native/libawt/sun/windows/ThemeReader.cpp : jdk/src/windows/native/sun/windows/ThemeReader.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/WBufferStrategy.cpp : jdk/src/windows/native/sun/windows/WBufferStrategy.cpp +jdk/src/java.desktop/windows/native/libawt/sun/windows/WPrinterJob.cpp : jdk/src/windows/native/sun/windows/WPrinterJob.cpp +jdk/src/java.desktop/windows/native/libfontmanager : jdk/src/windows/native/sun/font +jdk/src/java.desktop/windows/native/libjawt/jawt.cpp : jdk/src/windows/native/sun/windows/jawt.cpp +jdk/src/java.desktop/windows/native/libjsound : jdk/src/windows/native/com/sun/media/sound +jdk/src/java.desktop/windows/native/libsplashscreen : jdk/src/windows/native/sun/awt/splashscreen +jdk/src/java.instrument/share/classes/java/lang/instrument : jdk/src/share/classes/java/lang/instrument +jdk/src/java.instrument/share/classes/sun/instrument : jdk/src/share/classes/sun/instrument +jdk/src/java.instrument/share/native/libinstrument : jdk/src/share/instrument +jdk/src/java.instrument/unix/native/libinstrument : jdk/src/solaris/instrument +jdk/src/java.instrument/windows/native/libinstrument : jdk/src/windows/instrument +jdk/src/java.logging/share/classes/java/util/logging : jdk/src/share/classes/java/util/logging +jdk/src/java.logging/share/classes/sun/net/www/protocol/http/logging : jdk/src/share/classes/sun/net/www/protocol/http/logging +jdk/src/java.logging/share/classes/sun/util/logging/resources : jdk/src/share/classes/sun/util/logging/resources +jdk/src/java.logging/share/conf/logging.properties : jdk/src/share/lib/logging.properties +jdk/src/java.management/share/classes/com/sun/jmx/defaults : jdk/src/share/classes/com/sun/jmx/defaults +jdk/src/java.management/share/classes/com/sun/jmx/interceptor : jdk/src/share/classes/com/sun/jmx/interceptor +jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver : jdk/src/share/classes/com/sun/jmx/mbeanserver +jdk/src/java.management/share/classes/com/sun/jmx/remote : jdk/src/share/classes/com/sun/jmx/remote +jdk/src/java.management/share/classes/com/sun/management : jdk/src/share/classes/com/sun/management +jdk/src/java.management/share/classes/java/lang/management : jdk/src/share/classes/java/lang/management +jdk/src/java.management/share/classes/javax/management : jdk/src/share/classes/javax/management +jdk/src/java.management/share/classes/mgmt-overview.html : jdk/src/share/classes/com/sun/management/mgmt-overview.html +jdk/src/java.management/share/classes/sun/management/counter : jdk/src/share/classes/sun/management/counter +jdk/src/java.management/share/classes/sun/management/counter/perf : jdk/src/share/classes/sun/management/counter/perf +jdk/src/java.management/share/classes/sun/management : jdk/src/share/classes/sun/management +jdk/src/java.management/share/classes/sun/management/jdp : jdk/src/share/classes/sun/management/jdp +jdk/src/java.management/share/classes/sun/management/jmxremote : jdk/src/share/classes/sun/management/jmxremote +jdk/src/java.management/share/classes/sun/management/resources : jdk/src/share/classes/sun/management/resources +jdk/src/java.management/share/conf : jdk/src/share/lib/management +jdk/src/java.management/share/native/include/jmm.h : jdk/src/share/javavm/export/jmm.h +jdk/src/java.management/share/native/libmanagement : jdk/src/share/native/sun/management +jdk/src/java.management/unix/classes/sun/management : jdk/src/solaris/classes/sun/management +jdk/src/java.management/unix/native/libmanagement : jdk/src/solaris/native/sun/management +jdk/src/java.management/windows/classes/sun/management : jdk/src/windows/classes/sun/management +jdk/src/java.management/windows/native/libmanagement : jdk/src/windows/native/sun/management +jdk/src/java.naming/share/classes/com/sun/jndi/ldap/ext : jdk/src/share/classes/com/sun/jndi/ldap/ext +jdk/src/java.naming/share/classes/com/sun/jndi/ldap : jdk/src/share/classes/com/sun/jndi/ldap +jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool : jdk/src/share/classes/com/sun/jndi/ldap/pool +jdk/src/java.naming/share/classes/com/sun/jndi/ldap/sasl : jdk/src/share/classes/com/sun/jndi/ldap/sasl +jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx : jdk/src/share/classes/com/sun/jndi/toolkit/ctx +jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir : jdk/src/share/classes/com/sun/jndi/toolkit/dir +jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/url : jdk/src/share/classes/com/sun/jndi/toolkit/url +jdk/src/java.naming/share/classes/com/sun/jndi/url/ldap : jdk/src/share/classes/com/sun/jndi/url/ldap +jdk/src/java.naming/share/classes/com/sun/jndi/url/ldaps : jdk/src/share/classes/com/sun/jndi/url/ldaps +jdk/src/java.naming/share/classes/com/sun/naming/internal : jdk/src/share/classes/com/sun/naming/internal +jdk/src/java.naming/share/classes/javax/naming/directory : jdk/src/share/classes/javax/naming/directory +jdk/src/java.naming/share/classes/javax/naming/event : jdk/src/share/classes/javax/naming/event +jdk/src/java.naming/share/classes/javax/naming : jdk/src/share/classes/javax/naming +jdk/src/java.naming/share/classes/javax/naming/ldap : jdk/src/share/classes/javax/naming/ldap +jdk/src/java.naming/share/classes/javax/naming/spi : jdk/src/share/classes/javax/naming/spi +jdk/src/java.naming/share/classes/sun/security/provider/certpath/ldap : jdk/src/share/classes/sun/security/provider/certpath/ldap +jdk/src/java.prefs/macosx/native/libprefs : jdk/src/macosx/native/java/util/prefs +jdk/src/java.prefs/unix/classes/java/util/prefs : jdk/src/solaris/classes/java/util/prefs +jdk/src/java.prefs/unix/native/libprefs : jdk/src/solaris/native/java/util/prefs +jdk/src/java.prefs/windows/native/libprefs : jdk/src/windows/native/java/util/prefs +jdk/src/java.rmi/share/classes/com/sun/rmi/rmid : jdk/src/share/classes/com/sun/rmi/rmid +jdk/src/java.rmi/share/classes/java/rmi/activation : jdk/src/share/classes/java/rmi/activation +jdk/src/java.rmi/share/classes/java/rmi/dgc : jdk/src/share/classes/java/rmi/dgc +jdk/src/java.rmi/share/classes/java/rmi : jdk/src/share/classes/java/rmi +jdk/src/java.rmi/share/classes/java/rmi/registry : jdk/src/share/classes/java/rmi/registry +jdk/src/java.rmi/share/classes/java/rmi/server : jdk/src/share/classes/java/rmi/server +jdk/src/java.rmi/share/classes/javax/rmi/ssl : jdk/src/share/classes/javax/rmi/ssl +jdk/src/java.rmi/share/classes/sun/rmi/log : jdk/src/share/classes/sun/rmi/log +jdk/src/java.rmi/share/classes/sun/rmi/registry : jdk/src/share/classes/sun/rmi/registry +jdk/src/java.rmi/share/classes/sun/rmi/runtime : jdk/src/share/classes/sun/rmi/runtime +jdk/src/java.rmi/share/classes/sun/rmi/server : jdk/src/share/classes/sun/rmi/server +jdk/src/java.rmi/share/classes/sun/rmi/server/resources : jdk/src/share/classes/sun/rmi/server/resources +jdk/src/java.rmi/share/classes/sun/rmi/transport : jdk/src/share/classes/sun/rmi/transport +jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy : jdk/src/share/classes/sun/rmi/transport/proxy +jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp : jdk/src/share/classes/sun/rmi/transport/tcp +jdk/src/java.rmi/share/doc/stub/java/rmi/activation : jdk/src/share/doc/stub/java/rmi/activation +jdk/src/java.rmi/unix/bin/java-rmi.cgi.sh : jdk/src/solaris/bin/java-rmi.cgi.sh +jdk/src/java.scripting/share/classes/javax/script : jdk/src/share/classes/javax/script +jdk/src/java.security.acl/share/classes/java/security/acl : jdk/src/share/classes/java/security/acl +jdk/src/java.security.acl/share/classes/sun/security/acl : jdk/src/share/classes/sun/security/acl +jdk/src/java.security.jgss/macosx/native/libosxkrb5/nativeccache.c : jdk/src/share/native/sun/security/krb5/nativeccache.c +jdk/src/java.security.jgss/macosx/native/libosxkrb5/SCDynamicStoreConfig.m : jdk/src/macosx/native/sun/security/krb5/SCDynamicStoreConfig.m +jdk/src/java.security.jgss/share/classes/com/sun/security/jgss : jdk/src/share/classes/com/sun/security/jgss +jdk/src/java.security.jgss/share/classes/com/sun/security/sasl/gsskerb : jdk/src/share/classes/com/sun/security/sasl/gsskerb +jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos : jdk/src/share/classes/javax/security/auth/kerberos +jdk/src/java.security.jgss/share/classes/jgss-overview.html : jdk/src/share/classes/com/sun/security/jgss/jgss-overview.html +jdk/src/java.security.jgss/share/classes/org/ietf/jgss : jdk/src/share/classes/org/ietf/jgss +jdk/src/java.security.jgss/share/classes/sun/net/www/protocol/http/spnego : jdk/src/share/classes/sun/net/www/protocol/http/spnego +jdk/src/java.security.jgss/share/classes/sun/security/jgss : jdk/src/share/classes/sun/security/jgss +jdk/src/java.security.jgss/share/classes/sun/security/krb5 : jdk/src/share/classes/sun/security/krb5 +jdk/src/java.security.jgss/share/classes/sun/security/ssl/krb5 : jdk/src/share/classes/sun/security/ssl/krb5 +jdk/src/java.security.jgss/share/native/libj2gss : jdk/src/share/native/sun/security/jgss/wrapper +jdk/src/java.security.jgss/unix/native/libj2gss : jdk/src/solaris/native/sun/security/jgss/wrapper +jdk/src/java.security.jgss/windows/native/libw2k_lsa_auth : jdk/src/windows/native/sun/security/krb5 +jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/digest : jdk/src/share/classes/com/sun/security/sasl/digest +jdk/src/java.security.sasl/share/classes/com/sun/security/sasl : jdk/src/share/classes/com/sun/security/sasl +jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/ntlm : jdk/src/share/classes/com/sun/security/sasl/ntlm +jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/util : jdk/src/share/classes/com/sun/security/sasl/util +jdk/src/java.security.sasl/share/classes/javax/security/sasl : jdk/src/share/classes/javax/security/sasl +jdk/src/java.smartcardio/share/classes/javax/smartcardio : jdk/src/share/classes/javax/smartcardio +jdk/src/java.smartcardio/share/classes/sun/security/smartcardio : jdk/src/share/classes/sun/security/smartcardio +jdk/src/java.smartcardio/share/native/libj2pcsc : jdk/src/share/native/sun/security/smartcardio +jdk/src/java.smartcardio/unix/classes/sun/security/smartcardio : jdk/src/solaris/classes/sun/security/smartcardio +jdk/src/java.smartcardio/unix/native/libj2pcsc : jdk/src/solaris/native/sun/security/smartcardio +jdk/src/java.smartcardio/unix/native/libj2pcsc/MUSCLE : jdk/src/solaris/native/sun/security/smartcardio/MUSCLE +jdk/src/java.smartcardio/windows/classes/sun/security/smartcardio : jdk/src/windows/classes/sun/security/smartcardio +jdk/src/java.smartcardio/windows/native/libj2pcsc : jdk/src/windows/native/sun/security/smartcardio +jdk/src/java.sql.rowset/share/classes/com/sun/rowset : jdk/src/share/classes/com/sun/rowset +jdk/src/java.sql.rowset/share/classes/javax/sql/rowset : jdk/src/share/classes/javax/sql/rowset +jdk/src/java.sql/share/classes/java/sql : jdk/src/share/classes/java/sql +jdk/src/java.sql/share/classes/javax/sql : jdk/src/share/classes/javax/sql +jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security : jdk/src/share/classes/com/sun/org/apache/xml/internal/security +jdk/src/java.xml.crypto/share/classes/javax/xml/crypto : jdk/src/share/classes/javax/xml/crypto +jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal : jdk/src/share/classes/org/jcp/xml/dsig/internal +jdk/src/jdk.attach/aix/native/libattach/AixVirtualMachine.c : jdk/src/aix/native/sun/tools/attach/AixVirtualMachine.c +jdk/src/jdk.attach/share/classes/com/sun/tools/attach : jdk/src/share/classes/com/sun/tools/attach +jdk/src/jdk.attach/share/classes/com/sun/tools/attach/spi : jdk/src/share/classes/com/sun/tools/attach/spi +jdk/src/jdk.attach/share/classes/META-INF/services : jdk/src/share/classes/sun/tools/attach/META-INF/services +jdk/src/jdk.attach/share/classes/sun/tools/attach : jdk/src/share/classes/sun/tools/attach +jdk/src/jdk.attach/unix/classes/sun/tools/attach : jdk/src/solaris/classes/sun/tools/attach +jdk/src/jdk.attach/unix/native/libattach : jdk/src/solaris/native/sun/tools/attach +jdk/src/jdk.attach/windows/native/libattach : jdk/src/windows/native/sun/tools/attach +jdk/src/jdk.base/share/native/libnpt : jdk/src/share/npt +jdk/src/jdk.base/unix/native/libnpt : jdk/src/solaris/npt +jdk/src/jdk.base/windows/native/libnpt : jdk/src/windows/npt +jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext : jdk/src/share/classes/sun/nio/cs/ext +jdk/src/jdk.charsets/unix/classes/sun/nio/cs/ext : jdk/src/solaris/classes/sun/nio/cs/ext +jdk/src/jdk.compiler/share/classes/sun/tools/serialver : jdk/src/share/classes/sun/tools/serialver +jdk/src/jdk.crypto.ec/share/classes/sun/security/ec : jdk/src/share/classes/sun/security/ec +jdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp : jdk/src/share/native/sun/security/ec/ECC_JNI.cpp +jdk/src/jdk.crypto.ec/share/native/libsunec/impl : jdk/src/share/native/sun/security/ec/impl +jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi : jdk/src/windows/classes/sun/security/mscapi +jdk/src/jdk.crypto.mscapi/windows/native/libsunmscapi : jdk/src/windows/native/sun/security/mscapi +jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11 : jdk/src/share/classes/sun/security/pkcs11 +jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/j2secmod.c : jdk/src/share/native/sun/security/pkcs11/j2secmod.c +jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/j2secmod.h : jdk/src/share/native/sun/security/pkcs11/j2secmod.h +jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_convert.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c +jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_crypt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_crypt.c +jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_digest.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_digest.c +jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_dual.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_dual.c +jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_general.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_general.c +jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_keymgmt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c +jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_mutex.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_mutex.c +jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_objmgmt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_objmgmt.c +jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_sessmgmt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sessmgmt.c +jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_sign.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sign.c +jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_util.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_util.c +jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11f.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11f.h +jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11.h +jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11t.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h +jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs-11v2-20a3.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs-11v2-20a3.h +jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11wrapper.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h +jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/j2secmod_md.c : jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c +jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/j2secmod_md.h : jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.h +jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/p11_md.c : jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c +jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/p11_md.h : jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.h +jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/j2secmod_md.c : jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.c +jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/j2secmod_md.h : jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.h +jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/p11_md.c : jdk/src/windows/native/sun/security/pkcs11/wrapper/p11_md.c +jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/p11_md.h : jdk/src/windows/native/sun/security/pkcs11/wrapper/p11_md.h +jdk/src/jdk.deploy.osx/macosx/classes/com/apple/concurrent/package.html : jdk/src/macosx/classes/com/apple/concurrent/package.html +jdk/src/jdk.deploy.osx/macosx/native/libapplescriptengine : jdk/src/macosx/native/apple/applescript +jdk/src/jdk.deploy.osx/macosx/native/libosx/CFileManager.m : jdk/src/macosx/native/com/apple/eio/CFileManager.m +jdk/src/jdk.deploy.osx/macosx/native/libosx/Dispatch.m : jdk/src/macosx/native/com/apple/concurrent/Dispatch.m +jdk/src/jdk.deploy.osx/macosx/native/libosx/JavaAppLauncher.m : jdk/src/macosx/native/apple/launcher/JavaAppLauncher.m +jdk/src/jdk.deploy.osx/macosx/native/libosx/KeystoreImpl.m : jdk/src/macosx/native/apple/security/KeystoreImpl.m +jdk/src/jdk.dev/share/classes/com/sun/jarsigner : jdk/src/share/classes/com/sun/jarsigner +jdk/src/jdk.dev/share/classes/com/sun/tools/extcheck : jdk/src/share/classes/com/sun/tools/extcheck +jdk/src/jdk.dev/share/classes/com/sun/tools/hat : jdk/src/share/classes/com/sun/tools/hat +jdk/src/jdk.dev/share/classes/com/sun/tools/script/shell : jdk/src/share/classes/com/sun/tools/script/shell +jdk/src/jdk.dev/share/classes/sun/security/tools/jarsigner : jdk/src/share/classes/sun/security/tools/jarsigner +jdk/src/jdk.dev/share/classes/sun/tools/jar : jdk/src/share/classes/sun/tools/jar +jdk/src/jdk.dev/share/classes/sun/tools/native2ascii : jdk/src/share/classes/sun/tools/native2ascii +jdk/src/jdk.hprof.agent/share/classes/com/sun/demo/jvmti/hprof : jdk/src/share/classes/com/sun/demo/jvmti/hprof +jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver : jdk/src/share/classes/com/sun/net/httpserver +jdk/src/jdk.httpserver/share/classes/sun/net/httpserver : jdk/src/share/classes/sun/net/httpserver +jdk/src/jdk.jcmd/share/classes/sun/tools/jcmd : jdk/src/share/classes/sun/tools/jcmd +jdk/src/jdk.jcmd/share/classes/sun/tools/jinfo : jdk/src/share/classes/sun/tools/jinfo +jdk/src/jdk.jcmd/share/classes/sun/tools/jmap : jdk/src/share/classes/sun/tools/jmap +jdk/src/jdk.jcmd/share/classes/sun/tools/jps : jdk/src/share/classes/sun/tools/jps +jdk/src/jdk.jcmd/share/classes/sun/tools/jstack : jdk/src/share/classes/sun/tools/jstack +jdk/src/jdk.jcmd/share/classes/sun/tools/jstat : jdk/src/share/classes/sun/tools/jstat +jdk/src/jdk.jconsole/share/classes/com/sun/tools/jconsole : jdk/src/share/classes/com/sun/tools/jconsole +jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole : jdk/src/share/classes/sun/tools/jconsole +jdk/src/jdk.jdi/share/classes/com/sun/jdi : jdk/src/share/classes/com/sun/jdi +jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr : jdk/src/share/classes/com/sun/tools/example/debug/expr +jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty : jdk/src/share/classes/com/sun/tools/example/debug/tty +jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi : jdk/src/share/classes/com/sun/tools/jdi +jdk/src/jdk.jdi/share/classes/jdi-overview.html : jdk/src/share/classes/jdi-overview.html +jdk/src/jdk.jdi/share/classes/META-INF/services : jdk/src/share/classes/com/sun/tools/jdi/META-INF/services +jdk/src/jdk.jdi/share/native/libdt_shmem/SharedMemoryConnection.c : jdk/src/share/native/com/sun/tools/jdi/SharedMemoryConnection.c +jdk/src/jdk.jdi/share/native/libdt_shmem/SharedMemory.h : jdk/src/share/native/com/sun/tools/jdi/SharedMemory.h +jdk/src/jdk.jdi/share/native/libdt_shmem/SharedMemoryTransport.c : jdk/src/share/native/com/sun/tools/jdi/SharedMemoryTransport.c +jdk/src/jdk.jdi/share/native/libdt_shmem/shmemBack.c : jdk/src/share/transport/shmem/shmemBack.c +jdk/src/jdk.jdi/share/native/libdt_shmem/shmemBase.c : jdk/src/share/transport/shmem/shmemBase.c +jdk/src/jdk.jdi/share/native/libdt_shmem/shmemBase.h : jdk/src/share/transport/shmem/shmemBase.h +jdk/src/jdk.jdi/share/native/libdt_shmem/sysShmem.h : jdk/src/share/transport/shmem/sysShmem.h +jdk/src/jdk.jdi/windows/native/libdt_shmem : jdk/src/windows/transport/shmem +jdk/src/jdk.jdwp.agent/share/native/include/jdwpTransport.h : jdk/src/share/javavm/export/jdwpTransport.h +jdk/src/jdk.jdwp.agent/share/native/libdt_socket : jdk/src/share/transport/socket +jdk/src/jdk.jdwp.agent/share/native/libjdwp : jdk/src/share/back +jdk/src/jdk.jdwp.agent/unix/native/libdt_socket : jdk/src/solaris/transport/socket +jdk/src/jdk.jdwp.agent/unix/native/libjdwp : jdk/src/solaris/back +jdk/src/jdk.jdwp.agent/windows/native/libdt_socket : jdk/src/windows/transport/socket +jdk/src/jdk.jdwp.agent/windows/native/libjdwp : jdk/src/windows/back +jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor : jdk/src/share/classes/sun/jvmstat/monitor +jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata : jdk/src/share/classes/sun/jvmstat/perfdata +jdk/src/jdk.jvmstat/share/classes/sun/tools/jstatd : jdk/src/share/classes/sun/tools/jstatd +jdk/src/jdk.localedata/share/classes/sun/text/resources/ar : jdk/src/share/classes/sun/text/resources/ar +jdk/src/jdk.localedata/share/classes/sun/text/resources/be : jdk/src/share/classes/sun/text/resources/be +jdk/src/jdk.localedata/share/classes/sun/text/resources/bg : jdk/src/share/classes/sun/text/resources/bg +jdk/src/jdk.localedata/share/classes/sun/text/resources/ca : jdk/src/share/classes/sun/text/resources/ca +jdk/src/jdk.localedata/share/classes/sun/text/resources/cs : jdk/src/share/classes/sun/text/resources/cs +jdk/src/jdk.localedata/share/classes/sun/text/resources/da : jdk/src/share/classes/sun/text/resources/da +jdk/src/jdk.localedata/share/classes/sun/text/resources/de : jdk/src/share/classes/sun/text/resources/de +jdk/src/jdk.localedata/share/classes/sun/text/resources/el : jdk/src/share/classes/sun/text/resources/el +jdk/src/jdk.localedata/share/classes/sun/text/resources/es : jdk/src/share/classes/sun/text/resources/es +jdk/src/jdk.localedata/share/classes/sun/text/resources/et : jdk/src/share/classes/sun/text/resources/et +jdk/src/jdk.localedata/share/classes/sun/text/resources/fi : jdk/src/share/classes/sun/text/resources/fi +jdk/src/jdk.localedata/share/classes/sun/text/resources/fr : jdk/src/share/classes/sun/text/resources/fr +jdk/src/jdk.localedata/share/classes/sun/text/resources/ga : jdk/src/share/classes/sun/text/resources/ga +jdk/src/jdk.localedata/share/classes/sun/text/resources/hi : jdk/src/share/classes/sun/text/resources/hi +jdk/src/jdk.localedata/share/classes/sun/text/resources/hr : jdk/src/share/classes/sun/text/resources/hr +jdk/src/jdk.localedata/share/classes/sun/text/resources/hu : jdk/src/share/classes/sun/text/resources/hu +jdk/src/jdk.localedata/share/classes/sun/text/resources/in : jdk/src/share/classes/sun/text/resources/in +jdk/src/jdk.localedata/share/classes/sun/text/resources/is : jdk/src/share/classes/sun/text/resources/is +jdk/src/jdk.localedata/share/classes/sun/text/resources/it : jdk/src/share/classes/sun/text/resources/it +jdk/src/jdk.localedata/share/classes/sun/text/resources/iw : jdk/src/share/classes/sun/text/resources/iw +jdk/src/jdk.localedata/share/classes/sun/text/resources/ja : jdk/src/share/classes/sun/text/resources/ja +jdk/src/jdk.localedata/share/classes/sun/text/resources/ko : jdk/src/share/classes/sun/text/resources/ko +jdk/src/jdk.localedata/share/classes/sun/text/resources/lt : jdk/src/share/classes/sun/text/resources/lt +jdk/src/jdk.localedata/share/classes/sun/text/resources/lv : jdk/src/share/classes/sun/text/resources/lv +jdk/src/jdk.localedata/share/classes/sun/text/resources/mk : jdk/src/share/classes/sun/text/resources/mk +jdk/src/jdk.localedata/share/classes/sun/text/resources/ms : jdk/src/share/classes/sun/text/resources/ms +jdk/src/jdk.localedata/share/classes/sun/text/resources/mt : jdk/src/share/classes/sun/text/resources/mt +jdk/src/jdk.localedata/share/classes/sun/text/resources/nl : jdk/src/share/classes/sun/text/resources/nl +jdk/src/jdk.localedata/share/classes/sun/text/resources/no : jdk/src/share/classes/sun/text/resources/no +jdk/src/jdk.localedata/share/classes/sun/text/resources/pl : jdk/src/share/classes/sun/text/resources/pl +jdk/src/jdk.localedata/share/classes/sun/text/resources/pt : jdk/src/share/classes/sun/text/resources/pt +jdk/src/jdk.localedata/share/classes/sun/text/resources/ro : jdk/src/share/classes/sun/text/resources/ro +jdk/src/jdk.localedata/share/classes/sun/text/resources/ru : jdk/src/share/classes/sun/text/resources/ru +jdk/src/jdk.localedata/share/classes/sun/text/resources/sk : jdk/src/share/classes/sun/text/resources/sk +jdk/src/jdk.localedata/share/classes/sun/text/resources/sl : jdk/src/share/classes/sun/text/resources/sl +jdk/src/jdk.localedata/share/classes/sun/text/resources/sq : jdk/src/share/classes/sun/text/resources/sq +jdk/src/jdk.localedata/share/classes/sun/text/resources/sr : jdk/src/share/classes/sun/text/resources/sr +jdk/src/jdk.localedata/share/classes/sun/text/resources/sv : jdk/src/share/classes/sun/text/resources/sv +jdk/src/jdk.localedata/share/classes/sun/text/resources/th : jdk/src/share/classes/sun/text/resources/th +jdk/src/jdk.localedata/share/classes/sun/text/resources/tr : jdk/src/share/classes/sun/text/resources/tr +jdk/src/jdk.localedata/share/classes/sun/text/resources/uk : jdk/src/share/classes/sun/text/resources/uk +jdk/src/jdk.localedata/share/classes/sun/text/resources/vi : jdk/src/share/classes/sun/text/resources/vi +jdk/src/jdk.localedata/share/classes/sun/text/resources/zh : jdk/src/share/classes/sun/text/resources/zh +jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources : jdk/src/share/classes/sun/util/cldr/resources +jdk/src/jdk.localedata/share/classes/sun/util/resources/ar : jdk/src/share/classes/sun/util/resources/ar +jdk/src/jdk.localedata/share/classes/sun/util/resources/be : jdk/src/share/classes/sun/util/resources/be +jdk/src/jdk.localedata/share/classes/sun/util/resources/bg : jdk/src/share/classes/sun/util/resources/bg +jdk/src/jdk.localedata/share/classes/sun/util/resources/ca : jdk/src/share/classes/sun/util/resources/ca +jdk/src/jdk.localedata/share/classes/sun/util/resources/cs : jdk/src/share/classes/sun/util/resources/cs +jdk/src/jdk.localedata/share/classes/sun/util/resources/da : jdk/src/share/classes/sun/util/resources/da +jdk/src/jdk.localedata/share/classes/sun/util/resources/de : jdk/src/share/classes/sun/util/resources/de +jdk/src/jdk.localedata/share/classes/sun/util/resources/el : jdk/src/share/classes/sun/util/resources/el +jdk/src/jdk.localedata/share/classes/sun/util/resources/es : jdk/src/share/classes/sun/util/resources/es +jdk/src/jdk.localedata/share/classes/sun/util/resources/et : jdk/src/share/classes/sun/util/resources/et +jdk/src/jdk.localedata/share/classes/sun/util/resources/fi : jdk/src/share/classes/sun/util/resources/fi +jdk/src/jdk.localedata/share/classes/sun/util/resources/fr : jdk/src/share/classes/sun/util/resources/fr +jdk/src/jdk.localedata/share/classes/sun/util/resources/ga : jdk/src/share/classes/sun/util/resources/ga +jdk/src/jdk.localedata/share/classes/sun/util/resources/hi : jdk/src/share/classes/sun/util/resources/hi +jdk/src/jdk.localedata/share/classes/sun/util/resources/hr : jdk/src/share/classes/sun/util/resources/hr +jdk/src/jdk.localedata/share/classes/sun/util/resources/hu : jdk/src/share/classes/sun/util/resources/hu +jdk/src/jdk.localedata/share/classes/sun/util/resources/in : jdk/src/share/classes/sun/util/resources/in +jdk/src/jdk.localedata/share/classes/sun/util/resources/is : jdk/src/share/classes/sun/util/resources/is +jdk/src/jdk.localedata/share/classes/sun/util/resources/it : jdk/src/share/classes/sun/util/resources/it +jdk/src/jdk.localedata/share/classes/sun/util/resources/iw : jdk/src/share/classes/sun/util/resources/iw +jdk/src/jdk.localedata/share/classes/sun/util/resources/ja : jdk/src/share/classes/sun/util/resources/ja +jdk/src/jdk.localedata/share/classes/sun/util/resources/ko : jdk/src/share/classes/sun/util/resources/ko +jdk/src/jdk.localedata/share/classes/sun/util/resources/lt : jdk/src/share/classes/sun/util/resources/lt +jdk/src/jdk.localedata/share/classes/sun/util/resources/lv : jdk/src/share/classes/sun/util/resources/lv +jdk/src/jdk.localedata/share/classes/sun/util/resources/mk : jdk/src/share/classes/sun/util/resources/mk +jdk/src/jdk.localedata/share/classes/sun/util/resources/ms : jdk/src/share/classes/sun/util/resources/ms +jdk/src/jdk.localedata/share/classes/sun/util/resources/mt : jdk/src/share/classes/sun/util/resources/mt +jdk/src/jdk.localedata/share/classes/sun/util/resources/nl : jdk/src/share/classes/sun/util/resources/nl +jdk/src/jdk.localedata/share/classes/sun/util/resources/no : jdk/src/share/classes/sun/util/resources/no +jdk/src/jdk.localedata/share/classes/sun/util/resources/pl : jdk/src/share/classes/sun/util/resources/pl +jdk/src/jdk.localedata/share/classes/sun/util/resources/pt : jdk/src/share/classes/sun/util/resources/pt +jdk/src/jdk.localedata/share/classes/sun/util/resources/ro : jdk/src/share/classes/sun/util/resources/ro +jdk/src/jdk.localedata/share/classes/sun/util/resources/ru : jdk/src/share/classes/sun/util/resources/ru +jdk/src/jdk.localedata/share/classes/sun/util/resources/sk : jdk/src/share/classes/sun/util/resources/sk +jdk/src/jdk.localedata/share/classes/sun/util/resources/sl : jdk/src/share/classes/sun/util/resources/sl +jdk/src/jdk.localedata/share/classes/sun/util/resources/sq : jdk/src/share/classes/sun/util/resources/sq +jdk/src/jdk.localedata/share/classes/sun/util/resources/sr : jdk/src/share/classes/sun/util/resources/sr +jdk/src/jdk.localedata/share/classes/sun/util/resources/sv : jdk/src/share/classes/sun/util/resources/sv +jdk/src/jdk.localedata/share/classes/sun/util/resources/th : jdk/src/share/classes/sun/util/resources/th +jdk/src/jdk.localedata/share/classes/sun/util/resources/tr : jdk/src/share/classes/sun/util/resources/tr +jdk/src/jdk.localedata/share/classes/sun/util/resources/uk : jdk/src/share/classes/sun/util/resources/uk +jdk/src/jdk.localedata/share/classes/sun/util/resources/vi : jdk/src/share/classes/sun/util/resources/vi +jdk/src/jdk.localedata/share/classes/sun/util/resources/zh : jdk/src/share/classes/sun/util/resources/zh +jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns : jdk/src/share/classes/com/sun/jndi/dns +jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/url/dns : jdk/src/share/classes/com/sun/jndi/url/dns +jdk/src/jdk.naming.dns/share/classes/META-INF/services : jdk/src/share/classes/sun/net/spi/nameservice/dns/META-INF/services +jdk/src/jdk.naming.dns/share/classes/sun/net/spi/nameservice/dns : jdk/src/share/classes/sun/net/spi/nameservice/dns +jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry : jdk/src/share/classes/com/sun/jndi/rmi/registry +jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/url/rmi : jdk/src/share/classes/com/sun/jndi/url/rmi +jdk/src/jdk.rmic/share/classes/sun/rmi/rmic : jdk/src/share/classes/sun/rmi/rmic +jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic : jdk/src/share/classes/sun/rmi/rmic/newrmic +jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp : jdk/src/share/classes/sun/rmi/rmic/newrmic/jrmp +jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/resources : jdk/src/share/classes/sun/rmi/rmic/resources +jdk/src/jdk.rmic/share/classes/sun/tools/asm : jdk/src/share/classes/sun/tools/asm +jdk/src/jdk.rmic/share/classes/sun/tools/javac : jdk/src/share/classes/sun/tools/javac +jdk/src/jdk.rmic/share/classes/sun/tools/java : jdk/src/share/classes/sun/tools/java +jdk/src/jdk.rmic/share/classes/sun/tools/tree : jdk/src/share/classes/sun/tools/tree +jdk/src/jdk.rmic/share/classes/sun/tools/util : jdk/src/share/classes/sun/tools/util +jdk/src/jdk.runtime/share/classes/com/sun/tracing : jdk/src/share/classes/com/sun/tracing +jdk/src/jdk.runtime/share/classes/sun/security/tools/policytool : jdk/src/share/classes/sun/security/tools/policytool +jdk/src/jdk.runtime/share/classes/sun/tracing : jdk/src/share/classes/sun/tracing +jdk/src/jdk.runtime/share/native/common-unpack/bands.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/bands.cpp +jdk/src/jdk.runtime/share/native/common-unpack/bands.h : jdk/src/share/native/com/sun/java/util/jar/pack/bands.h +jdk/src/jdk.runtime/share/native/common-unpack/bytes.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/bytes.cpp +jdk/src/jdk.runtime/share/native/common-unpack/bytes.h : jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h +jdk/src/jdk.runtime/share/native/common-unpack/coding.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/coding.cpp +jdk/src/jdk.runtime/share/native/common-unpack/coding.h : jdk/src/share/native/com/sun/java/util/jar/pack/coding.h +jdk/src/jdk.runtime/share/native/common-unpack/constants.h : jdk/src/share/native/com/sun/java/util/jar/pack/constants.h +jdk/src/jdk.runtime/share/native/common-unpack/defines.h : jdk/src/share/native/com/sun/java/util/jar/pack/defines.h +jdk/src/jdk.runtime/share/native/common-unpack/unpack.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp +jdk/src/jdk.runtime/share/native/common-unpack/unpack.h : jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h +jdk/src/jdk.runtime/share/native/common-unpack/utils.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp +jdk/src/jdk.runtime/share/native/common-unpack/utils.h : jdk/src/share/native/com/sun/java/util/jar/pack/utils.h +jdk/src/jdk.runtime/share/native/common-unpack/zip.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp +jdk/src/jdk.runtime/share/native/common-unpack/zip.h : jdk/src/share/native/com/sun/java/util/jar/pack/zip.h +jdk/src/jdk.runtime/share/native/libjsdt : jdk/src/share/native/sun/tracing/dtrace +jdk/src/jdk.runtime/share/native/libunpack/jni.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp +jdk/src/jdk.runtime/share/native/unpack200/main.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp +jdk/src/jdk.runtime/unix/native/libjsdt/jvm_symbols_md.c : jdk/src/solaris/native/sun/tracing/dtrace/jvm_symbols_md.c +jdk/src/jdk.runtime/windows/native/libjsdt/jvm_symbols_md.c : jdk/src/windows/native/sun/tracing/dtrace/jvm_symbols_md.c +jdk/src/jdk.runtime/windows/native/unpack200/unpack200_proto.exe.manifest : jdk/src/windows/resource/unpack200_proto.exe.manifest +jdk/src/jdk.sctp/macosx/classes/sun/nio/ch/sctp : jdk/src/macosx/classes/sun/nio/ch/sctp +jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp : jdk/src/share/classes/com/sun/nio/sctp +jdk/src/jdk.sctp/share/classes/sun/nio/ch/sctp : jdk/src/share/classes/sun/nio/ch/sctp +jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp : jdk/src/solaris/classes/sun/nio/ch/sctp +jdk/src/jdk.sctp/unix/native/libsctp : jdk/src/solaris/native/sun/nio/ch/sctp +jdk/src/jdk.sctp/windows/classes/sun/nio/ch/sctp : jdk/src/windows/classes/sun/nio/ch/sctp +jdk/src/jdk.security.auth/share/classes/com/sun/security/auth : jdk/src/share/classes/com/sun/security/auth +jdk/src/jdk.security.auth/share/classes/jaas-overview.html : jdk/src/share/classes/com/sun/security/auth/jaas-overview.html +jdk/src/jdk.security.auth/unix/native/libjaas : jdk/src/solaris/native/com/sun/security/auth/module +jdk/src/jdk.security.auth/windows/native/libjaas : jdk/src/windows/native/com/sun/security/auth/module +jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp : jdk/src/share/classes/com/sun/jmx/snmp +jdk/src/jdk.snmp/share/classes/sun/management/snmp : jdk/src/share/classes/sun/management/snmp +jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs : jdk/src/share/classes/jdk/nio/zipfs +jdk/src/jdk.zipfs/share/classes/META-INF : jdk/src/share/classes/jdk/nio/zipfs/META-INF +jdk/src/sample/share : jdk/src/share/sample +langtools/src/java.base/share/classes/jdk/Exported.java : langtools/src/share/classes/jdk/Exported.java +langtools/src/java.compiler/share/classes/javax/annotation/processing : langtools/src/share/classes/javax/annotation/processing +langtools/src/java.compiler/share/classes/javax/lang/model : langtools/src/share/classes/javax/lang/model +langtools/src/java.compiler/share/classes/javax/tools : langtools/src/share/classes/javax/tools +langtools/src/jdk.compiler/share/classes/com/sun/source : langtools/src/share/classes/com/sun/source +langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile : langtools/src/share/classes/com/sun/tools/classfile +langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint : langtools/src/share/classes/com/sun/tools/doclint +langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/resources : langtools/src/share/classes/com/sun/tools/doclint/resources +langtools/src/jdk.compiler/share/classes/com/sun/tools/javac : langtools/src/share/classes/com/sun/tools/javac +langtools/src/jdk.compiler/share/classes/com/sun/tools/javah : langtools/src/share/classes/com/sun/tools/javah +langtools/src/jdk.compiler/share/classes/com/sun/tools/javap : langtools/src/share/classes/com/sun/tools/javap +langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac : langtools/src/share/classes/com/sun/tools/sjavac +langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps : langtools/src/share/classes/com/sun/tools/jdeps +langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/resources : langtools/src/share/classes/com/sun/tools/jdeps/resources +langtools/src/jdk.javadoc/share/classes/com/sun/javadoc : langtools/src/share/classes/com/sun/javadoc +langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets : langtools/src/share/classes/com/sun/tools/doclets +langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc : langtools/src/share/classes/com/sun/tools/javadoc +nashorn/src/jdk.scripting.nashorn/share/classes : nashorn/src diff --git a/common/bin/unshuffle_patch.sh b/common/bin/unshuffle_patch.sh new file mode 100644 index 00000000000..f237cca7999 --- /dev/null +++ b/common/bin/unshuffle_patch.sh @@ -0,0 +1,196 @@ +#!/bin/sh +# +# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +# Script for updating a patch file as per the shuffled/unshuffled source location. + +usage() { + echo "Usage: $0 [-h|--help] [-v|--verbose] " + echo "where:" + echo " is one of: corba, jaxp, jaxws, jdk, langtools, nashorn" + echo " [Note: patches from other repos do not need updating]" + echo " is the input patch file, that needs shuffling/unshuffling" + echo " is the updated patch file " + echo " " + exit 1 +} + +SCRIPT_DIR=`pwd`/`dirname $0` +UNSHUFFLE_LIST=$SCRIPT_DIR"/unshuffle_list.txt" + +if [ ! -f "$UNSHUFFLE_LIST" ] ; then + echo "FATAL: cannot find $UNSHUFFLE_LIST" + exit 1 +fi + +vflag="false" +while [ $# -gt 0 ] +do + case $1 in + -h | --help ) + usage + ;; + + -v | --verbose ) + vflag="true" + ;; + + -*) # bad option + usage + ;; + + * ) # non option + break + ;; + esac + shift +done + +# Make sure we have the right number of arguments +if [ ! $# -eq 3 ] ; then + echo "ERROR: Invalid number of arguments." + usage +fi + +# Check the given repo +repos="corba jaxp jaxws jdk langtools nashorn" +repo="$1" +found="false" +for r in $repos ; do + if [ $repo = "$r" ] ; then + found="true" + break; + fi +done +if [ $found = "false" ] ; then + echo "ERROR: Unknown repo: $repo. Should be one of [$repos]." + usage +fi + +# Check given input/output files +input="$2" +output="$3" + +if [ ! -f $input ] ; then + echo "ERROR: Cannot find input patch file: $input" + exit 1 +fi + +if [ -f $output ] ; then + echo "ERROR: Output patch already exists: $output" + exit 1 +fi + +what="" ## shuffle or unshuffle + +verbose() { + if [ ${vflag} = "true" ] ; then + echo "$@" + fi +} + +unshuffle() { + line=$@ + verbose "Attempting to rewrite: \"$line\"" + + # Retrieve the file name + path= + if echo "$line" | egrep '^diff' > /dev/null ; then + if ! echo "$line" | egrep '\-\-git' > /dev/null ; then + echo "ERROR: Only git patches supported. Please use 'hg export --git ...'." + exit 1 + fi + path="`echo "$line" | sed -e s@'diff --git a/'@@ -e s@' b/.*$'@@`" + elif echo "$line" | egrep '^\-\-\-' > /dev/null ; then + path="`echo "$line" | sed -e s@'--- a/'@@`" + elif echo "$line" | egrep '^\+\+\+' > /dev/null ; then + path="`echo "$line" | sed s@'+++ b/'@@`" + fi + verbose "Extracted path: \"$path\"" + + # Only source can be shuffled, or unshuffled + if ! echo "$path" | egrep '^src/.*' > /dev/null ; then + verbose "Not a src path, skipping." + echo "$line" >> $output + return + fi + + # Shuffle or unshuffle? + if [ "${what}" = "" ] ; then + if echo "$path" | egrep '^src/java\..*|^src/jdk\..*' > /dev/null ; then + what="unshuffle" + else + what="shuffle" + fi + verbose "Shuffle or unshuffle: $what" + fi + + # Find the most specific matches in the shuffle list + matches= + matchpath="$repo"/"$path"/x + while [ "$matchpath" != "" ] ; do + matchpath="`echo $matchpath | sed s@'\(.*\)/.*$'@'\1'@`" + + if [ "${what}" = "shuffle" ] ; then + pattern=": $matchpath$" + else + pattern="^$matchpath :" + fi + verbose "Attempting to find \"$matchpath\"" + matches=`egrep "$pattern" "$UNSHUFFLE_LIST"` + if ! [ "x${matches}" = "x" ] ; then + verbose "Got matches: [$matches]" + break; + fi + + if ! echo "$matchpath" | egrep '.*/.*' > /dev/null ; then + break; + fi + done + + # Rewrite the line, if we have a match + if ! [ "x${matches}" = "x" ] ; then + shuffled="`echo "$matches" | sed -e s@' : .*'@@g -e s@'^[a-z]*\/'@@`" + unshuffled="`echo "$matches" | sed -e s@'.* : '@@g -e s@'^[a-z]*\/'@@`" + if [ "${what}" = "shuffle" ] ; then + newline="`echo "$line" | sed -e s@"$unshuffled"@"$shuffled"@g`" + else + newline="`echo "$line" | sed -e s@"$shuffled"@"$unshuffled"@g`" + fi + verbose "Rewriting to \"$newline\"" + echo "$newline" >> $output + else + echo "WARNING: no match found for $path" + echo "$line" >> $output + fi +} + +while IFS= read -r line +do + if echo "$line" | egrep '^diff|^\-\-\-|^\+\+\+' > /dev/null ; then + unshuffle "$line" + else + printf "%s\n" "$line" >> $output + fi +done < "$input" + diff --git a/corba/.hgtags b/corba/.hgtags index 80f38489230..d7401bcb630 100644 --- a/corba/.hgtags +++ b/corba/.hgtags @@ -268,3 +268,4 @@ ddc07abf4307855c0dc904cc5c96cc764023a930 jdk9-b22 57735d66face054440a63ce99789eac5a5ee1dfd jdk9-b23 8a44142bb7fc8118f70f91a1b97c12dfc50563ee jdk9-b24 da08cca6b97f41b7081a3e176dcb400af6e4bb26 jdk9-b25 +6c777df597bbf5abba3488d44c401edfe73c74af jdk9-b26 diff --git a/corba/make/CompileCorba.gmk b/corba/make/CompileCorba.gmk index 225258c2080..9e19f29473f 100644 --- a/corba/make/CompileCorba.gmk +++ b/corba/make/CompileCorba.gmk @@ -34,53 +34,31 @@ include CommonCorba.gmk ################################################################################ -$(eval $(call SetupJavaCompilation,BUILD_CORBA, \ - SETUP := GENERATE_NEWBYTECODE, \ - SRC := $(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc, \ +$(eval $(call SetupJavaCompilation,BUILD_INTERIM_CORBA, \ + SETUP := GENERATE_OLDBYTECODE, \ + SRC := $(CORBA_TOPDIR)/src/java.corba/share/classes \ + $(CORBA_TOPDIR)/src/jdk.rmic/share/classes \ + $(CORBA_OUTPUTDIR)/gensrc/java.corba, \ EXCLUDES := com/sun/corba/se/PortableActivationIDL, \ EXCLUDE_FILES := com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java \ com/sun/corba/se/spi/presentation/rmi/StubWrapper.java \ - com/sun/org/omg/CORBA/IDLTypeOperations.java \ - com/sun/org/omg/CORBA/IRObjectOperations.java \ org/omg/PortableInterceptor/UNKNOWN.java \ com/sun/tools/corba/se/idl/ResourceBundleUtil.java \ com/sun/corba/se/impl/presentation/rmi/jndi.properties, \ COPY := .prp, \ CLEAN := .properties, \ - BIN := $(CORBA_OUTPUTDIR)/classes, \ - JAR := $(CORBA_OUTPUTDIR)/dist/lib/classes.jar)) - -# For the interim version, don't bother cleaning the properties. -$(eval $(call SetupJavaCompilation,BUILD_INTERIM_CORBA, \ - SETUP := GENERATE_OLDBYTECODE, \ - SRC := $(BUILD_CORBA_SRC), \ - EXCLUDES := $(BUILD_CORBA_EXCLUDES), \ - EXCLUDE_FILES := $(BUILD_CORBA_EXCLUDE_FILES), \ - COPY := $(BUILD_CORBA_COPY) $(BUILD_CORBA_CLEAN), \ BIN := $(CORBA_OUTPUTDIR)/interim_classes, \ JAR := $(INTERIM_CORBA_JAR))) -# Separate src.zip call to include sources that were excluded in the build to -# mimic behavior in old build system. -$(eval $(call SetupZipArchive,ARCHIVE_CORBA_SRC, \ - SRC := $(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc, \ - ZIP := $(CORBA_OUTPUTDIR)/dist/lib/src.zip)) - ################################################################################ -# Create bin.zip containing the corba specific binaries: orb.idl, ir.idl -BIN_FILES := $(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/orb.idl \ - $(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/ir.idl +# Copy idl files straight to jdk/lib. Not sure if this is the right way to do +# it, but we are moving away from the one repo at a time build. Perhaps we should +# scrap the 'jdk' prefix to bin, lib etc? +$(JDK_OUTPUTDIR)/lib/%: $(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/tools/corba/se/idl/% + $(install-file) -$(CORBA_OUTPUTDIR)/dist/lib/bin.zip: $(BIN_FILES) - $(MKDIR) -p $(CORBA_OUTPUTDIR)/dist/lib - $(MKDIR) -p $(CORBA_OUTPUTDIR)/lib - $(RM) -f $@ - $(ECHO) Creating `basename $@` - $(CP) $(BIN_FILES) $(CORBA_OUTPUTDIR)/lib - $(CHMOD) ug+w $(CORBA_OUTPUTDIR)/lib/* - (cd $(CORBA_OUTPUTDIR); $(ZIP) -q $@ lib/orb.idl lib/ir.idl) +IDL_TARGET_FILES := $(JDK_OUTPUTDIR)/lib/orb.idl $(JDK_OUTPUTDIR)/lib/ir.idl ################################################################################ -all: $(BUILD_CORBA) $(BUILD_INTERIM_CORBA) $(ARCHIVE_CORBA_SRC) \ - $(CORBA_OUTPUTDIR)/dist/lib/bin.zip +all: $(BUILD_INTERIM_CORBA) $(IDL_TARGET_FILES) diff --git a/corba/make/GensrcCorba.gmk b/corba/make/GensrcCorba.gmk index 4d078a56bb2..8b814238272 100644 --- a/corba/make/GensrcCorba.gmk +++ b/corba/make/GensrcCorba.gmk @@ -34,7 +34,7 @@ include CommonCorba.gmk ################################################################################ -$(eval $(call SetupJavaCompilation,BUILD_TOOLS, \ +$(eval $(call SetupJavaCompilation,BUILD_TOOLS_CORBA, \ SETUP := GENERATE_OLDBYTECODE, \ SRC := $(CORBA_TOPDIR)/make/src/classes, \ BIN := $(CORBA_OUTPUTDIR)/tools_classes)) @@ -44,7 +44,7 @@ TOOL_LOGUTIL_CMD := $(JAVA) -cp $(CORBA_OUTPUTDIR)/tools_classes \ $(eval $(call SetupJavaCompilation,BUILD_IDLJ, \ SETUP := GENERATE_OLDBYTECODE, \ - SRC := $(CORBA_TOPDIR)/src/share/classes, \ + SRC := $(CORBA_TOPDIR)/src/java.corba/share/classes, \ BIN := $(CORBA_OUTPUTDIR)/idlj_classes, \ COPY := .prp, \ INCLUDES := com/sun/tools/corba/se/idl, \ @@ -56,16 +56,16 @@ TOOL_IDLJ_CMD := $(JAVA) -cp $(CORBA_OUTPUTDIR)/idlj_classes \ ################################################################################ # Generate LogWrapper classes -$(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/%SystemException.java: \ - $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc \ - $(BUILD_TOOLS) +$(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/%SystemException.java: \ + $(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/%.mc \ + $(BUILD_TOOLS_CORBA) $(MKDIR) -p $(@D) $(RM) -f $(@D)/_the_wrappers.d $(ECHO) $(LOG_INFO) Generating class file from $*.mc $(TOOL_LOGUTIL_CMD) make-class $< $(@D) # Generate LogWrapper properties file by concatening resource files -$(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/LogStrings.properties: \ +$(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/LogStrings.properties: \ $(CORBA_OUTPUTDIR)/logwrappers/ActivationSystemException.resource \ $(CORBA_OUTPUTDIR)/logwrappers/IORSystemException.resource \ $(CORBA_OUTPUTDIR)/logwrappers/InterceptorsSystemException.resource \ @@ -80,8 +80,8 @@ $(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/LogStrings.properties: \ # The resources files are generated from lisp-like .mc files. $(CORBA_OUTPUTDIR)/logwrappers/%SystemException.resource: \ - $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc \ - $(BUILD_TOOLS) + $(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/%.mc \ + $(BUILD_TOOLS_CORBA) $(MKDIR) -p $(@D) $(RM) -f $(@D)/_the_wrappers.d $(ECHO) $(LOG_INFO) Generating resource file from $*.mc @@ -89,15 +89,15 @@ $(CORBA_OUTPUTDIR)/logwrappers/%SystemException.resource: \ LOGWRAPPER_TARGETS := \ - $(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/ActivationSystemException.java \ - $(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/IORSystemException.java \ - $(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/InterceptorsSystemException.java \ - $(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/NamingSystemException.java \ - $(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/OMGSystemException.java \ - $(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/ORBUtilSystemException.java \ - $(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/POASystemException.java \ - $(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/UtilSystemException.java \ - $(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/LogStrings.properties + $(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/ActivationSystemException.java \ + $(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/IORSystemException.java \ + $(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/InterceptorsSystemException.java \ + $(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/NamingSystemException.java \ + $(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/OMGSystemException.java \ + $(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/ORBUtilSystemException.java \ + $(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/POASystemException.java \ + $(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/UtilSystemException.java \ + $(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/LogStrings.properties ################################################################################ # Build the IDLs. @@ -213,8 +213,8 @@ IDL_DELETES := \ $(eval $(call SetupIdlCompilation,BUILD_IDLS, \ IDLJ := $(TOOL_IDLJ_CMD), \ - SRC := $(CORBA_TOPDIR)/src/share/classes, \ - BIN := $(CORBA_OUTPUTDIR)/gensrc, \ + SRC := $(CORBA_TOPDIR)/src/java.corba/share/classes, \ + BIN := $(CORBA_OUTPUTDIR)/gensrc/java.corba, \ EXCLUDES := com/sun/tools/corba/se/idl/% \ org/omg/CORBA/% \ com/sun/corba/se/GiopIDL/% \ @@ -229,12 +229,12 @@ $(BUILD_IDLS): $(BUILD_IDLJ) ################################################################################ # zh_HK is just a copy of zh_TW -$(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_HK.properties: \ - $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties +$(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_HK.properties: \ + $(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties $(install-file) ################################################################################ all: $(BUILD_IDLS) $(LOGWRAPPER_TARGETS) \ - $(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_HK.properties + $(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_HK.properties diff --git a/corba/src/share/classes/com/sun/corba/se/GiopIDL/GIOP.idl b/corba/src/java.corba/share/classes/com/sun/corba/se/GiopIDL/GIOP.idl similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/GiopIDL/GIOP.idl rename to corba/src/java.corba/share/classes/com/sun/corba/se/GiopIDL/GIOP.idl diff --git a/corba/src/share/classes/com/sun/corba/se/GiopIDL/messages.idl b/corba/src/java.corba/share/classes/com/sun/corba/se/GiopIDL/messages.idl similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/GiopIDL/messages.idl rename to corba/src/java.corba/share/classes/com/sun/corba/se/GiopIDL/messages.idl diff --git a/corba/src/share/classes/com/sun/corba/se/PortableActivationIDL/activation.idl b/corba/src/java.corba/share/classes/com/sun/corba/se/PortableActivationIDL/activation.idl similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/PortableActivationIDL/activation.idl rename to corba/src/java.corba/share/classes/com/sun/corba/se/PortableActivationIDL/activation.idl diff --git a/corba/src/share/classes/com/sun/corba/se/impl/activation/CommandHandler.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/CommandHandler.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/activation/CommandHandler.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/CommandHandler.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/activation/NameServiceStartThread.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/NameServiceStartThread.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/activation/NameServiceStartThread.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/NameServiceStartThread.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/activation/ORBD.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/ORBD.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/activation/ORBD.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/ORBD.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/activation/ProcessMonitorThread.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/ProcessMonitorThread.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/activation/ProcessMonitorThread.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/ProcessMonitorThread.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/activation/RepositoryImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/RepositoryImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/activation/RepositoryImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/RepositoryImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/activation/ServerMain.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/ServerMain.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/activation/ServerMain.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/ServerMain.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/activation/ServerTableEntry.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/ServerTableEntry.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/activation/ServerTableEntry.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/ServerTableEntry.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/activation/ServerTool.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/ServerTool.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/activation/ServerTool.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/ServerTool.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/copyobject/CopierManagerImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/copyobject/CopierManagerImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/copyobject/CopierManagerImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/copyobject/CopierManagerImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/copyobject/FallbackObjectCopierImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/copyobject/FallbackObjectCopierImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/copyobject/FallbackObjectCopierImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/copyobject/FallbackObjectCopierImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/copyobject/JavaStreamObjectCopierImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/copyobject/JavaStreamObjectCopierImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/copyobject/JavaStreamObjectCopierImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/copyobject/JavaStreamObjectCopierImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/copyobject/ORBStreamObjectCopierImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/copyobject/ORBStreamObjectCopierImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/copyobject/ORBStreamObjectCopierImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/copyobject/ORBStreamObjectCopierImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/copyobject/ReferenceObjectCopierImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/copyobject/ReferenceObjectCopierImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/copyobject/ReferenceObjectCopierImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/copyobject/ReferenceObjectCopierImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImplHelper.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/AnyImplHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImplHelper.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/AnyImplHelper.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/corba/AsynchInvoke.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/AsynchInvoke.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/corba/AsynchInvoke.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/AsynchInvoke.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/corba/CORBAObjectImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/CORBAObjectImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/corba/CORBAObjectImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/CORBAObjectImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/corba/ContextImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/ContextImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/corba/ContextImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/ContextImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/corba/ContextListImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/ContextListImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/corba/ContextListImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/ContextListImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/corba/EnvironmentImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/EnvironmentImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/corba/EnvironmentImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/EnvironmentImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/corba/ExceptionListImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/ExceptionListImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/corba/ExceptionListImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/ExceptionListImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/corba/NVListImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/NVListImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/corba/NVListImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/NVListImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/corba/NamedValueImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/NamedValueImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/corba/NamedValueImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/NamedValueImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/corba/PrincipalImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/PrincipalImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/corba/PrincipalImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/PrincipalImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/corba/RequestImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/RequestImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/corba/RequestImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/RequestImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/corba/ServerRequestImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/ServerRequestImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/corba/ServerRequestImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/ServerRequestImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/corba/TCUtility.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/TCUtility.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/corba/TCUtility.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/TCUtility.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeFactory.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/TypeCodeFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeFactory.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/TypeCodeFactory.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImplHelper.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/TypeCodeImplHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImplHelper.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/TypeCodeImplHelper.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/corba/orb_config_design.txt b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/orb_config_design.txt similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/corba/orb_config_design.txt rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/orb_config_design.txt diff --git a/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyBasicImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyBasicImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyBasicImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyBasicImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyCollectionImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyCollectionImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyCollectionImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyCollectionImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyComplexImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyComplexImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyComplexImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyComplexImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyConstructedImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyConstructedImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyConstructedImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyConstructedImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyFactoryImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyFactoryImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyFactoryImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyFactoryImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyUtil.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyUtil.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyUtil.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyUtil.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynArrayImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynArrayImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynArrayImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynArrayImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynEnumImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynEnumImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynEnumImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynEnumImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynFixedImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynFixedImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynFixedImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynFixedImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynSequenceImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynSequenceImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynSequenceImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynSequenceImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynStructImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynStructImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynStructImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynStructImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynUnionImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynUnionImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynUnionImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynUnionImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynValueBoxImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynValueBoxImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynValueBoxImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynValueBoxImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynValueCommonImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynValueCommonImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynValueCommonImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynValueCommonImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynValueImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynValueImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynValueImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynValueImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerFactory.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerFactory.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerFactory.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerRead.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerRead.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerRead.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerRead.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerReadGrow.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerReadGrow.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerReadGrow.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerReadGrow.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerReadStream.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerReadStream.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerReadStream.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerReadStream.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWrite.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWrite.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWrite.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWrite.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteCollect.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteCollect.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteCollect.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteCollect.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteGrow.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteGrow.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteGrow.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteGrow.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteStream.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteStream.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteStream.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteStream.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/BufferQueue.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferQueue.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/BufferQueue.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferQueue.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/ByteBufferWithInfo.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/ByteBufferWithInfo.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/ByteBufferWithInfo.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/ByteBufferWithInfo.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputObject.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputObject.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputObject.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputObject.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStreamBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputStreamBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStreamBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputStreamBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_1.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_1.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_1.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_1.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_2.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_2.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_2.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_2.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputObject.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputObject.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputObject.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputObject.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStreamBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputStreamBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStreamBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputStreamBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_1.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_1.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_1.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_1.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_2.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_2.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_2.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_2.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/CodeSetCache.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CodeSetCache.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/CodeSetCache.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CodeSetCache.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/CodeSetComponentInfo.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CodeSetComponentInfo.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/CodeSetComponentInfo.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CodeSetComponentInfo.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/CodeSetConversion.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CodeSetConversion.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/CodeSetConversion.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CodeSetConversion.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsInputStream.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/EncapsInputStream.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsInputStream.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/EncapsInputStream.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsOutputStream.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/EncapsOutputStream.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsOutputStream.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/EncapsOutputStream.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationInputStream.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationInputStream.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationInputStream.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationInputStream.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/MarkAndResetHandler.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/MarkAndResetHandler.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/MarkAndResetHandler.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/MarkAndResetHandler.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/MarshalInputStream.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/MarshalInputStream.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/MarshalInputStream.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/MarshalInputStream.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/MarshalOutputStream.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/MarshalOutputStream.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/MarshalOutputStream.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/MarshalOutputStream.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/OSFCodeSetRegistry.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/OSFCodeSetRegistry.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/OSFCodeSetRegistry.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/OSFCodeSetRegistry.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/RestorableInputStream.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/RestorableInputStream.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/RestorableInputStream.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/RestorableInputStream.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeInputStream.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/TypeCodeInputStream.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeInputStream.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/TypeCodeInputStream.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeReader.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/TypeCodeReader.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeReader.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/TypeCodeReader.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/WrapperInputStream.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/WrapperInputStream.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/encoding/WrapperInputStream.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/WrapperInputStream.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/interceptors/ClientRequestInfoImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/ClientRequestInfoImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/interceptors/ClientRequestInfoImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/ClientRequestInfoImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/interceptors/CodecFactoryImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/CodecFactoryImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/interceptors/CodecFactoryImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/CodecFactoryImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/interceptors/IORInfoImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/IORInfoImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/interceptors/IORInfoImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/IORInfoImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/interceptors/InterceptorInvoker.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/InterceptorInvoker.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/interceptors/InterceptorInvoker.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/InterceptorInvoker.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/interceptors/InterceptorList.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/InterceptorList.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/interceptors/InterceptorList.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/InterceptorList.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/interceptors/ORBInitInfoImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/ORBInitInfoImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/interceptors/ORBInitInfoImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/ORBInitInfoImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/interceptors/PICurrent.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/PICurrent.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/interceptors/PICurrent.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/PICurrent.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/interceptors/PINoOpHandlerImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/PINoOpHandlerImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/interceptors/PINoOpHandlerImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/PINoOpHandlerImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/interceptors/ServerRequestInfoImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/ServerRequestInfoImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/interceptors/ServerRequestInfoImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/ServerRequestInfoImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/interceptors/SlotTable.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/SlotTable.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/interceptors/SlotTable.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/SlotTable.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/interceptors/SlotTableStack.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/SlotTableStack.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/interceptors/SlotTableStack.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/SlotTableStack.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/io/FVDCodeBaseImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/FVDCodeBaseImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/io/FVDCodeBaseImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/FVDCodeBaseImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClassCorbaExt.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/ObjectStreamClassCorbaExt.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClassCorbaExt.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/ObjectStreamClassCorbaExt.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamField.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/ObjectStreamField.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamField.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/ObjectStreamField.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/io/OptionalDataException.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/OptionalDataException.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/io/OptionalDataException.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/OptionalDataException.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/io/TypeMismatchException.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/TypeMismatchException.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/io/TypeMismatchException.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/TypeMismatchException.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/io/ValueHandlerImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/ValueHandlerImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/io/ValueHandlerImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/ValueHandlerImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/io/ValueUtility.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/ValueUtility.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/io/ValueUtility.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/ValueUtility.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/ByteBuffer.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ByteBuffer.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/ByteBuffer.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ByteBuffer.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/FreezableList.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/FreezableList.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/FreezableList.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/FreezableList.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/GenericIdentifiable.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericIdentifiable.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/GenericIdentifiable.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericIdentifiable.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/GenericTaggedComponent.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericTaggedComponent.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/GenericTaggedComponent.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericTaggedComponent.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/IORImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/IORImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/IORImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/IORImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/IORTemplateImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/IORTemplateImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/IORTemplateImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/IORTemplateImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/IORTemplateListImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/IORTemplateListImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/IORTemplateListImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/IORTemplateListImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/IdentifiableFactoryFinderBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/IdentifiableFactoryFinderBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/IdentifiableFactoryFinderBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/IdentifiableFactoryFinderBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/JIDLObjectKeyTemplate.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/JIDLObjectKeyTemplate.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/JIDLObjectKeyTemplate.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/JIDLObjectKeyTemplate.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/NewObjectKeyTemplateBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/NewObjectKeyTemplateBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/NewObjectKeyTemplateBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/NewObjectKeyTemplateBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdArray.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdArray.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdArray.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdArray.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdNumber.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdNumber.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdNumber.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdNumber.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectIdImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectIdImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectIdImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectIdImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyFactoryImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectKeyFactoryImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyFactoryImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectKeyFactoryImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyTemplateBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectKeyTemplateBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyTemplateBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectKeyTemplateBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectReferenceFactoryImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectReferenceFactoryImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectReferenceFactoryImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectReferenceFactoryImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectReferenceProducerBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectReferenceProducerBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectReferenceProducerBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectReferenceProducerBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectReferenceTemplateImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectReferenceTemplateImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectReferenceTemplateImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectReferenceTemplateImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/OldJIDLObjectKeyTemplate.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/OldJIDLObjectKeyTemplate.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/OldJIDLObjectKeyTemplate.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/OldJIDLObjectKeyTemplate.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/OldObjectKeyTemplateBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/OldObjectKeyTemplateBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/OldObjectKeyTemplateBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/OldObjectKeyTemplateBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/OldPOAObjectKeyTemplate.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/OldPOAObjectKeyTemplate.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/OldPOAObjectKeyTemplate.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/OldPOAObjectKeyTemplate.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/POAObjectKeyTemplate.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/POAObjectKeyTemplate.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/POAObjectKeyTemplate.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/POAObjectKeyTemplate.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/StubIORImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/StubIORImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/StubIORImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/StubIORImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/TaggedComponentFactoryFinderImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/TaggedComponentFactoryFinderImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/TaggedComponentFactoryFinderImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/TaggedComponentFactoryFinderImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/TaggedProfileFactoryFinderImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/TaggedProfileFactoryFinderImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/TaggedProfileFactoryFinderImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/TaggedProfileFactoryFinderImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/TaggedProfileTemplateFactoryFinderImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/TaggedProfileTemplateFactoryFinderImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/TaggedProfileTemplateFactoryFinderImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/TaggedProfileTemplateFactoryFinderImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/TestAssertions b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/TestAssertions similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/TestAssertions rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/TestAssertions diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/WireObjectKeyTemplate.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/WireObjectKeyTemplate.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/WireObjectKeyTemplate.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/WireObjectKeyTemplate.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/AlternateIIOPAddressComponentImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/AlternateIIOPAddressComponentImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/AlternateIIOPAddressComponentImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/AlternateIIOPAddressComponentImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/CodeSetsComponentImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/CodeSetsComponentImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/CodeSetsComponentImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/CodeSetsComponentImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressClosureImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressClosureImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressClosureImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressClosureImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/JavaCodebaseComponentImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/JavaCodebaseComponentImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/JavaCodebaseComponentImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/JavaCodebaseComponentImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/MaxStreamFormatVersionComponentImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/MaxStreamFormatVersionComponentImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/MaxStreamFormatVersionComponentImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/MaxStreamFormatVersionComponentImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/ORBTypeComponentImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/ORBTypeComponentImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/ORBTypeComponentImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/ORBTypeComponentImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/RequestPartitioningComponentImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/RequestPartitioningComponentImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/RequestPartitioningComponentImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/RequestPartitioningComponentImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/ior/notes b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/notes similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/ior/notes rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/notes diff --git a/corba/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/StubDelegateImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/StubDelegateImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/StubDelegateImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/StubDelegateImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/javax/rmi/PortableRemoteObject.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/javax/rmi/PortableRemoteObject.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/javax/rmi/PortableRemoteObject.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/javax/rmi/PortableRemoteObject.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/legacy/connection/DefaultSocketFactory.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/DefaultSocketFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/legacy/connection/DefaultSocketFactory.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/DefaultSocketFactory.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/legacy/connection/EndPointInfoImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/EndPointInfoImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/legacy/connection/EndPointInfoImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/EndPointInfoImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/legacy/connection/LegacyServerSocketManagerImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/LegacyServerSocketManagerImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/legacy/connection/LegacyServerSocketManagerImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/LegacyServerSocketManagerImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryAcceptorImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryAcceptorImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryAcceptorImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryAcceptorImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryConnectionImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryConnectionImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryConnectionImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryConnectionImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoListImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoListImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoListImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoListImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoListIteratorImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoListIteratorImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoListIteratorImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoListIteratorImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/legacy/connection/USLPort.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/USLPort.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/legacy/connection/USLPort.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/USLPort.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/monitoring/MonitoredAttributeInfoFactoryImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoredAttributeInfoFactoryImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/monitoring/MonitoredAttributeInfoFactoryImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoredAttributeInfoFactoryImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/monitoring/MonitoredAttributeInfoImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoredAttributeInfoImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/monitoring/MonitoredAttributeInfoImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoredAttributeInfoImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/monitoring/MonitoredObjectFactoryImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoredObjectFactoryImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/monitoring/MonitoredObjectFactoryImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoredObjectFactoryImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/monitoring/MonitoredObjectImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoredObjectImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/monitoring/MonitoredObjectImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoredObjectImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/monitoring/MonitoringManagerFactoryImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoringManagerFactoryImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/monitoring/MonitoringManagerFactoryImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoringManagerFactoryImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/monitoring/MonitoringManagerImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoringManagerImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/monitoring/MonitoringManagerImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoringManagerImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/BindingIteratorImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/BindingIteratorImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/BindingIteratorImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/BindingIteratorImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/InterOperableNamingImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/InterOperableNamingImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/InterOperableNamingImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/InterOperableNamingImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/InternalBindingKey.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/InternalBindingKey.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/InternalBindingKey.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/InternalBindingKey.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/InternalBindingValue.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/InternalBindingValue.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/InternalBindingValue.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/InternalBindingValue.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingContextDataStore.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingContextDataStore.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingContextDataStore.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingContextDataStore.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingContextImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingContextImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingContextImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingContextImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingUtils.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingUtils.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingUtils.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingUtils.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientBindingIterator.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientBindingIterator.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientBindingIterator.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientBindingIterator.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNameServer.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNameServer.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNameServer.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNameServer.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNameService.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNameService.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNameService.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNameService.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNamingContext.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNamingContext.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNamingContext.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNamingContext.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/naming/namingutil/CorbalocURL.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/CorbalocURL.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/naming/namingutil/CorbalocURL.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/CorbalocURL.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/naming/namingutil/CorbanameURL.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/CorbanameURL.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/naming/namingutil/CorbanameURL.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/CorbanameURL.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/naming/namingutil/IIOPEndpointInfo.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/IIOPEndpointInfo.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/naming/namingutil/IIOPEndpointInfo.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/IIOPEndpointInfo.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURL.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURL.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURL.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURL.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURLBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURLBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURLBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURLBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURLHandler.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURLHandler.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURLHandler.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURLHandler.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/naming/namingutil/NamingConstants.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/NamingConstants.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/naming/namingutil/NamingConstants.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/NamingConstants.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/naming/namingutil/Utility.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/Utility.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/naming/namingutil/Utility.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/Utility.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/naming/pcosnaming/InternalBindingKey.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/InternalBindingKey.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/naming/pcosnaming/InternalBindingKey.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/InternalBindingKey.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/naming/pcosnaming/InternalBindingValue.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/InternalBindingValue.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/naming/pcosnaming/InternalBindingValue.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/InternalBindingValue.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NameServer.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NameServer.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NameServer.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NameServer.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NameService.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NameService.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NameService.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NameService.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NamingContextImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NamingContextImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NamingContextImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NamingContextImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/naming/pcosnaming/PersistentBindingIterator.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/PersistentBindingIterator.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/naming/pcosnaming/PersistentBindingIterator.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/PersistentBindingIterator.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/naming/pcosnaming/ServantManagerImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/ServantManagerImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/naming/pcosnaming/ServantManagerImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/ServantManagerImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/oa/NullServantImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/NullServantImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/oa/NullServantImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/NullServantImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/AOMEntry.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/AOMEntry.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/oa/poa/AOMEntry.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/AOMEntry.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/ActiveObjectMap.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/ActiveObjectMap.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/oa/poa/ActiveObjectMap.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/ActiveObjectMap.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/BadServerIdHandler.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/BadServerIdHandler.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/oa/poa/BadServerIdHandler.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/BadServerIdHandler.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/DelegateImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/DelegateImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/oa/poa/DelegateImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/DelegateImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/IdAssignmentPolicyImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/IdAssignmentPolicyImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/oa/poa/IdAssignmentPolicyImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/IdAssignmentPolicyImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/IdUniquenessPolicyImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/IdUniquenessPolicyImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/oa/poa/IdUniquenessPolicyImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/IdUniquenessPolicyImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/ImplicitActivationPolicyImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/ImplicitActivationPolicyImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/oa/poa/ImplicitActivationPolicyImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/ImplicitActivationPolicyImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/LifespanPolicyImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/LifespanPolicyImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/oa/poa/LifespanPolicyImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/LifespanPolicyImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POACurrent.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POACurrent.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POACurrent.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POACurrent.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAFactory.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAFactory.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAFactory.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAManagerImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAManagerImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAManagerImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAManagerImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediator.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediator.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediator.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediator.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase_R.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase_R.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase_R.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase_R.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorFactory.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorFactory.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorFactory.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_NR_UDS.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_NR_UDS.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_NR_UDS.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_NR_UDS.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_NR_USM.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_NR_USM.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_NR_USM.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_NR_USM.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_AOM.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_AOM.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_AOM.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_AOM.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_UDS.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_UDS.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_UDS.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_UDS.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_USM.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_USM.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_USM.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_USM.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/Policies.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/Policies.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/oa/poa/Policies.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/Policies.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/RequestProcessingPolicyImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/RequestProcessingPolicyImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/oa/poa/RequestProcessingPolicyImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/RequestProcessingPolicyImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/ServantRetentionPolicyImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/ServantRetentionPolicyImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/oa/poa/ServantRetentionPolicyImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/ServantRetentionPolicyImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/ThreadPolicyImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/ThreadPolicyImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/oa/poa/ThreadPolicyImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/ThreadPolicyImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/minor_code_example.txt b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/minor_code_example.txt similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/oa/poa/minor_code_example.txt rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/minor_code_example.txt diff --git a/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/standard_minor_codes.txt b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/standard_minor_codes.txt similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/oa/poa/standard_minor_codes.txt rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/standard_minor_codes.txt diff --git a/corba/src/share/classes/com/sun/corba/se/impl/oa/toa/TOA.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/toa/TOA.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/oa/toa/TOA.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/toa/TOA.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/oa/toa/TOAFactory.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/toa/TOAFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/oa/toa/TOAFactory.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/toa/TOAFactory.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/oa/toa/TOAImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/toa/TOAImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/oa/toa/TOAImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/toa/TOAImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/oa/toa/TransientObjectManager.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/toa/TransientObjectManager.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/oa/toa/TransientObjectManager.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/toa/TransientObjectManager.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orb/AppletDataCollector.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/AppletDataCollector.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orb/AppletDataCollector.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/AppletDataCollector.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orb/DataCollectorBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/DataCollectorBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orb/DataCollectorBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/DataCollectorBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orb/DataCollectorFactory.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/DataCollectorFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orb/DataCollectorFactory.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/DataCollectorFactory.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orb/NormalDataCollector.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/NormalDataCollector.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orb/NormalDataCollector.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/NormalDataCollector.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orb/NormalParserAction.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/NormalParserAction.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orb/NormalParserAction.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/NormalParserAction.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orb/NormalParserData.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/NormalParserData.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orb/NormalParserData.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/NormalParserData.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBConfiguratorImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBConfiguratorImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orb/ORBConfiguratorImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBConfiguratorImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBDataParserImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBDataParserImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orb/ORBDataParserImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBDataParserImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBVersionImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBVersionImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orb/ORBVersionImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBVersionImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orb/ParserAction.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ParserAction.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orb/ParserAction.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ParserAction.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orb/ParserActionBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ParserActionBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orb/ParserActionBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ParserActionBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orb/ParserActionFactory.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ParserActionFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orb/ParserActionFactory.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ParserActionFactory.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orb/ParserDataBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ParserDataBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orb/ParserDataBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ParserDataBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orb/ParserTable.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ParserTable.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orb/ParserTable.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ParserTable.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orb/PrefixParserAction.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/PrefixParserAction.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orb/PrefixParserAction.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/PrefixParserAction.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orb/PrefixParserData.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/PrefixParserData.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orb/PrefixParserData.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/PrefixParserData.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orb/PropertyOnlyDataCollector.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/PropertyOnlyDataCollector.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orb/PropertyOnlyDataCollector.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/PropertyOnlyDataCollector.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orb/parsing_combinators.txt b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/parsing_combinators.txt similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orb/parsing_combinators.txt rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/parsing_combinators.txt diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/CacheTable.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/CacheTable.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/CacheTable.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/CacheTable.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/DenseIntMapImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/DenseIntMapImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/DenseIntMapImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/DenseIntMapImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/GetPropertyAction.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/GetPropertyAction.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/GetPropertyAction.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/GetPropertyAction.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/HexOutputStream.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/HexOutputStream.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/HexOutputStream.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/HexOutputStream.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/LegacyHookGetFields.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/LegacyHookGetFields.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/LegacyHookGetFields.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/LegacyHookGetFields.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/LegacyHookPutFields.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/LegacyHookPutFields.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/LegacyHookPutFields.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/LegacyHookPutFields.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/LogKeywords.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/LogKeywords.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/LogKeywords.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/LogKeywords.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ORBConstants.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ORBConstants.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/ORBConstants.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ORBConstants.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClassUtil_1_3.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClassUtil_1_3.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClassUtil_1_3.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClassUtil_1_3.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamField.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamField.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamField.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamField.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectUtility.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ObjectUtility.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectUtility.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ObjectUtility.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectWriter.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ObjectWriter.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectWriter.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ObjectWriter.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdFactory.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdFactory.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdFactory.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdInterface.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdInterface.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdInterface.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdInterface.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdStrings.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdStrings.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdStrings.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdStrings.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdUtility.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdUtility.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdUtility.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdUtility.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/StackImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/StackImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/StackImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/StackImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/closure/Constant.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/closure/Constant.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/closure/Constant.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/closure/Constant.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/closure/Future.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/closure/Future.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/closure/Future.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/closure/Future.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/concurrent/CondVar.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/CondVar.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/concurrent/CondVar.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/CondVar.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/concurrent/DebugMutex.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/DebugMutex.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/concurrent/DebugMutex.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/DebugMutex.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Mutex.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Mutex.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Mutex.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Mutex.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/concurrent/ReentrantMutex.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/ReentrantMutex.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/concurrent/ReentrantMutex.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/ReentrantMutex.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Sync.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Sync.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Sync.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Sync.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/concurrent/SyncUtil.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/SyncUtil.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/concurrent/SyncUtil.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/SyncUtil.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/fsm/GuardedAction.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/fsm/GuardedAction.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/fsm/GuardedAction.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/fsm/GuardedAction.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/fsm/NameBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/fsm/NameBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/fsm/NameBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/fsm/NameBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/fsm/StateEngineImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/fsm/StateEngineImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/fsm/StateEngineImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/fsm/StateEngineImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/graph/Graph.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/graph/Graph.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/graph/Graph.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/graph/Graph.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/graph/GraphImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/graph/GraphImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/graph/GraphImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/graph/GraphImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/graph/Node.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/graph/Node.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/graph/Node.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/graph/Node.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/graph/NodeData.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/graph/NodeData.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/graph/NodeData.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/graph/NodeData.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb.properties b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb.properties similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb.properties rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb.properties diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_de.properties b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_de.properties similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_de.properties rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_de.properties diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_es.properties b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_es.properties similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_es.properties rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_es.properties diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_fr.properties b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_fr.properties similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_fr.properties rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_fr.properties diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_it.properties b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_it.properties similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_it.properties rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_it.properties diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_sv.properties b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_sv.properties similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_sv.properties rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_sv.properties diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_CN.properties b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_CN.properties similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_CN.properties rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_CN.properties diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolManagerImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolManagerImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolManagerImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolManagerImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/TimeoutException.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/threadpool/TimeoutException.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/TimeoutException.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/threadpool/TimeoutException.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/WorkQueueImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/threadpool/WorkQueueImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/WorkQueueImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/threadpool/WorkQueueImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/DynamicAccessPermission.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/DynamicAccessPermission.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/DynamicAccessPermission.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/DynamicAccessPermission.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/DynamicMethodMarshallerImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/DynamicMethodMarshallerImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/DynamicMethodMarshallerImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/DynamicMethodMarshallerImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/DynamicStubImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/DynamicStubImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/DynamicStubImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/DynamicStubImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandler.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandler.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandler.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandler.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLType.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLType.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLType.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLType.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLTypeException.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLTypeException.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLTypeException.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLTypeException.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLTypesUtil.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLTypesUtil.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLTypesUtil.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLTypesUtil.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/PresentationManagerImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/PresentationManagerImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/PresentationManagerImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/PresentationManagerImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/ReflectiveTie.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/ReflectiveTie.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/ReflectiveTie.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/ReflectiveTie.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubConnectImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubConnectImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubConnectImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubConnectImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryDynamicBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryDynamicBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryDynamicBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryDynamicBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryDynamicBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryDynamicBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryDynamicBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryDynamicBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryProxyImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryProxyImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryProxyImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryProxyImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryStaticImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryStaticImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryStaticImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryStaticImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryProxyImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryProxyImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryProxyImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryProxyImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryStaticImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryStaticImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryStaticImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryStaticImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubInvocationHandlerImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubInvocationHandlerImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubInvocationHandlerImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubInvocationHandlerImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/jndi.properties b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/jndi.properties similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/jndi.properties rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/jndi.properties diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/AddressingDispositionException.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/AddressingDispositionException.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/AddressingDispositionException.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/AddressingDispositionException.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/BootstrapServerRequestDispatcher.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/BootstrapServerRequestDispatcher.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/BootstrapServerRequestDispatcher.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/BootstrapServerRequestDispatcher.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/CorbaClientDelegateImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/CorbaClientDelegateImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/CorbaClientDelegateImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/CorbaClientDelegateImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/CorbaClientRequestDispatcherImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/CorbaClientRequestDispatcherImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/CorbaClientRequestDispatcherImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/CorbaClientRequestDispatcherImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/CorbaInvocationInfo.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/CorbaInvocationInfo.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/CorbaInvocationInfo.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/CorbaInvocationInfo.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/CorbaMessageMediatorImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/CorbaMessageMediatorImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/CorbaMessageMediatorImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/CorbaMessageMediatorImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/CorbaServerRequestDispatcherImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/CorbaServerRequestDispatcherImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/CorbaServerRequestDispatcherImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/CorbaServerRequestDispatcherImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/FullServantCacheLocalCRDImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/FullServantCacheLocalCRDImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/FullServantCacheLocalCRDImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/FullServantCacheLocalCRDImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/INSServerRequestDispatcher.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/INSServerRequestDispatcher.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/INSServerRequestDispatcher.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/INSServerRequestDispatcher.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/InfoOnlyServantCacheLocalCRDImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/InfoOnlyServantCacheLocalCRDImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/InfoOnlyServantCacheLocalCRDImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/InfoOnlyServantCacheLocalCRDImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/JIDLLocalCRDImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/JIDLLocalCRDImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/JIDLLocalCRDImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/JIDLLocalCRDImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/LocalClientRequestDispatcherBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/LocalClientRequestDispatcherBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/LocalClientRequestDispatcherBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/LocalClientRequestDispatcherBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/MinimalServantCacheLocalCRDImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/MinimalServantCacheLocalCRDImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/MinimalServantCacheLocalCRDImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/MinimalServantCacheLocalCRDImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/NotLocalLocalCRDImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/NotLocalLocalCRDImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/NotLocalLocalCRDImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/NotLocalLocalCRDImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/POALocalCRDImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/POALocalCRDImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/POALocalCRDImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/POALocalCRDImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/RequestCanceledException.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/RequestCanceledException.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/RequestCanceledException.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/RequestCanceledException.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/RequestDispatcherRegistryImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/RequestDispatcherRegistryImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/RequestDispatcherRegistryImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/RequestDispatcherRegistryImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/ServantCacheLocalCRDBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/ServantCacheLocalCRDBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/ServantCacheLocalCRDBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/ServantCacheLocalCRDBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/SharedCDRClientRequestDispatcherImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/SharedCDRClientRequestDispatcherImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/SharedCDRClientRequestDispatcherImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/SharedCDRClientRequestDispatcherImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/SpecialMethod.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/SpecialMethod.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/SpecialMethod.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/SpecialMethod.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/AddressingDispositionHelper.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/AddressingDispositionHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/AddressingDispositionHelper.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/AddressingDispositionHelper.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage_1_0.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage_1_0.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage_1_0.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage_1_0.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage_1_1.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage_1_1.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage_1_1.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage_1_1.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage_1_2.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage_1_2.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage_1_2.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage_1_2.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/FragmentMessage.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/FragmentMessage.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/FragmentMessage.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/FragmentMessage.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/FragmentMessage_1_1.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/FragmentMessage_1_1.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/FragmentMessage_1_1.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/FragmentMessage_1_1.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/FragmentMessage_1_2.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/FragmentMessage_1_2.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/FragmentMessage_1_2.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/FragmentMessage_1_2.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/IORAddressingInfo.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/IORAddressingInfo.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/IORAddressingInfo.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/IORAddressingInfo.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/IORAddressingInfoHelper.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/IORAddressingInfoHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/IORAddressingInfoHelper.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/IORAddressingInfoHelper.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/KeyAddr.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/KeyAddr.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/KeyAddr.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/KeyAddr.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_0.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_0.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_0.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_0.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_1.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_1.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_1.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_1.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_2.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_2.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_2.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_2.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyOrReplyMessage.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyOrReplyMessage.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyOrReplyMessage.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyOrReplyMessage.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_0.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_0.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_0.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_0.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_1.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_1.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_1.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_1.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_2.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_2.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_2.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_2.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/MessageBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/MessageBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/MessageBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/MessageBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/MessageHandler.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/MessageHandler.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/MessageHandler.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/MessageHandler.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message_1_0.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message_1_0.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message_1_0.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message_1_0.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message_1_1.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message_1_1.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message_1_1.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message_1_1.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message_1_2.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message_1_2.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message_1_2.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message_1_2.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ProfileAddr.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ProfileAddr.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ProfileAddr.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ProfileAddr.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReferenceAddr.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReferenceAddr.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReferenceAddr.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReferenceAddr.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_0.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_0.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_0.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_0.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_1.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_1.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_1.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_1.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_2.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_2.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_2.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_2.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_0.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_0.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_0.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_0.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_1.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_1.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_1.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_1.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_2.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_2.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_2.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_2.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddress.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddress.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddress.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddress.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddressHelper.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddressHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddressHelper.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddressHelper.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/resolver/BootstrapResolverImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/BootstrapResolverImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/resolver/BootstrapResolverImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/BootstrapResolverImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/resolver/CompositeResolverImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/CompositeResolverImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/resolver/CompositeResolverImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/CompositeResolverImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/resolver/FileResolverImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/FileResolverImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/resolver/FileResolverImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/FileResolverImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/resolver/INSURLOperationImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/INSURLOperationImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/resolver/INSURLOperationImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/INSURLOperationImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/resolver/LocalResolverImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/LocalResolverImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/resolver/LocalResolverImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/LocalResolverImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/resolver/ORBDefaultInitRefResolverImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/ORBDefaultInitRefResolverImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/resolver/ORBDefaultInitRefResolverImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/ORBDefaultInitRefResolverImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/resolver/ORBInitRefResolverImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/ORBInitRefResolverImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/resolver/ORBInitRefResolverImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/ORBInitRefResolverImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/resolver/SplitLocalResolverImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/SplitLocalResolverImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/resolver/SplitLocalResolverImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/SplitLocalResolverImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/transport/ByteBufferPoolImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/ByteBufferPoolImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/transport/ByteBufferPoolImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/ByteBufferPoolImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/transport/CorbaConnectionCacheBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaConnectionCacheBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/transport/CorbaConnectionCacheBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaConnectionCacheBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/transport/CorbaContactInfoBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaContactInfoBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/transport/CorbaContactInfoBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaContactInfoBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/transport/CorbaContactInfoListImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaContactInfoListImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/transport/CorbaContactInfoListImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaContactInfoListImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/transport/CorbaContactInfoListIteratorImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaContactInfoListIteratorImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/transport/CorbaContactInfoListIteratorImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaContactInfoListIteratorImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/transport/CorbaInboundConnectionCacheImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaInboundConnectionCacheImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/transport/CorbaInboundConnectionCacheImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaInboundConnectionCacheImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/transport/CorbaOutboundConnectionCacheImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaOutboundConnectionCacheImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/transport/CorbaOutboundConnectionCacheImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaOutboundConnectionCacheImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/transport/CorbaResponseWaitingRoomImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaResponseWaitingRoomImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/transport/CorbaResponseWaitingRoomImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaResponseWaitingRoomImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/transport/CorbaTransportManagerImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaTransportManagerImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/transport/CorbaTransportManagerImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaTransportManagerImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/transport/DefaultIORToSocketInfoImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/DefaultIORToSocketInfoImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/transport/DefaultIORToSocketInfoImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/DefaultIORToSocketInfoImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/transport/DefaultSocketFactoryImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/DefaultSocketFactoryImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/transport/DefaultSocketFactoryImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/DefaultSocketFactoryImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/transport/EventHandlerBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/EventHandlerBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/transport/EventHandlerBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/EventHandlerBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/transport/ListenerThreadImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/ListenerThreadImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/transport/ListenerThreadImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/ListenerThreadImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/transport/ReadTCPTimeoutsImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/ReadTCPTimeoutsImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/transport/ReadTCPTimeoutsImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/ReadTCPTimeoutsImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/transport/ReaderThreadImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/ReaderThreadImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/transport/ReaderThreadImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/ReaderThreadImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/transport/SharedCDRContactInfoImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/SharedCDRContactInfoImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/transport/SharedCDRContactInfoImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/SharedCDRContactInfoImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelAcceptorImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelAcceptorImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelAcceptorImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelAcceptorImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelConnectionImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelConnectionImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelConnectionImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelConnectionImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelContactInfoImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelContactInfoImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelContactInfoImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelContactInfoImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/util/IdentityHashtable.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/IdentityHashtable.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/util/IdentityHashtable.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/IdentityHashtable.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/util/IdentityHashtableEntry.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/IdentityHashtableEntry.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/util/IdentityHashtableEntry.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/IdentityHashtableEntry.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/util/IdentityHashtableEnumerator.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/IdentityHashtableEnumerator.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/util/IdentityHashtableEnumerator.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/IdentityHashtableEnumerator.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/util/JDKBridge.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/JDKBridge.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/util/JDKBridge.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/JDKBridge.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/util/JDKClassLoader.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/JDKClassLoader.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/util/JDKClassLoader.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/JDKClassLoader.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/util/ORBProperties.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/ORBProperties.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/util/ORBProperties.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/ORBProperties.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/util/PackagePrefixChecker.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/PackagePrefixChecker.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/util/PackagePrefixChecker.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/PackagePrefixChecker.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/util/RepositoryId.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/RepositoryId.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/util/RepositoryId.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/RepositoryId.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/util/RepositoryIdCache.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/RepositoryIdCache.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/util/RepositoryIdCache.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/RepositoryIdCache.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/util/SUNVMCID.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/SUNVMCID.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/util/SUNVMCID.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/SUNVMCID.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/util/Utility.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/Utility.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/util/Utility.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/Utility.java diff --git a/corba/src/share/classes/com/sun/corba/se/impl/util/Version.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/Version.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/impl/util/Version.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/Version.java diff --git a/corba/src/share/classes/com/sun/corba/se/internal/CosNaming/BootstrapServer.java b/corba/src/java.corba/share/classes/com/sun/corba/se/internal/CosNaming/BootstrapServer.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/internal/CosNaming/BootstrapServer.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/internal/CosNaming/BootstrapServer.java diff --git a/corba/src/share/classes/com/sun/corba/se/internal/Interceptors/PIORB.java b/corba/src/java.corba/share/classes/com/sun/corba/se/internal/Interceptors/PIORB.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/internal/Interceptors/PIORB.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/internal/Interceptors/PIORB.java diff --git a/corba/src/share/classes/com/sun/corba/se/internal/POA/POAORB.java b/corba/src/java.corba/share/classes/com/sun/corba/se/internal/POA/POAORB.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/internal/POA/POAORB.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/internal/POA/POAORB.java diff --git a/corba/src/share/classes/com/sun/corba/se/internal/corba/ORBSingleton.java b/corba/src/java.corba/share/classes/com/sun/corba/se/internal/corba/ORBSingleton.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/internal/corba/ORBSingleton.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/internal/corba/ORBSingleton.java diff --git a/corba/src/share/classes/com/sun/corba/se/internal/iiop/ORB.java b/corba/src/java.corba/share/classes/com/sun/corba/se/internal/iiop/ORB.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/internal/iiop/ORB.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/internal/iiop/ORB.java diff --git a/corba/src/share/classes/com/sun/corba/se/org/omg/CORBA/ORB.java b/corba/src/java.corba/share/classes/com/sun/corba/se/org/omg/CORBA/ORB.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/org/omg/CORBA/ORB.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/org/omg/CORBA/ORB.java diff --git a/corba/src/share/classes/com/sun/corba/se/pept/broker/Broker.java b/corba/src/java.corba/share/classes/com/sun/corba/se/pept/broker/Broker.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/pept/broker/Broker.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/pept/broker/Broker.java diff --git a/corba/src/share/classes/com/sun/corba/se/pept/encoding/InputObject.java b/corba/src/java.corba/share/classes/com/sun/corba/se/pept/encoding/InputObject.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/pept/encoding/InputObject.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/pept/encoding/InputObject.java diff --git a/corba/src/share/classes/com/sun/corba/se/pept/encoding/OutputObject.java b/corba/src/java.corba/share/classes/com/sun/corba/se/pept/encoding/OutputObject.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/pept/encoding/OutputObject.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/pept/encoding/OutputObject.java diff --git a/corba/src/share/classes/com/sun/corba/se/pept/package.html b/corba/src/java.corba/share/classes/com/sun/corba/se/pept/package.html similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/pept/package.html rename to corba/src/java.corba/share/classes/com/sun/corba/se/pept/package.html diff --git a/corba/src/share/classes/com/sun/corba/se/pept/protocol/ClientDelegate.java b/corba/src/java.corba/share/classes/com/sun/corba/se/pept/protocol/ClientDelegate.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/pept/protocol/ClientDelegate.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/pept/protocol/ClientDelegate.java diff --git a/corba/src/share/classes/com/sun/corba/se/pept/protocol/ClientInvocationInfo.java b/corba/src/java.corba/share/classes/com/sun/corba/se/pept/protocol/ClientInvocationInfo.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/pept/protocol/ClientInvocationInfo.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/pept/protocol/ClientInvocationInfo.java diff --git a/corba/src/share/classes/com/sun/corba/se/pept/protocol/ClientRequestDispatcher.java b/corba/src/java.corba/share/classes/com/sun/corba/se/pept/protocol/ClientRequestDispatcher.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/pept/protocol/ClientRequestDispatcher.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/pept/protocol/ClientRequestDispatcher.java diff --git a/corba/src/share/classes/com/sun/corba/se/pept/protocol/MessageMediator.java b/corba/src/java.corba/share/classes/com/sun/corba/se/pept/protocol/MessageMediator.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/pept/protocol/MessageMediator.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/pept/protocol/MessageMediator.java diff --git a/corba/src/share/classes/com/sun/corba/se/pept/protocol/ProtocolHandler.java b/corba/src/java.corba/share/classes/com/sun/corba/se/pept/protocol/ProtocolHandler.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/pept/protocol/ProtocolHandler.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/pept/protocol/ProtocolHandler.java diff --git a/corba/src/share/classes/com/sun/corba/se/pept/protocol/ServerRequestDispatcher.java b/corba/src/java.corba/share/classes/com/sun/corba/se/pept/protocol/ServerRequestDispatcher.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/pept/protocol/ServerRequestDispatcher.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/pept/protocol/ServerRequestDispatcher.java diff --git a/corba/src/share/classes/com/sun/corba/se/pept/transport/Acceptor.java b/corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/Acceptor.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/pept/transport/Acceptor.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/Acceptor.java diff --git a/corba/src/share/classes/com/sun/corba/se/pept/transport/ByteBufferPool.java b/corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ByteBufferPool.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/pept/transport/ByteBufferPool.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ByteBufferPool.java diff --git a/corba/src/share/classes/com/sun/corba/se/pept/transport/Connection.java b/corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/Connection.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/pept/transport/Connection.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/Connection.java diff --git a/corba/src/share/classes/com/sun/corba/se/pept/transport/ConnectionCache.java b/corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ConnectionCache.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/pept/transport/ConnectionCache.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ConnectionCache.java diff --git a/corba/src/share/classes/com/sun/corba/se/pept/transport/ContactInfo.java b/corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ContactInfo.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/pept/transport/ContactInfo.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ContactInfo.java diff --git a/corba/src/share/classes/com/sun/corba/se/pept/transport/ContactInfoList.java b/corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ContactInfoList.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/pept/transport/ContactInfoList.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ContactInfoList.java diff --git a/corba/src/share/classes/com/sun/corba/se/pept/transport/ContactInfoListIterator.java b/corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ContactInfoListIterator.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/pept/transport/ContactInfoListIterator.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ContactInfoListIterator.java diff --git a/corba/src/share/classes/com/sun/corba/se/pept/transport/EventHandler.java b/corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/EventHandler.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/pept/transport/EventHandler.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/EventHandler.java diff --git a/corba/src/share/classes/com/sun/corba/se/pept/transport/InboundConnectionCache.java b/corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/InboundConnectionCache.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/pept/transport/InboundConnectionCache.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/InboundConnectionCache.java diff --git a/corba/src/share/classes/com/sun/corba/se/pept/transport/ListenerThread.java b/corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ListenerThread.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/pept/transport/ListenerThread.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ListenerThread.java diff --git a/corba/src/share/classes/com/sun/corba/se/pept/transport/OutboundConnectionCache.java b/corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/OutboundConnectionCache.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/pept/transport/OutboundConnectionCache.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/OutboundConnectionCache.java diff --git a/corba/src/share/classes/com/sun/corba/se/pept/transport/ReaderThread.java b/corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ReaderThread.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/pept/transport/ReaderThread.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ReaderThread.java diff --git a/corba/src/share/classes/com/sun/corba/se/pept/transport/ResponseWaitingRoom.java b/corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ResponseWaitingRoom.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/pept/transport/ResponseWaitingRoom.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ResponseWaitingRoom.java diff --git a/corba/src/share/classes/com/sun/corba/se/pept/transport/Selector.java b/corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/Selector.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/pept/transport/Selector.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/Selector.java diff --git a/corba/src/share/classes/com/sun/corba/se/pept/transport/TransportManager.java b/corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/TransportManager.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/pept/transport/TransportManager.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/TransportManager.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/activation/activation.idl b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/activation/activation.idl similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/activation/activation.idl rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/activation/activation.idl diff --git a/corba/src/share/classes/com/sun/corba/se/spi/copyobject/CopierManager.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/copyobject/CopierManager.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/copyobject/CopierManager.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/copyobject/CopierManager.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/copyobject/CopyobjectDefaults.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/copyobject/CopyobjectDefaults.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/copyobject/CopyobjectDefaults.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/copyobject/CopyobjectDefaults.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/copyobject/ObjectCopier.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/copyobject/ObjectCopier.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/copyobject/ObjectCopier.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/copyobject/ObjectCopier.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/copyobject/ObjectCopierFactory.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/copyobject/ObjectCopierFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/copyobject/ObjectCopierFactory.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/copyobject/ObjectCopierFactory.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/copyobject/ReflectiveCopyException.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/copyobject/ReflectiveCopyException.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/copyobject/ReflectiveCopyException.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/copyobject/ReflectiveCopyException.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/encoding/CorbaInputObject.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/encoding/CorbaInputObject.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/encoding/CorbaInputObject.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/encoding/CorbaInputObject.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/encoding/CorbaOutputObject.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/encoding/CorbaOutputObject.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/encoding/CorbaOutputObject.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/encoding/CorbaOutputObject.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/extension/CopyObjectPolicy.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/extension/CopyObjectPolicy.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/extension/CopyObjectPolicy.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/extension/CopyObjectPolicy.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/extension/RequestPartitioningPolicy.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/extension/RequestPartitioningPolicy.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/extension/RequestPartitioningPolicy.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/extension/RequestPartitioningPolicy.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/extension/ServantCachingPolicy.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/extension/ServantCachingPolicy.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/extension/ServantCachingPolicy.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/extension/ServantCachingPolicy.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/extension/ZeroPortPolicy.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/extension/ZeroPortPolicy.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/extension/ZeroPortPolicy.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/extension/ZeroPortPolicy.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/EncapsulationFactoryBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/EncapsulationFactoryBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/EncapsulationFactoryBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/EncapsulationFactoryBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/IOR.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IOR.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/IOR.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IOR.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/IORFactories.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IORFactories.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/IORFactories.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IORFactories.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/IORFactory.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IORFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/IORFactory.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IORFactory.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/IORTemplate.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IORTemplate.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/IORTemplate.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IORTemplate.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/IORTemplateList.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IORTemplateList.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/IORTemplateList.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IORTemplateList.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/Identifiable.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/Identifiable.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/Identifiable.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/Identifiable.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/IdentifiableBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IdentifiableBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/IdentifiableBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IdentifiableBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/IdentifiableContainerBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IdentifiableContainerBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/IdentifiableContainerBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IdentifiableContainerBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/IdentifiableFactory.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IdentifiableFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/IdentifiableFactory.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IdentifiableFactory.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/IdentifiableFactoryFinder.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IdentifiableFactoryFinder.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/IdentifiableFactoryFinder.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IdentifiableFactoryFinder.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/MakeImmutable.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/MakeImmutable.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/MakeImmutable.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/MakeImmutable.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/ObjectAdapterId.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/ObjectAdapterId.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/ObjectAdapterId.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/ObjectAdapterId.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/ObjectId.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/ObjectId.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/ObjectId.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/ObjectId.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/ObjectKey.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/ObjectKey.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/ObjectKey.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/ObjectKey.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/ObjectKeyFactory.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/ObjectKeyFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/ObjectKeyFactory.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/ObjectKeyFactory.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/ObjectKeyTemplate.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/ObjectKeyTemplate.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/ObjectKeyTemplate.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/ObjectKeyTemplate.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/TaggedComponent.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedComponent.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/TaggedComponent.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedComponent.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/TaggedComponentBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedComponentBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/TaggedComponentBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedComponentBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/TaggedComponentFactoryFinder.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedComponentFactoryFinder.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/TaggedComponentFactoryFinder.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedComponentFactoryFinder.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/TaggedProfile.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedProfile.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/TaggedProfile.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedProfile.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/TaggedProfileTemplate.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedProfileTemplate.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/TaggedProfileTemplate.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedProfileTemplate.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/TaggedProfileTemplateBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedProfileTemplateBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/TaggedProfileTemplateBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedProfileTemplateBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/WriteContents.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/WriteContents.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/WriteContents.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/WriteContents.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/Writeable.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/Writeable.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/Writeable.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/Writeable.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/iiop/AlternateIIOPAddressComponent.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/AlternateIIOPAddressComponent.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/iiop/AlternateIIOPAddressComponent.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/AlternateIIOPAddressComponent.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/iiop/CodeSetsComponent.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/CodeSetsComponent.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/iiop/CodeSetsComponent.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/CodeSetsComponent.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/iiop/GIOPVersion.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/GIOPVersion.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/iiop/GIOPVersion.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/GIOPVersion.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPAddress.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPAddress.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPAddress.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPAddress.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPFactories.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPFactories.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPFactories.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPFactories.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPProfile.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPProfile.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPProfile.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPProfile.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPProfileTemplate.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPProfileTemplate.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPProfileTemplate.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPProfileTemplate.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/iiop/JavaCodebaseComponent.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/JavaCodebaseComponent.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/iiop/JavaCodebaseComponent.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/JavaCodebaseComponent.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/iiop/MaxStreamFormatVersionComponent.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/MaxStreamFormatVersionComponent.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/iiop/MaxStreamFormatVersionComponent.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/MaxStreamFormatVersionComponent.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/iiop/ORBTypeComponent.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/ORBTypeComponent.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/iiop/ORBTypeComponent.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/ORBTypeComponent.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/iiop/RequestPartitioningComponent.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/RequestPartitioningComponent.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/iiop/RequestPartitioningComponent.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/RequestPartitioningComponent.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/iornotes b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iornotes similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/iornotes rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iornotes diff --git a/corba/src/share/classes/com/sun/corba/se/spi/ior/package.html b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/package.html similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/ior/package.html rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/package.html diff --git a/corba/src/share/classes/com/sun/corba/se/spi/legacy/connection/Connection.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/Connection.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/legacy/connection/Connection.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/Connection.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/legacy/connection/GetEndPointInfoAgainException.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/GetEndPointInfoAgainException.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/legacy/connection/GetEndPointInfoAgainException.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/GetEndPointInfoAgainException.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/legacy/connection/LegacyServerSocketEndPointInfo.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/LegacyServerSocketEndPointInfo.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/legacy/connection/LegacyServerSocketEndPointInfo.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/LegacyServerSocketEndPointInfo.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/legacy/connection/LegacyServerSocketManager.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/LegacyServerSocketManager.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/legacy/connection/LegacyServerSocketManager.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/LegacyServerSocketManager.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/legacy/connection/ORBSocketFactory.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/ORBSocketFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/legacy/connection/ORBSocketFactory.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/ORBSocketFactory.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/legacy/connection/README.txt b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/README.txt similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/legacy/connection/README.txt rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/README.txt diff --git a/corba/src/share/classes/com/sun/corba/se/spi/legacy/interceptor/IORInfoExt.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/interceptor/IORInfoExt.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/legacy/interceptor/IORInfoExt.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/interceptor/IORInfoExt.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/legacy/interceptor/ORBInitInfoExt.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/interceptor/ORBInitInfoExt.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/legacy/interceptor/ORBInitInfoExt.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/interceptor/ORBInitInfoExt.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/legacy/interceptor/RequestInfoExt.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/interceptor/RequestInfoExt.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/legacy/interceptor/RequestInfoExt.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/interceptor/RequestInfoExt.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/legacy/interceptor/UnknownType.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/interceptor/UnknownType.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/legacy/interceptor/UnknownType.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/interceptor/UnknownType.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/logging/CORBALogDomains.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/CORBALogDomains.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/logging/CORBALogDomains.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/CORBALogDomains.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/logging/LogWrapperBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/LogWrapperBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/logging/LogWrapperBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/LogWrapperBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/logging/LogWrapperFactory.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/LogWrapperFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/logging/LogWrapperFactory.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/LogWrapperFactory.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/logging/data/Activation.mc b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/Activation.mc similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/logging/data/Activation.mc rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/Activation.mc diff --git a/corba/src/share/classes/com/sun/corba/se/spi/logging/data/IOR.mc b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/IOR.mc similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/logging/data/IOR.mc rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/IOR.mc diff --git a/corba/src/share/classes/com/sun/corba/se/spi/logging/data/Interceptors.mc b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/Interceptors.mc similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/logging/data/Interceptors.mc rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/Interceptors.mc diff --git a/corba/src/share/classes/com/sun/corba/se/spi/logging/data/Naming.mc b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/Naming.mc similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/logging/data/Naming.mc rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/Naming.mc diff --git a/corba/src/share/classes/com/sun/corba/se/spi/logging/data/OMG.mc b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/OMG.mc similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/logging/data/OMG.mc rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/OMG.mc diff --git a/corba/src/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc diff --git a/corba/src/share/classes/com/sun/corba/se/spi/logging/data/POA.mc b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/POA.mc similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/logging/data/POA.mc rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/POA.mc diff --git a/corba/src/share/classes/com/sun/corba/se/spi/logging/data/Util.mc b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/Util.mc similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/logging/data/Util.mc rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/Util.mc diff --git a/corba/src/share/classes/com/sun/corba/se/spi/monitoring/LongMonitoredAttributeBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/LongMonitoredAttributeBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/monitoring/LongMonitoredAttributeBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/LongMonitoredAttributeBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttribute.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttribute.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttribute.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttribute.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfo.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfo.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfo.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfo.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfoFactory.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfoFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfoFactory.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfoFactory.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/monitoring/MonitoredObject.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredObject.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/monitoring/MonitoredObject.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredObject.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/monitoring/MonitoredObjectFactory.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredObjectFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/monitoring/MonitoredObjectFactory.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredObjectFactory.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/monitoring/MonitoringConstants.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringConstants.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/monitoring/MonitoringConstants.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringConstants.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/monitoring/MonitoringFactories.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringFactories.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/monitoring/MonitoringFactories.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringFactories.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/monitoring/MonitoringManager.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringManager.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/monitoring/MonitoringManager.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringManager.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/monitoring/MonitoringManagerFactory.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringManagerFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/monitoring/MonitoringManagerFactory.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringManagerFactory.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/monitoring/StatisticMonitoredAttribute.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StatisticMonitoredAttribute.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/monitoring/StatisticMonitoredAttribute.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StatisticMonitoredAttribute.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/monitoring/StatisticsAccumulator.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StatisticsAccumulator.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/monitoring/StatisticsAccumulator.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StatisticsAccumulator.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/monitoring/StringMonitoredAttributeBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StringMonitoredAttributeBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/monitoring/StringMonitoredAttributeBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StringMonitoredAttributeBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/monitoring/package.html b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/package.html similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/monitoring/package.html rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/package.html diff --git a/corba/src/share/classes/com/sun/corba/se/spi/oa/NullServant.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/oa/NullServant.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/oa/NullServant.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/oa/NullServant.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/oa/OADefault.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/oa/OADefault.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/oa/OADefault.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/oa/OADefault.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/oa/OADestroyed.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/oa/OADestroyed.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/oa/OADestroyed.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/oa/OADestroyed.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/oa/OAInvocationInfo.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/oa/OAInvocationInfo.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/oa/OAInvocationInfo.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/oa/OAInvocationInfo.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/oa/ObjectAdapter.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/oa/ObjectAdapter.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/oa/ObjectAdapter.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/oa/ObjectAdapter.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/oa/ObjectAdapterBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/oa/ObjectAdapterBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/oa/ObjectAdapterBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/oa/ObjectAdapterBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/oa/ObjectAdapterFactory.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/oa/ObjectAdapterFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/oa/ObjectAdapterFactory.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/oa/ObjectAdapterFactory.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orb/DataCollector.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/DataCollector.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orb/DataCollector.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/DataCollector.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orb/ORB.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ORB.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orb/ORB.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ORB.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orb/ORBConfigurator.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ORBConfigurator.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orb/ORBConfigurator.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ORBConfigurator.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orb/ORBData.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ORBData.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orb/ORBData.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ORBData.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orb/ORBVersion.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ORBVersion.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orb/ORBVersion.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ORBVersion.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orb/ORBVersionFactory.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ORBVersionFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orb/ORBVersionFactory.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ORBVersionFactory.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orb/Operation.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/Operation.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orb/Operation.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/Operation.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orb/OperationFactory.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/OperationFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orb/OperationFactory.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/OperationFactory.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orb/ParserData.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ParserData.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orb/ParserData.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ParserData.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orb/ParserDataFactory.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ParserDataFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orb/ParserDataFactory.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ParserDataFactory.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orb/ParserImplBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ParserImplBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orb/ParserImplBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ParserImplBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orb/ParserImplTableBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ParserImplTableBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orb/ParserImplTableBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ParserImplTableBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orb/PropertyParser.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/PropertyParser.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orb/PropertyParser.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/PropertyParser.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orb/StringPair.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/StringPair.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orb/StringPair.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/StringPair.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orbutil/closure/Closure.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/closure/Closure.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orbutil/closure/Closure.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/closure/Closure.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orbutil/closure/ClosureFactory.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/closure/ClosureFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orbutil/closure/ClosureFactory.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/closure/ClosureFactory.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/Action.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/Action.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/Action.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/Action.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/ActionBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/ActionBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/ActionBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/ActionBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/FSM.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/FSM.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/FSM.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/FSM.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/FSMImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/FSMImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/FSMImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/FSMImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/FSMTest.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/FSMTest.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/FSMTest.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/FSMTest.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/Guard.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/Guard.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/Guard.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/Guard.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/GuardBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/GuardBase.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/GuardBase.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/GuardBase.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/Input.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/Input.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/Input.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/Input.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/InputImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/InputImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/InputImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/InputImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/State.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/State.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/State.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/State.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/StateEngine.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/StateEngine.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/StateEngine.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/StateEngine.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/StateEngineFactory.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/StateEngineFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/StateEngineFactory.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/StateEngineFactory.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/StateImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/StateImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/StateImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/StateImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandler.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandler.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandler.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandler.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/DelegateInvocationHandlerImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/proxy/DelegateInvocationHandlerImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/DelegateInvocationHandlerImpl.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/proxy/DelegateInvocationHandlerImpl.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/InvocationHandlerFactory.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/proxy/InvocationHandlerFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/InvocationHandlerFactory.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/proxy/InvocationHandlerFactory.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/LinkedInvocationHandler.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/proxy/LinkedInvocationHandler.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/LinkedInvocationHandler.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/proxy/LinkedInvocationHandler.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orbutil/threadpool/NoSuchThreadPoolException.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/NoSuchThreadPoolException.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orbutil/threadpool/NoSuchThreadPoolException.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/NoSuchThreadPoolException.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orbutil/threadpool/NoSuchWorkQueueException.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/NoSuchWorkQueueException.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orbutil/threadpool/NoSuchWorkQueueException.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/NoSuchWorkQueueException.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orbutil/threadpool/ThreadPool.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/ThreadPool.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orbutil/threadpool/ThreadPool.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/ThreadPool.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orbutil/threadpool/ThreadPoolChooser.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/ThreadPoolChooser.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orbutil/threadpool/ThreadPoolChooser.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/ThreadPoolChooser.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orbutil/threadpool/ThreadPoolManager.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/ThreadPoolManager.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orbutil/threadpool/ThreadPoolManager.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/ThreadPoolManager.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orbutil/threadpool/Work.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/Work.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orbutil/threadpool/Work.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/Work.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orbutil/threadpool/WorkQueue.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/WorkQueue.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/orbutil/threadpool/WorkQueue.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/WorkQueue.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/presentation/rmi/DynamicMethodMarshaller.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/DynamicMethodMarshaller.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/presentation/rmi/DynamicMethodMarshaller.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/DynamicMethodMarshaller.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/presentation/rmi/DynamicStub.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/DynamicStub.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/presentation/rmi/DynamicStub.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/DynamicStub.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/presentation/rmi/IDLNameTranslator.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/IDLNameTranslator.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/presentation/rmi/IDLNameTranslator.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/IDLNameTranslator.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/presentation/rmi/PresentationManager.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/PresentationManager.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/presentation/rmi/PresentationManager.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/PresentationManager.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/presentation/rmi/StubAdapter.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/StubAdapter.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/presentation/rmi/StubAdapter.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/StubAdapter.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/presentation/rmi/StubWrapper.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/StubWrapper.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/presentation/rmi/StubWrapper.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/StubWrapper.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/protocol/ClientDelegateFactory.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/ClientDelegateFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/protocol/ClientDelegateFactory.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/ClientDelegateFactory.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/protocol/CorbaClientDelegate.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/CorbaClientDelegate.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/protocol/CorbaClientDelegate.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/CorbaClientDelegate.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/protocol/CorbaMessageMediator.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/CorbaMessageMediator.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/protocol/CorbaMessageMediator.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/CorbaMessageMediator.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/protocol/CorbaProtocolHandler.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/CorbaProtocolHandler.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/protocol/CorbaProtocolHandler.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/CorbaProtocolHandler.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/protocol/CorbaServerRequestDispatcher.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/CorbaServerRequestDispatcher.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/protocol/CorbaServerRequestDispatcher.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/CorbaServerRequestDispatcher.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/protocol/ForwardException.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/ForwardException.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/protocol/ForwardException.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/ForwardException.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/protocol/InitialServerRequestDispatcher.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/InitialServerRequestDispatcher.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/protocol/InitialServerRequestDispatcher.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/InitialServerRequestDispatcher.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/protocol/LocalClientRequestDispatcher.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/LocalClientRequestDispatcher.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/protocol/LocalClientRequestDispatcher.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/LocalClientRequestDispatcher.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/protocol/LocalClientRequestDispatcherFactory.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/LocalClientRequestDispatcherFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/protocol/LocalClientRequestDispatcherFactory.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/LocalClientRequestDispatcherFactory.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/protocol/PIHandler.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/PIHandler.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/protocol/PIHandler.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/PIHandler.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/protocol/RequestDispatcherDefault.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/RequestDispatcherDefault.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/protocol/RequestDispatcherDefault.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/RequestDispatcherDefault.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/protocol/RequestDispatcherRegistry.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/RequestDispatcherRegistry.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/protocol/RequestDispatcherRegistry.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/RequestDispatcherRegistry.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/protocol/RetryType.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/RetryType.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/protocol/RetryType.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/RetryType.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/resolver/LocalResolver.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/resolver/LocalResolver.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/resolver/LocalResolver.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/resolver/LocalResolver.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/resolver/Resolver.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/resolver/Resolver.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/resolver/Resolver.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/resolver/Resolver.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/resolver/ResolverDefault.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/resolver/ResolverDefault.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/resolver/ResolverDefault.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/resolver/ResolverDefault.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/servicecontext/CodeSetServiceContext.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/CodeSetServiceContext.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/servicecontext/CodeSetServiceContext.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/CodeSetServiceContext.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/servicecontext/MaxStreamFormatVersionServiceContext.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/MaxStreamFormatVersionServiceContext.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/servicecontext/MaxStreamFormatVersionServiceContext.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/MaxStreamFormatVersionServiceContext.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/servicecontext/ORBVersionServiceContext.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ORBVersionServiceContext.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/servicecontext/ORBVersionServiceContext.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ORBVersionServiceContext.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/servicecontext/SendingContextServiceContext.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/SendingContextServiceContext.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/servicecontext/SendingContextServiceContext.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/SendingContextServiceContext.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContext.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContext.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContext.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContext.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContextData.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContextData.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContextData.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContextData.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContextRegistry.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContextRegistry.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContextRegistry.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContextRegistry.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContexts.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContexts.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContexts.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContexts.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/servicecontext/UEInfoServiceContext.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/UEInfoServiceContext.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/servicecontext/UEInfoServiceContext.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/UEInfoServiceContext.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/servicecontext/UnknownServiceContext.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/UnknownServiceContext.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/servicecontext/UnknownServiceContext.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/UnknownServiceContext.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/transport/CorbaAcceptor.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaAcceptor.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/transport/CorbaAcceptor.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaAcceptor.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/transport/CorbaConnection.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaConnection.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/transport/CorbaConnection.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaConnection.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/transport/CorbaConnectionCache.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaConnectionCache.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/transport/CorbaConnectionCache.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaConnectionCache.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfo.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfo.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfo.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfo.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfoList.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfoList.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfoList.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfoList.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfoListFactory.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfoListFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfoListFactory.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfoListFactory.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfoListIterator.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfoListIterator.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfoListIterator.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfoListIterator.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/transport/CorbaResponseWaitingRoom.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaResponseWaitingRoom.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/transport/CorbaResponseWaitingRoom.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaResponseWaitingRoom.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/transport/CorbaTransportManager.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaTransportManager.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/transport/CorbaTransportManager.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaTransportManager.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/transport/IIOPPrimaryToContactInfo.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/IIOPPrimaryToContactInfo.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/transport/IIOPPrimaryToContactInfo.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/IIOPPrimaryToContactInfo.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/transport/IORToSocketInfo.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/IORToSocketInfo.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/transport/IORToSocketInfo.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/IORToSocketInfo.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/transport/IORTransformer.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/IORTransformer.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/transport/IORTransformer.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/IORTransformer.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/transport/ORBSocketFactory.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/ORBSocketFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/transport/ORBSocketFactory.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/ORBSocketFactory.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/transport/ReadTimeouts.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/ReadTimeouts.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/transport/ReadTimeouts.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/ReadTimeouts.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/transport/ReadTimeoutsFactory.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/ReadTimeoutsFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/transport/ReadTimeoutsFactory.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/ReadTimeoutsFactory.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/transport/SocketInfo.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/SocketInfo.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/transport/SocketInfo.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/SocketInfo.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/transport/SocketOrChannelAcceptor.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/SocketOrChannelAcceptor.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/transport/SocketOrChannelAcceptor.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/SocketOrChannelAcceptor.java diff --git a/corba/src/share/classes/com/sun/corba/se/spi/transport/TransportDefault.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/TransportDefault.java similarity index 100% rename from corba/src/share/classes/com/sun/corba/se/spi/transport/TransportDefault.java rename to corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/TransportDefault.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/AttrDescriptionSeqHelper.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/AttrDescriptionSeqHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/AttrDescriptionSeqHelper.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/AttrDescriptionSeqHelper.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/AttributeDescription.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/AttributeDescription.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/AttributeDescription.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/AttributeDescription.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/AttributeDescriptionHelper.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/AttributeDescriptionHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/AttributeDescriptionHelper.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/AttributeDescriptionHelper.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/AttributeMode.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/AttributeMode.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/AttributeMode.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/AttributeMode.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/AttributeModeHelper.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/AttributeModeHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/AttributeModeHelper.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/AttributeModeHelper.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/ContextIdSeqHelper.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ContextIdSeqHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/ContextIdSeqHelper.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ContextIdSeqHelper.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/ContextIdentifierHelper.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ContextIdentifierHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/ContextIdentifierHelper.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ContextIdentifierHelper.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/DefinitionKindHelper.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/DefinitionKindHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/DefinitionKindHelper.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/DefinitionKindHelper.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/ExcDescriptionSeqHelper.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ExcDescriptionSeqHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/ExcDescriptionSeqHelper.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ExcDescriptionSeqHelper.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/ExceptionDescription.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ExceptionDescription.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/ExceptionDescription.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ExceptionDescription.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/ExceptionDescriptionHelper.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ExceptionDescriptionHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/ExceptionDescriptionHelper.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ExceptionDescriptionHelper.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/IDLTypeHelper.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/IDLTypeHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/IDLTypeHelper.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/IDLTypeHelper.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/IdentifierHelper.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/IdentifierHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/IdentifierHelper.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/IdentifierHelper.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/Initializer.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/Initializer.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/Initializer.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/Initializer.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/InitializerHelper.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/InitializerHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/InitializerHelper.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/InitializerHelper.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/InitializerSeqHelper.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/InitializerSeqHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/InitializerSeqHelper.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/InitializerSeqHelper.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/OpDescriptionSeqHelper.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/OpDescriptionSeqHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/OpDescriptionSeqHelper.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/OpDescriptionSeqHelper.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/OperationDescription.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/OperationDescription.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/OperationDescription.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/OperationDescription.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/OperationDescriptionHelper.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/OperationDescriptionHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/OperationDescriptionHelper.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/OperationDescriptionHelper.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/OperationMode.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/OperationMode.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/OperationMode.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/OperationMode.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/OperationModeHelper.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/OperationModeHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/OperationModeHelper.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/OperationModeHelper.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/ParDescriptionSeqHelper.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ParDescriptionSeqHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/ParDescriptionSeqHelper.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ParDescriptionSeqHelper.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/ParameterDescription.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ParameterDescription.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/ParameterDescription.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ParameterDescription.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/ParameterDescriptionHelper.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ParameterDescriptionHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/ParameterDescriptionHelper.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ParameterDescriptionHelper.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/ParameterMode.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ParameterMode.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/ParameterMode.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ParameterMode.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/ParameterModeHelper.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ParameterModeHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/ParameterModeHelper.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ParameterModeHelper.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/Repository.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/Repository.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/Repository.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/Repository.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/RepositoryHelper.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/RepositoryHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/RepositoryHelper.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/RepositoryHelper.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/RepositoryIdHelper.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/RepositoryIdHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/RepositoryIdHelper.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/RepositoryIdHelper.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/RepositoryIdSeqHelper.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/RepositoryIdSeqHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/RepositoryIdSeqHelper.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/RepositoryIdSeqHelper.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/StructMemberHelper.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/StructMemberHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/StructMemberHelper.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/StructMemberHelper.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/StructMemberSeqHelper.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/StructMemberSeqHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/StructMemberSeqHelper.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/StructMemberSeqHelper.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/ValueDefPackage/FullValueDescription.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ValueDefPackage/FullValueDescription.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/ValueDefPackage/FullValueDescription.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ValueDefPackage/FullValueDescription.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/ValueDefPackage/FullValueDescriptionHelper.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ValueDefPackage/FullValueDescriptionHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/ValueDefPackage/FullValueDescriptionHelper.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ValueDefPackage/FullValueDescriptionHelper.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/ValueMemberHelper.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ValueMemberHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/ValueMemberHelper.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ValueMemberHelper.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/ValueMemberSeqHelper.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ValueMemberSeqHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/ValueMemberSeqHelper.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ValueMemberSeqHelper.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/VersionSpecHelper.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/VersionSpecHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/VersionSpecHelper.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/VersionSpecHelper.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/VisibilityHelper.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/VisibilityHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/VisibilityHelper.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/VisibilityHelper.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/_IDLTypeStub.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/_IDLTypeStub.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/_IDLTypeStub.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/_IDLTypeStub.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/portable/ValueHelper.java b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/portable/ValueHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/CORBA/portable/ValueHelper.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/portable/ValueHelper.java diff --git a/corba/src/share/classes/com/sun/org/omg/SendingContext/CodeBase.java b/corba/src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBase.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/SendingContext/CodeBase.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBase.java diff --git a/corba/src/share/classes/com/sun/org/omg/SendingContext/CodeBaseHelper.java b/corba/src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBaseHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/SendingContext/CodeBaseHelper.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBaseHelper.java diff --git a/corba/src/share/classes/com/sun/org/omg/SendingContext/CodeBaseOperations.java b/corba/src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBaseOperations.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/SendingContext/CodeBaseOperations.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBaseOperations.java diff --git a/corba/src/share/classes/com/sun/org/omg/SendingContext/CodeBasePackage/URLHelper.java b/corba/src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBasePackage/URLHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/SendingContext/CodeBasePackage/URLHelper.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBasePackage/URLHelper.java diff --git a/corba/src/share/classes/com/sun/org/omg/SendingContext/CodeBasePackage/URLSeqHelper.java b/corba/src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBasePackage/URLSeqHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/SendingContext/CodeBasePackage/URLSeqHelper.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBasePackage/URLSeqHelper.java diff --git a/corba/src/share/classes/com/sun/org/omg/SendingContext/CodeBasePackage/ValueDescSeqHelper.java b/corba/src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBasePackage/ValueDescSeqHelper.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/SendingContext/CodeBasePackage/ValueDescSeqHelper.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBasePackage/ValueDescSeqHelper.java diff --git a/corba/src/share/classes/com/sun/org/omg/SendingContext/_CodeBaseImplBase.java b/corba/src/java.corba/share/classes/com/sun/org/omg/SendingContext/_CodeBaseImplBase.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/SendingContext/_CodeBaseImplBase.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/SendingContext/_CodeBaseImplBase.java diff --git a/corba/src/share/classes/com/sun/org/omg/SendingContext/_CodeBaseStub.java b/corba/src/java.corba/share/classes/com/sun/org/omg/SendingContext/_CodeBaseStub.java similarity index 100% rename from corba/src/share/classes/com/sun/org/omg/SendingContext/_CodeBaseStub.java rename to corba/src/java.corba/share/classes/com/sun/org/omg/SendingContext/_CodeBaseStub.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/Arguments.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Arguments.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/Arguments.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Arguments.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/AttributeEntry.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/AttributeEntry.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/AttributeEntry.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/AttributeEntry.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/AttributeGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/AttributeGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/AttributeGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/AttributeGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/Comment.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Comment.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/Comment.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Comment.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/Compile.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Compile.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/Compile.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Compile.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/ConstEntry.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ConstEntry.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/ConstEntry.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ConstEntry.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/ConstGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ConstGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/ConstGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ConstGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/DefaultSymtabFactory.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/DefaultSymtabFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/DefaultSymtabFactory.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/DefaultSymtabFactory.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/EnumEntry.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/EnumEntry.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/EnumEntry.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/EnumEntry.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/EnumGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/EnumGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/EnumGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/EnumGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/ExceptionEntry.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ExceptionEntry.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/ExceptionEntry.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ExceptionEntry.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/ExceptionGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ExceptionGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/ExceptionGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ExceptionGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/Factories.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Factories.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/Factories.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Factories.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/ForwardEntry.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardEntry.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/ForwardEntry.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardEntry.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/ForwardGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/ForwardGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/ForwardValueEntry.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardValueEntry.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/ForwardValueEntry.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardValueEntry.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/ForwardValueGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardValueGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/ForwardValueGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardValueGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/GenFactory.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/GenFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/GenFactory.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/GenFactory.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/GenFileStream.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/GenFileStream.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/GenFileStream.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/GenFileStream.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/Generator.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Generator.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/Generator.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Generator.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/IDLID.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/IDLID.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/IDLID.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/IDLID.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/IncludeEntry.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/IncludeEntry.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/IncludeEntry.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/IncludeEntry.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/IncludeGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/IncludeGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/IncludeGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/IncludeGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/InterfaceEntry.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InterfaceEntry.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/InterfaceEntry.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InterfaceEntry.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/InterfaceGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InterfaceGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/InterfaceGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InterfaceGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/InterfaceState.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InterfaceState.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/InterfaceState.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InterfaceState.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/InterfaceType.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InterfaceType.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/InterfaceType.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InterfaceType.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/InvalidArgument.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InvalidArgument.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/InvalidArgument.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InvalidArgument.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/InvalidCharacter.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InvalidCharacter.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/InvalidCharacter.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InvalidCharacter.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/MethodEntry.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/MethodEntry.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/MethodEntry.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/MethodEntry.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/MethodGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/MethodGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/MethodGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/MethodGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/ModuleEntry.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ModuleEntry.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/ModuleEntry.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ModuleEntry.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/ModuleGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ModuleGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/ModuleGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ModuleGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/NativeEntry.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/NativeEntry.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/NativeEntry.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/NativeEntry.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/NativeGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/NativeGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/NativeGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/NativeGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/NoPragma.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/NoPragma.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/NoPragma.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/NoPragma.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/Noop.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Noop.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/Noop.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Noop.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/ParameterEntry.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ParameterEntry.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/ParameterEntry.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ParameterEntry.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/ParameterGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ParameterGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/ParameterGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ParameterGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/ParseException.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ParseException.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/ParseException.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ParseException.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/Parser.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Parser.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/Parser.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Parser.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/PragmaEntry.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PragmaEntry.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/PragmaEntry.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PragmaEntry.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/PragmaGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PragmaGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/PragmaGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PragmaGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/PragmaHandler.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PragmaHandler.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/PragmaHandler.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PragmaHandler.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/Preprocessor.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Preprocessor.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/Preprocessor.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Preprocessor.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/PrimitiveEntry.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PrimitiveEntry.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/PrimitiveEntry.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PrimitiveEntry.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/PrimitiveGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PrimitiveGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/PrimitiveGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PrimitiveGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/RepositoryID.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/RepositoryID.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/RepositoryID.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/RepositoryID.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/ResourceBundleUtil.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ResourceBundleUtil.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/ResourceBundleUtil.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ResourceBundleUtil.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/Scanner.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Scanner.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/Scanner.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Scanner.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/SequenceEntry.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SequenceEntry.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/SequenceEntry.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SequenceEntry.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/SequenceGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SequenceGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/SequenceGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SequenceGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/StringEntry.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/StringEntry.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/StringEntry.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/StringEntry.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/StringGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/StringGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/StringGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/StringGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/StructEntry.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/StructEntry.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/StructEntry.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/StructEntry.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/StructGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/StructGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/StructGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/StructGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/SymtabEntry.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SymtabEntry.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/SymtabEntry.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SymtabEntry.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/SymtabFactory.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SymtabFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/SymtabFactory.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SymtabFactory.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/Token.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Token.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/Token.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Token.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/TokenBuffer.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/TokenBuffer.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/TokenBuffer.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/TokenBuffer.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/TypedefEntry.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/TypedefEntry.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/TypedefEntry.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/TypedefEntry.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/TypedefGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/TypedefGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/TypedefGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/TypedefGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/UnionBranch.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/UnionBranch.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/UnionBranch.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/UnionBranch.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/UnionEntry.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/UnionEntry.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/UnionEntry.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/UnionEntry.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/UnionGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/UnionGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/UnionGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/UnionGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/Util.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Util.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/Util.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Util.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/ValueBoxEntry.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueBoxEntry.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/ValueBoxEntry.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueBoxEntry.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/ValueBoxGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueBoxGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/ValueBoxGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueBoxGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/ValueEntry.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueEntry.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/ValueEntry.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueEntry.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/ValueGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/ValueGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/ValueRepositoryId.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueRepositoryId.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/ValueRepositoryId.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueRepositoryId.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/And.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/And.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/And.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/And.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/BinaryExpr.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/BinaryExpr.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/BinaryExpr.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/BinaryExpr.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/BooleanAnd.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/BooleanAnd.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/BooleanAnd.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/BooleanAnd.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/BooleanNot.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/BooleanNot.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/BooleanNot.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/BooleanNot.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/BooleanOr.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/BooleanOr.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/BooleanOr.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/BooleanOr.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/DefaultExprFactory.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/DefaultExprFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/DefaultExprFactory.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/DefaultExprFactory.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Divide.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Divide.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Divide.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Divide.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Equal.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Equal.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Equal.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Equal.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/EvaluationException.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/EvaluationException.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/EvaluationException.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/EvaluationException.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/ExprFactory.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/ExprFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/ExprFactory.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/ExprFactory.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Expression.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Expression.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Expression.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Expression.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/GreaterEqual.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/GreaterEqual.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/GreaterEqual.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/GreaterEqual.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/GreaterThan.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/GreaterThan.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/GreaterThan.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/GreaterThan.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/LessEqual.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/LessEqual.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/LessEqual.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/LessEqual.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/LessThan.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/LessThan.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/LessThan.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/LessThan.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Minus.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Minus.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Minus.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Minus.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Modulo.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Modulo.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Modulo.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Modulo.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Negative.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Negative.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Negative.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Negative.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Not.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Not.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Not.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Not.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/NotEqual.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/NotEqual.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/NotEqual.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/NotEqual.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Or.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Or.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Or.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Or.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Plus.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Plus.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Plus.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Plus.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Positive.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Positive.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Positive.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Positive.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/ShiftLeft.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/ShiftLeft.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/ShiftLeft.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/ShiftLeft.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/ShiftRight.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/ShiftRight.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/ShiftRight.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/ShiftRight.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Terminal.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Terminal.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Terminal.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Terminal.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Times.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Times.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Times.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Times.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/UnaryExpr.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/UnaryExpr.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/UnaryExpr.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/UnaryExpr.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Xor.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Xor.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Xor.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Xor.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/first.set b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/first.set similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/first.set rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/first.set diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/follow.set b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/follow.set similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/follow.set rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/follow.set diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/grammar.idl b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/grammar.idl similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/grammar.idl rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/grammar.idl diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/grammar3.idl b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/grammar3.idl similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/grammar3.idl rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/grammar3.idl diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/idl.prp b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/idl.prp similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/idl.prp rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/idl.prp diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/idl_zh_CN.prp b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/idl_zh_CN.prp similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/idl_zh_CN.prp rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/idl_zh_CN.prp diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/ir.idl b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ir.idl similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/ir.idl rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ir.idl diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/keywords b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/keywords similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/keywords rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/keywords diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/orb.idl b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/orb.idl similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/orb.idl rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/orb.idl diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/som/cff/FileLocator.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/som/cff/FileLocator.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/som/cff/FileLocator.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/som/cff/FileLocator.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/som/cff/Messages.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/som/cff/Messages.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/som/cff/Messages.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/som/cff/Messages.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/som/idlemit/MetaPragma.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/som/idlemit/MetaPragma.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/som/idlemit/MetaPragma.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/som/idlemit/MetaPragma.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Arguments.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Arguments.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Arguments.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Arguments.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/AttributeGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/AttributeGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/AttributeGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/AttributeGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/AttributeGen24.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/AttributeGen24.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/AttributeGen24.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/AttributeGen24.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/AuxGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/AuxGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/AuxGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/AuxGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Compile.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Compile.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Compile.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Compile.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ConstGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ConstGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ConstGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ConstGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/DefaultFactory.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/DefaultFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/DefaultFactory.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/DefaultFactory.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/EnumGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/EnumGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/EnumGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/EnumGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ExceptionGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ExceptionGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ExceptionGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ExceptionGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Factories.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Factories.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Factories.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Factories.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ForwardValueGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ForwardValueGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ForwardValueGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ForwardValueGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/GenFactory.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/GenFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/GenFactory.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/GenFactory.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Helper.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Helper.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Helper.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Helper.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Helper24.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Helper24.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Helper24.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Helper24.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Holder.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Holder.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Holder.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Holder.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/InterfaceGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/InterfaceGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/InterfaceGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/InterfaceGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/JavaGenerator.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/JavaGenerator.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/JavaGenerator.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/JavaGenerator.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGen24.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGen24.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGen24.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGen24.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGenClone24.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGenClone24.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGenClone24.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGenClone24.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ModuleGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ModuleGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ModuleGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ModuleGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/NameModifier.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/NameModifier.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/NameModifier.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/NameModifier.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/NameModifierImpl.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/NameModifierImpl.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/NameModifierImpl.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/NameModifierImpl.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/NativeGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/NativeGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/NativeGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/NativeGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/PrimitiveGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/PrimitiveGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/PrimitiveGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/PrimitiveGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/SequenceGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/SequenceGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/SequenceGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/SequenceGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Skeleton.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Skeleton.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Skeleton.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Skeleton.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/StringGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/StringGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/StringGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/StringGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/StructGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/StructGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/StructGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/StructGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Stub.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Stub.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Stub.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Stub.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/TCOffsets.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/TCOffsets.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/TCOffsets.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/TCOffsets.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/TypedefGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/TypedefGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/TypedefGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/TypedefGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/UnionGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/UnionGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/UnionGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/UnionGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Util.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Util.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Util.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Util.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueBoxGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueBoxGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueBoxGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueBoxGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueBoxGen24.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueBoxGen24.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueBoxGen24.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueBoxGen24.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueFactory.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueFactory.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueFactory.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueFactory.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueGen.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueGen.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueGen.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueGen.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueGen24.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueGen24.java similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueGen24.java rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueGen24.java diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable.prp b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable.prp similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable.prp rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable.prp diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_ja.prp b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_ja.prp similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_ja.prp rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_ja.prp diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_zh_CN.prp b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_zh_CN.prp similarity index 100% rename from corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_zh_CN.prp rename to corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_zh_CN.prp diff --git a/corba/src/share/classes/javax/activity/ActivityCompletedException.java b/corba/src/java.corba/share/classes/javax/activity/ActivityCompletedException.java similarity index 100% rename from corba/src/share/classes/javax/activity/ActivityCompletedException.java rename to corba/src/java.corba/share/classes/javax/activity/ActivityCompletedException.java diff --git a/corba/src/share/classes/javax/activity/ActivityRequiredException.java b/corba/src/java.corba/share/classes/javax/activity/ActivityRequiredException.java similarity index 100% rename from corba/src/share/classes/javax/activity/ActivityRequiredException.java rename to corba/src/java.corba/share/classes/javax/activity/ActivityRequiredException.java diff --git a/corba/src/share/classes/javax/activity/InvalidActivityException.java b/corba/src/java.corba/share/classes/javax/activity/InvalidActivityException.java similarity index 100% rename from corba/src/share/classes/javax/activity/InvalidActivityException.java rename to corba/src/java.corba/share/classes/javax/activity/InvalidActivityException.java diff --git a/corba/src/share/classes/javax/activity/package.html b/corba/src/java.corba/share/classes/javax/activity/package.html similarity index 100% rename from corba/src/share/classes/javax/activity/package.html rename to corba/src/java.corba/share/classes/javax/activity/package.html diff --git a/corba/src/share/classes/javax/rmi/CORBA/ClassDesc.java b/corba/src/java.corba/share/classes/javax/rmi/CORBA/ClassDesc.java similarity index 100% rename from corba/src/share/classes/javax/rmi/CORBA/ClassDesc.java rename to corba/src/java.corba/share/classes/javax/rmi/CORBA/ClassDesc.java diff --git a/corba/src/share/classes/javax/rmi/CORBA/GetORBPropertiesFileAction.java b/corba/src/java.corba/share/classes/javax/rmi/CORBA/GetORBPropertiesFileAction.java similarity index 100% rename from corba/src/share/classes/javax/rmi/CORBA/GetORBPropertiesFileAction.java rename to corba/src/java.corba/share/classes/javax/rmi/CORBA/GetORBPropertiesFileAction.java diff --git a/corba/src/share/classes/javax/rmi/CORBA/PortableRemoteObjectDelegate.java b/corba/src/java.corba/share/classes/javax/rmi/CORBA/PortableRemoteObjectDelegate.java similarity index 100% rename from corba/src/share/classes/javax/rmi/CORBA/PortableRemoteObjectDelegate.java rename to corba/src/java.corba/share/classes/javax/rmi/CORBA/PortableRemoteObjectDelegate.java diff --git a/corba/src/share/classes/javax/rmi/CORBA/Stub.java b/corba/src/java.corba/share/classes/javax/rmi/CORBA/Stub.java similarity index 100% rename from corba/src/share/classes/javax/rmi/CORBA/Stub.java rename to corba/src/java.corba/share/classes/javax/rmi/CORBA/Stub.java diff --git a/corba/src/share/classes/javax/rmi/CORBA/StubDelegate.java b/corba/src/java.corba/share/classes/javax/rmi/CORBA/StubDelegate.java similarity index 100% rename from corba/src/share/classes/javax/rmi/CORBA/StubDelegate.java rename to corba/src/java.corba/share/classes/javax/rmi/CORBA/StubDelegate.java diff --git a/corba/src/share/classes/javax/rmi/CORBA/Tie.java b/corba/src/java.corba/share/classes/javax/rmi/CORBA/Tie.java similarity index 100% rename from corba/src/share/classes/javax/rmi/CORBA/Tie.java rename to corba/src/java.corba/share/classes/javax/rmi/CORBA/Tie.java diff --git a/corba/src/share/classes/javax/rmi/CORBA/Util.java b/corba/src/java.corba/share/classes/javax/rmi/CORBA/Util.java similarity index 100% rename from corba/src/share/classes/javax/rmi/CORBA/Util.java rename to corba/src/java.corba/share/classes/javax/rmi/CORBA/Util.java diff --git a/corba/src/share/classes/javax/rmi/CORBA/UtilDelegate.java b/corba/src/java.corba/share/classes/javax/rmi/CORBA/UtilDelegate.java similarity index 100% rename from corba/src/share/classes/javax/rmi/CORBA/UtilDelegate.java rename to corba/src/java.corba/share/classes/javax/rmi/CORBA/UtilDelegate.java diff --git a/corba/src/share/classes/javax/rmi/CORBA/ValueHandler.java b/corba/src/java.corba/share/classes/javax/rmi/CORBA/ValueHandler.java similarity index 100% rename from corba/src/share/classes/javax/rmi/CORBA/ValueHandler.java rename to corba/src/java.corba/share/classes/javax/rmi/CORBA/ValueHandler.java diff --git a/corba/src/share/classes/javax/rmi/CORBA/ValueHandlerMultiFormat.java b/corba/src/java.corba/share/classes/javax/rmi/CORBA/ValueHandlerMultiFormat.java similarity index 100% rename from corba/src/share/classes/javax/rmi/CORBA/ValueHandlerMultiFormat.java rename to corba/src/java.corba/share/classes/javax/rmi/CORBA/ValueHandlerMultiFormat.java diff --git a/corba/src/share/classes/javax/rmi/CORBA/package.html b/corba/src/java.corba/share/classes/javax/rmi/CORBA/package.html similarity index 100% rename from corba/src/share/classes/javax/rmi/CORBA/package.html rename to corba/src/java.corba/share/classes/javax/rmi/CORBA/package.html diff --git a/corba/src/share/classes/javax/rmi/PortableRemoteObject.java b/corba/src/java.corba/share/classes/javax/rmi/PortableRemoteObject.java similarity index 100% rename from corba/src/share/classes/javax/rmi/PortableRemoteObject.java rename to corba/src/java.corba/share/classes/javax/rmi/PortableRemoteObject.java diff --git a/corba/src/share/classes/javax/rmi/package.html b/corba/src/java.corba/share/classes/javax/rmi/package.html similarity index 100% rename from corba/src/share/classes/javax/rmi/package.html rename to corba/src/java.corba/share/classes/javax/rmi/package.html diff --git a/corba/src/share/classes/javax/transaction/InvalidTransactionException.java b/corba/src/java.corba/share/classes/javax/transaction/InvalidTransactionException.java similarity index 100% rename from corba/src/share/classes/javax/transaction/InvalidTransactionException.java rename to corba/src/java.corba/share/classes/javax/transaction/InvalidTransactionException.java diff --git a/corba/src/share/classes/javax/transaction/TransactionRequiredException.java b/corba/src/java.corba/share/classes/javax/transaction/TransactionRequiredException.java similarity index 100% rename from corba/src/share/classes/javax/transaction/TransactionRequiredException.java rename to corba/src/java.corba/share/classes/javax/transaction/TransactionRequiredException.java diff --git a/corba/src/share/classes/javax/transaction/TransactionRolledbackException.java b/corba/src/java.corba/share/classes/javax/transaction/TransactionRolledbackException.java similarity index 100% rename from corba/src/share/classes/javax/transaction/TransactionRolledbackException.java rename to corba/src/java.corba/share/classes/javax/transaction/TransactionRolledbackException.java diff --git a/corba/src/share/classes/javax/transaction/package.html b/corba/src/java.corba/share/classes/javax/transaction/package.html similarity index 100% rename from corba/src/share/classes/javax/transaction/package.html rename to corba/src/java.corba/share/classes/javax/transaction/package.html diff --git a/corba/src/share/classes/org/omg/CORBA/ACTIVITY_COMPLETED.java b/corba/src/java.corba/share/classes/org/omg/CORBA/ACTIVITY_COMPLETED.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/ACTIVITY_COMPLETED.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/ACTIVITY_COMPLETED.java diff --git a/corba/src/share/classes/org/omg/CORBA/ACTIVITY_REQUIRED.java b/corba/src/java.corba/share/classes/org/omg/CORBA/ACTIVITY_REQUIRED.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/ACTIVITY_REQUIRED.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/ACTIVITY_REQUIRED.java diff --git a/corba/src/share/classes/org/omg/CORBA/ARG_IN.java b/corba/src/java.corba/share/classes/org/omg/CORBA/ARG_IN.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/ARG_IN.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/ARG_IN.java diff --git a/corba/src/share/classes/org/omg/CORBA/ARG_INOUT.java b/corba/src/java.corba/share/classes/org/omg/CORBA/ARG_INOUT.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/ARG_INOUT.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/ARG_INOUT.java diff --git a/corba/src/share/classes/org/omg/CORBA/ARG_OUT.java b/corba/src/java.corba/share/classes/org/omg/CORBA/ARG_OUT.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/ARG_OUT.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/ARG_OUT.java diff --git a/corba/src/share/classes/org/omg/CORBA/Any.java b/corba/src/java.corba/share/classes/org/omg/CORBA/Any.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/Any.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/Any.java diff --git a/corba/src/share/classes/org/omg/CORBA/AnyHolder.java b/corba/src/java.corba/share/classes/org/omg/CORBA/AnyHolder.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/AnyHolder.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/AnyHolder.java diff --git a/corba/src/share/classes/org/omg/CORBA/AnySeqHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/AnySeqHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/AnySeqHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/AnySeqHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/AnySeqHolder.java b/corba/src/java.corba/share/classes/org/omg/CORBA/AnySeqHolder.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/AnySeqHolder.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/AnySeqHolder.java diff --git a/corba/src/share/classes/org/omg/CORBA/BAD_CONTEXT.java b/corba/src/java.corba/share/classes/org/omg/CORBA/BAD_CONTEXT.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/BAD_CONTEXT.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/BAD_CONTEXT.java diff --git a/corba/src/share/classes/org/omg/CORBA/BAD_INV_ORDER.java b/corba/src/java.corba/share/classes/org/omg/CORBA/BAD_INV_ORDER.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/BAD_INV_ORDER.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/BAD_INV_ORDER.java diff --git a/corba/src/share/classes/org/omg/CORBA/BAD_OPERATION.java b/corba/src/java.corba/share/classes/org/omg/CORBA/BAD_OPERATION.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/BAD_OPERATION.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/BAD_OPERATION.java diff --git a/corba/src/share/classes/org/omg/CORBA/BAD_PARAM.java b/corba/src/java.corba/share/classes/org/omg/CORBA/BAD_PARAM.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/BAD_PARAM.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/BAD_PARAM.java diff --git a/corba/src/share/classes/org/omg/CORBA/BAD_POLICY.java b/corba/src/java.corba/share/classes/org/omg/CORBA/BAD_POLICY.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/BAD_POLICY.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/BAD_POLICY.java diff --git a/corba/src/share/classes/org/omg/CORBA/BAD_POLICY_TYPE.java b/corba/src/java.corba/share/classes/org/omg/CORBA/BAD_POLICY_TYPE.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/BAD_POLICY_TYPE.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/BAD_POLICY_TYPE.java diff --git a/corba/src/share/classes/org/omg/CORBA/BAD_POLICY_VALUE.java b/corba/src/java.corba/share/classes/org/omg/CORBA/BAD_POLICY_VALUE.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/BAD_POLICY_VALUE.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/BAD_POLICY_VALUE.java diff --git a/corba/src/share/classes/org/omg/CORBA/BAD_QOS.java b/corba/src/java.corba/share/classes/org/omg/CORBA/BAD_QOS.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/BAD_QOS.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/BAD_QOS.java diff --git a/corba/src/share/classes/org/omg/CORBA/BAD_TYPECODE.java b/corba/src/java.corba/share/classes/org/omg/CORBA/BAD_TYPECODE.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/BAD_TYPECODE.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/BAD_TYPECODE.java diff --git a/corba/src/share/classes/org/omg/CORBA/BooleanHolder.java b/corba/src/java.corba/share/classes/org/omg/CORBA/BooleanHolder.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/BooleanHolder.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/BooleanHolder.java diff --git a/corba/src/share/classes/org/omg/CORBA/BooleanSeqHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/BooleanSeqHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/BooleanSeqHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/BooleanSeqHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/BooleanSeqHolder.java b/corba/src/java.corba/share/classes/org/omg/CORBA/BooleanSeqHolder.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/BooleanSeqHolder.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/BooleanSeqHolder.java diff --git a/corba/src/share/classes/org/omg/CORBA/Bounds.java b/corba/src/java.corba/share/classes/org/omg/CORBA/Bounds.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/Bounds.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/Bounds.java diff --git a/corba/src/share/classes/org/omg/CORBA/ByteHolder.java b/corba/src/java.corba/share/classes/org/omg/CORBA/ByteHolder.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/ByteHolder.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/ByteHolder.java diff --git a/corba/src/share/classes/org/omg/CORBA/CODESET_INCOMPATIBLE.java b/corba/src/java.corba/share/classes/org/omg/CORBA/CODESET_INCOMPATIBLE.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/CODESET_INCOMPATIBLE.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/CODESET_INCOMPATIBLE.java diff --git a/corba/src/share/classes/org/omg/CORBA/COMM_FAILURE.java b/corba/src/java.corba/share/classes/org/omg/CORBA/COMM_FAILURE.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/COMM_FAILURE.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/COMM_FAILURE.java diff --git a/corba/src/share/classes/org/omg/CORBA/CTX_RESTRICT_SCOPE.java b/corba/src/java.corba/share/classes/org/omg/CORBA/CTX_RESTRICT_SCOPE.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/CTX_RESTRICT_SCOPE.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/CTX_RESTRICT_SCOPE.java diff --git a/corba/src/share/classes/org/omg/CORBA/CharHolder.java b/corba/src/java.corba/share/classes/org/omg/CORBA/CharHolder.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/CharHolder.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/CharHolder.java diff --git a/corba/src/share/classes/org/omg/CORBA/CharSeqHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/CharSeqHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/CharSeqHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/CharSeqHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/CharSeqHolder.java b/corba/src/java.corba/share/classes/org/omg/CORBA/CharSeqHolder.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/CharSeqHolder.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/CharSeqHolder.java diff --git a/corba/src/share/classes/org/omg/CORBA/CompletionStatus.java b/corba/src/java.corba/share/classes/org/omg/CORBA/CompletionStatus.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/CompletionStatus.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/CompletionStatus.java diff --git a/corba/src/share/classes/org/omg/CORBA/CompletionStatusHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/CompletionStatusHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/CompletionStatusHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/CompletionStatusHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/Context.java b/corba/src/java.corba/share/classes/org/omg/CORBA/Context.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/Context.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/Context.java diff --git a/corba/src/share/classes/org/omg/CORBA/ContextList.java b/corba/src/java.corba/share/classes/org/omg/CORBA/ContextList.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/ContextList.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/ContextList.java diff --git a/corba/src/share/classes/org/omg/CORBA/Current.java b/corba/src/java.corba/share/classes/org/omg/CORBA/Current.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/Current.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/Current.java diff --git a/corba/src/share/classes/org/omg/CORBA/CurrentHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/CurrentHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/CurrentHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/CurrentHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/CurrentHolder.java b/corba/src/java.corba/share/classes/org/omg/CORBA/CurrentHolder.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/CurrentHolder.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/CurrentHolder.java diff --git a/corba/src/share/classes/org/omg/CORBA/CurrentOperations.java b/corba/src/java.corba/share/classes/org/omg/CORBA/CurrentOperations.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/CurrentOperations.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/CurrentOperations.java diff --git a/corba/src/share/classes/org/omg/CORBA/CustomMarshal.java b/corba/src/java.corba/share/classes/org/omg/CORBA/CustomMarshal.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/CustomMarshal.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/CustomMarshal.java diff --git a/corba/src/share/classes/org/omg/CORBA/DATA_CONVERSION.java b/corba/src/java.corba/share/classes/org/omg/CORBA/DATA_CONVERSION.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/DATA_CONVERSION.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/DATA_CONVERSION.java diff --git a/corba/src/share/classes/org/omg/CORBA/DataInputStream.java b/corba/src/java.corba/share/classes/org/omg/CORBA/DataInputStream.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/DataInputStream.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/DataInputStream.java diff --git a/corba/src/share/classes/org/omg/CORBA/DataOutputStream.java b/corba/src/java.corba/share/classes/org/omg/CORBA/DataOutputStream.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/DataOutputStream.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/DataOutputStream.java diff --git a/corba/src/share/classes/org/omg/CORBA/DefinitionKind.java b/corba/src/java.corba/share/classes/org/omg/CORBA/DefinitionKind.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/DefinitionKind.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/DefinitionKind.java diff --git a/corba/src/share/classes/org/omg/CORBA/DefinitionKindHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/DefinitionKindHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/DefinitionKindHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/DefinitionKindHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/DomainManager.java b/corba/src/java.corba/share/classes/org/omg/CORBA/DomainManager.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/DomainManager.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/DomainManager.java diff --git a/corba/src/share/classes/org/omg/CORBA/DomainManagerOperations.java b/corba/src/java.corba/share/classes/org/omg/CORBA/DomainManagerOperations.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/DomainManagerOperations.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/DomainManagerOperations.java diff --git a/corba/src/share/classes/org/omg/CORBA/DoubleHolder.java b/corba/src/java.corba/share/classes/org/omg/CORBA/DoubleHolder.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/DoubleHolder.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/DoubleHolder.java diff --git a/corba/src/share/classes/org/omg/CORBA/DoubleSeqHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/DoubleSeqHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/DoubleSeqHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/DoubleSeqHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/DoubleSeqHolder.java b/corba/src/java.corba/share/classes/org/omg/CORBA/DoubleSeqHolder.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/DoubleSeqHolder.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/DoubleSeqHolder.java diff --git a/corba/src/share/classes/org/omg/CORBA/DynAny.java b/corba/src/java.corba/share/classes/org/omg/CORBA/DynAny.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/DynAny.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/DynAny.java diff --git a/corba/src/share/classes/org/omg/CORBA/DynAnyPackage/Invalid.java b/corba/src/java.corba/share/classes/org/omg/CORBA/DynAnyPackage/Invalid.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/DynAnyPackage/Invalid.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/DynAnyPackage/Invalid.java diff --git a/corba/src/share/classes/org/omg/CORBA/DynAnyPackage/InvalidSeq.java b/corba/src/java.corba/share/classes/org/omg/CORBA/DynAnyPackage/InvalidSeq.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/DynAnyPackage/InvalidSeq.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/DynAnyPackage/InvalidSeq.java diff --git a/corba/src/share/classes/org/omg/CORBA/DynAnyPackage/InvalidValue.java b/corba/src/java.corba/share/classes/org/omg/CORBA/DynAnyPackage/InvalidValue.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/DynAnyPackage/InvalidValue.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/DynAnyPackage/InvalidValue.java diff --git a/corba/src/share/classes/org/omg/CORBA/DynAnyPackage/TypeMismatch.java b/corba/src/java.corba/share/classes/org/omg/CORBA/DynAnyPackage/TypeMismatch.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/DynAnyPackage/TypeMismatch.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/DynAnyPackage/TypeMismatch.java diff --git a/corba/src/share/classes/org/omg/CORBA/DynAnyPackage/package.html b/corba/src/java.corba/share/classes/org/omg/CORBA/DynAnyPackage/package.html similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/DynAnyPackage/package.html rename to corba/src/java.corba/share/classes/org/omg/CORBA/DynAnyPackage/package.html diff --git a/corba/src/share/classes/org/omg/CORBA/DynArray.java b/corba/src/java.corba/share/classes/org/omg/CORBA/DynArray.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/DynArray.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/DynArray.java diff --git a/corba/src/share/classes/org/omg/CORBA/DynEnum.java b/corba/src/java.corba/share/classes/org/omg/CORBA/DynEnum.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/DynEnum.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/DynEnum.java diff --git a/corba/src/share/classes/org/omg/CORBA/DynFixed.java b/corba/src/java.corba/share/classes/org/omg/CORBA/DynFixed.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/DynFixed.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/DynFixed.java diff --git a/corba/src/share/classes/org/omg/CORBA/DynSequence.java b/corba/src/java.corba/share/classes/org/omg/CORBA/DynSequence.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/DynSequence.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/DynSequence.java diff --git a/corba/src/share/classes/org/omg/CORBA/DynStruct.java b/corba/src/java.corba/share/classes/org/omg/CORBA/DynStruct.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/DynStruct.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/DynStruct.java diff --git a/corba/src/share/classes/org/omg/CORBA/DynUnion.java b/corba/src/java.corba/share/classes/org/omg/CORBA/DynUnion.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/DynUnion.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/DynUnion.java diff --git a/corba/src/share/classes/org/omg/CORBA/DynValue.java b/corba/src/java.corba/share/classes/org/omg/CORBA/DynValue.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/DynValue.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/DynValue.java diff --git a/corba/src/share/classes/org/omg/CORBA/DynamicImplementation.java b/corba/src/java.corba/share/classes/org/omg/CORBA/DynamicImplementation.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/DynamicImplementation.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/DynamicImplementation.java diff --git a/corba/src/share/classes/org/omg/CORBA/Environment.java b/corba/src/java.corba/share/classes/org/omg/CORBA/Environment.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/Environment.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/Environment.java diff --git a/corba/src/share/classes/org/omg/CORBA/ExceptionList.java b/corba/src/java.corba/share/classes/org/omg/CORBA/ExceptionList.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/ExceptionList.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/ExceptionList.java diff --git a/corba/src/share/classes/org/omg/CORBA/FREE_MEM.java b/corba/src/java.corba/share/classes/org/omg/CORBA/FREE_MEM.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/FREE_MEM.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/FREE_MEM.java diff --git a/corba/src/share/classes/org/omg/CORBA/FieldNameHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/FieldNameHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/FieldNameHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/FieldNameHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/FixedHolder.java b/corba/src/java.corba/share/classes/org/omg/CORBA/FixedHolder.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/FixedHolder.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/FixedHolder.java diff --git a/corba/src/share/classes/org/omg/CORBA/FloatHolder.java b/corba/src/java.corba/share/classes/org/omg/CORBA/FloatHolder.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/FloatHolder.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/FloatHolder.java diff --git a/corba/src/share/classes/org/omg/CORBA/FloatSeqHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/FloatSeqHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/FloatSeqHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/FloatSeqHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/FloatSeqHolder.java b/corba/src/java.corba/share/classes/org/omg/CORBA/FloatSeqHolder.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/FloatSeqHolder.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/FloatSeqHolder.java diff --git a/corba/src/share/classes/org/omg/CORBA/IDLType.java b/corba/src/java.corba/share/classes/org/omg/CORBA/IDLType.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/IDLType.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/IDLType.java diff --git a/corba/src/share/classes/org/omg/CORBA/IDLTypeHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/IDLTypeHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/IDLTypeHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/IDLTypeHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/IDLTypeOperations.java b/corba/src/java.corba/share/classes/org/omg/CORBA/IDLTypeOperations.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/IDLTypeOperations.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/IDLTypeOperations.java diff --git a/corba/src/share/classes/org/omg/CORBA/IMP_LIMIT.java b/corba/src/java.corba/share/classes/org/omg/CORBA/IMP_LIMIT.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/IMP_LIMIT.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/IMP_LIMIT.java diff --git a/corba/src/share/classes/org/omg/CORBA/INITIALIZE.java b/corba/src/java.corba/share/classes/org/omg/CORBA/INITIALIZE.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/INITIALIZE.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/INITIALIZE.java diff --git a/corba/src/share/classes/org/omg/CORBA/INTERNAL.java b/corba/src/java.corba/share/classes/org/omg/CORBA/INTERNAL.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/INTERNAL.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/INTERNAL.java diff --git a/corba/src/share/classes/org/omg/CORBA/INTF_REPOS.java b/corba/src/java.corba/share/classes/org/omg/CORBA/INTF_REPOS.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/INTF_REPOS.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/INTF_REPOS.java diff --git a/corba/src/share/classes/org/omg/CORBA/INVALID_ACTIVITY.java b/corba/src/java.corba/share/classes/org/omg/CORBA/INVALID_ACTIVITY.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/INVALID_ACTIVITY.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/INVALID_ACTIVITY.java diff --git a/corba/src/share/classes/org/omg/CORBA/INVALID_TRANSACTION.java b/corba/src/java.corba/share/classes/org/omg/CORBA/INVALID_TRANSACTION.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/INVALID_TRANSACTION.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/INVALID_TRANSACTION.java diff --git a/corba/src/share/classes/org/omg/CORBA/INV_FLAG.java b/corba/src/java.corba/share/classes/org/omg/CORBA/INV_FLAG.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/INV_FLAG.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/INV_FLAG.java diff --git a/corba/src/share/classes/org/omg/CORBA/INV_IDENT.java b/corba/src/java.corba/share/classes/org/omg/CORBA/INV_IDENT.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/INV_IDENT.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/INV_IDENT.java diff --git a/corba/src/share/classes/org/omg/CORBA/INV_OBJREF.java b/corba/src/java.corba/share/classes/org/omg/CORBA/INV_OBJREF.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/INV_OBJREF.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/INV_OBJREF.java diff --git a/corba/src/share/classes/org/omg/CORBA/INV_POLICY.java b/corba/src/java.corba/share/classes/org/omg/CORBA/INV_POLICY.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/INV_POLICY.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/INV_POLICY.java diff --git a/corba/src/share/classes/org/omg/CORBA/IRObject.java b/corba/src/java.corba/share/classes/org/omg/CORBA/IRObject.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/IRObject.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/IRObject.java diff --git a/corba/src/share/classes/org/omg/CORBA/IRObjectOperations.java b/corba/src/java.corba/share/classes/org/omg/CORBA/IRObjectOperations.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/IRObjectOperations.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/IRObjectOperations.java diff --git a/corba/src/share/classes/org/omg/CORBA/IdentifierHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/IdentifierHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/IdentifierHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/IdentifierHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/IntHolder.java b/corba/src/java.corba/share/classes/org/omg/CORBA/IntHolder.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/IntHolder.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/IntHolder.java diff --git a/corba/src/share/classes/org/omg/CORBA/LocalObject.java b/corba/src/java.corba/share/classes/org/omg/CORBA/LocalObject.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/LocalObject.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/LocalObject.java diff --git a/corba/src/share/classes/org/omg/CORBA/LongHolder.java b/corba/src/java.corba/share/classes/org/omg/CORBA/LongHolder.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/LongHolder.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/LongHolder.java diff --git a/corba/src/share/classes/org/omg/CORBA/LongLongSeqHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/LongLongSeqHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/LongLongSeqHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/LongLongSeqHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/LongLongSeqHolder.java b/corba/src/java.corba/share/classes/org/omg/CORBA/LongLongSeqHolder.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/LongLongSeqHolder.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/LongLongSeqHolder.java diff --git a/corba/src/share/classes/org/omg/CORBA/LongSeqHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/LongSeqHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/LongSeqHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/LongSeqHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/LongSeqHolder.java b/corba/src/java.corba/share/classes/org/omg/CORBA/LongSeqHolder.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/LongSeqHolder.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/LongSeqHolder.java diff --git a/corba/src/share/classes/org/omg/CORBA/MARSHAL.java b/corba/src/java.corba/share/classes/org/omg/CORBA/MARSHAL.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/MARSHAL.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/MARSHAL.java diff --git a/corba/src/share/classes/org/omg/CORBA/NO_IMPLEMENT.java b/corba/src/java.corba/share/classes/org/omg/CORBA/NO_IMPLEMENT.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/NO_IMPLEMENT.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/NO_IMPLEMENT.java diff --git a/corba/src/share/classes/org/omg/CORBA/NO_MEMORY.java b/corba/src/java.corba/share/classes/org/omg/CORBA/NO_MEMORY.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/NO_MEMORY.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/NO_MEMORY.java diff --git a/corba/src/share/classes/org/omg/CORBA/NO_PERMISSION.java b/corba/src/java.corba/share/classes/org/omg/CORBA/NO_PERMISSION.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/NO_PERMISSION.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/NO_PERMISSION.java diff --git a/corba/src/share/classes/org/omg/CORBA/NO_RESOURCES.java b/corba/src/java.corba/share/classes/org/omg/CORBA/NO_RESOURCES.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/NO_RESOURCES.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/NO_RESOURCES.java diff --git a/corba/src/share/classes/org/omg/CORBA/NO_RESPONSE.java b/corba/src/java.corba/share/classes/org/omg/CORBA/NO_RESPONSE.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/NO_RESPONSE.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/NO_RESPONSE.java diff --git a/corba/src/share/classes/org/omg/CORBA/NVList.java b/corba/src/java.corba/share/classes/org/omg/CORBA/NVList.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/NVList.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/NVList.java diff --git a/corba/src/share/classes/org/omg/CORBA/NameValuePair.java b/corba/src/java.corba/share/classes/org/omg/CORBA/NameValuePair.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/NameValuePair.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/NameValuePair.java diff --git a/corba/src/share/classes/org/omg/CORBA/NameValuePairHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/NameValuePairHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/NameValuePairHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/NameValuePairHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/NamedValue.java b/corba/src/java.corba/share/classes/org/omg/CORBA/NamedValue.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/NamedValue.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/NamedValue.java diff --git a/corba/src/share/classes/org/omg/CORBA/OBJECT_NOT_EXIST.java b/corba/src/java.corba/share/classes/org/omg/CORBA/OBJECT_NOT_EXIST.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/OBJECT_NOT_EXIST.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/OBJECT_NOT_EXIST.java diff --git a/corba/src/share/classes/org/omg/CORBA/OBJ_ADAPTER.java b/corba/src/java.corba/share/classes/org/omg/CORBA/OBJ_ADAPTER.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/OBJ_ADAPTER.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/OBJ_ADAPTER.java diff --git a/corba/src/share/classes/org/omg/CORBA/OMGVMCID.java b/corba/src/java.corba/share/classes/org/omg/CORBA/OMGVMCID.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/OMGVMCID.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/OMGVMCID.java diff --git a/corba/src/share/classes/org/omg/CORBA/ORB.java b/corba/src/java.corba/share/classes/org/omg/CORBA/ORB.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/ORB.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/ORB.java diff --git a/corba/src/share/classes/org/omg/CORBA/ORBPackage/InconsistentTypeCode.java b/corba/src/java.corba/share/classes/org/omg/CORBA/ORBPackage/InconsistentTypeCode.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/ORBPackage/InconsistentTypeCode.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/ORBPackage/InconsistentTypeCode.java diff --git a/corba/src/share/classes/org/omg/CORBA/ORBPackage/InvalidName.java b/corba/src/java.corba/share/classes/org/omg/CORBA/ORBPackage/InvalidName.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/ORBPackage/InvalidName.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/ORBPackage/InvalidName.java diff --git a/corba/src/share/classes/org/omg/CORBA/ORBPackage/package.html b/corba/src/java.corba/share/classes/org/omg/CORBA/ORBPackage/package.html similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/ORBPackage/package.html rename to corba/src/java.corba/share/classes/org/omg/CORBA/ORBPackage/package.html diff --git a/corba/src/share/classes/org/omg/CORBA/Object.java b/corba/src/java.corba/share/classes/org/omg/CORBA/Object.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/Object.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/Object.java diff --git a/corba/src/share/classes/org/omg/CORBA/ObjectHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/ObjectHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/ObjectHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/ObjectHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/ObjectHolder.java b/corba/src/java.corba/share/classes/org/omg/CORBA/ObjectHolder.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/ObjectHolder.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/ObjectHolder.java diff --git a/corba/src/share/classes/org/omg/CORBA/OctetSeqHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/OctetSeqHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/OctetSeqHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/OctetSeqHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/OctetSeqHolder.java b/corba/src/java.corba/share/classes/org/omg/CORBA/OctetSeqHolder.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/OctetSeqHolder.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/OctetSeqHolder.java diff --git a/corba/src/share/classes/org/omg/CORBA/PERSIST_STORE.java b/corba/src/java.corba/share/classes/org/omg/CORBA/PERSIST_STORE.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/PERSIST_STORE.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/PERSIST_STORE.java diff --git a/corba/src/share/classes/org/omg/CORBA/PRIVATE_MEMBER.java b/corba/src/java.corba/share/classes/org/omg/CORBA/PRIVATE_MEMBER.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/PRIVATE_MEMBER.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/PRIVATE_MEMBER.java diff --git a/corba/src/share/classes/org/omg/CORBA/PUBLIC_MEMBER.java b/corba/src/java.corba/share/classes/org/omg/CORBA/PUBLIC_MEMBER.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/PUBLIC_MEMBER.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/PUBLIC_MEMBER.java diff --git a/corba/src/share/classes/org/omg/CORBA/Policy.java b/corba/src/java.corba/share/classes/org/omg/CORBA/Policy.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/Policy.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/Policy.java diff --git a/corba/src/share/classes/org/omg/CORBA/PolicyError.java b/corba/src/java.corba/share/classes/org/omg/CORBA/PolicyError.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/PolicyError.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/PolicyError.java diff --git a/corba/src/share/classes/org/omg/CORBA/PolicyHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/PolicyHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/PolicyHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/PolicyHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/PolicyHolder.java b/corba/src/java.corba/share/classes/org/omg/CORBA/PolicyHolder.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/PolicyHolder.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/PolicyHolder.java diff --git a/corba/src/share/classes/org/omg/CORBA/PolicyListHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/PolicyListHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/PolicyListHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/PolicyListHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/PolicyListHolder.java b/corba/src/java.corba/share/classes/org/omg/CORBA/PolicyListHolder.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/PolicyListHolder.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/PolicyListHolder.java diff --git a/corba/src/share/classes/org/omg/CORBA/PolicyOperations.java b/corba/src/java.corba/share/classes/org/omg/CORBA/PolicyOperations.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/PolicyOperations.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/PolicyOperations.java diff --git a/corba/src/share/classes/org/omg/CORBA/PolicyTypeHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/PolicyTypeHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/PolicyTypeHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/PolicyTypeHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/Principal.java b/corba/src/java.corba/share/classes/org/omg/CORBA/Principal.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/Principal.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/Principal.java diff --git a/corba/src/share/classes/org/omg/CORBA/PrincipalHolder.java b/corba/src/java.corba/share/classes/org/omg/CORBA/PrincipalHolder.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/PrincipalHolder.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/PrincipalHolder.java diff --git a/corba/src/share/classes/org/omg/CORBA/REBIND.java b/corba/src/java.corba/share/classes/org/omg/CORBA/REBIND.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/REBIND.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/REBIND.java diff --git a/corba/src/share/classes/org/omg/CORBA/RepositoryIdHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/RepositoryIdHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/RepositoryIdHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/RepositoryIdHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/Request.java b/corba/src/java.corba/share/classes/org/omg/CORBA/Request.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/Request.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/Request.java diff --git a/corba/src/share/classes/org/omg/CORBA/ServerRequest.java b/corba/src/java.corba/share/classes/org/omg/CORBA/ServerRequest.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/ServerRequest.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/ServerRequest.java diff --git a/corba/src/share/classes/org/omg/CORBA/ServiceDetail.java b/corba/src/java.corba/share/classes/org/omg/CORBA/ServiceDetail.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/ServiceDetail.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/ServiceDetail.java diff --git a/corba/src/share/classes/org/omg/CORBA/ServiceDetailHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/ServiceDetailHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/ServiceDetailHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/ServiceDetailHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/ServiceInformation.java b/corba/src/java.corba/share/classes/org/omg/CORBA/ServiceInformation.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/ServiceInformation.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/ServiceInformation.java diff --git a/corba/src/share/classes/org/omg/CORBA/ServiceInformationHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/ServiceInformationHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/ServiceInformationHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/ServiceInformationHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/ServiceInformationHolder.java b/corba/src/java.corba/share/classes/org/omg/CORBA/ServiceInformationHolder.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/ServiceInformationHolder.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/ServiceInformationHolder.java diff --git a/corba/src/share/classes/org/omg/CORBA/SetOverrideType.java b/corba/src/java.corba/share/classes/org/omg/CORBA/SetOverrideType.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/SetOverrideType.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/SetOverrideType.java diff --git a/corba/src/share/classes/org/omg/CORBA/SetOverrideTypeHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/SetOverrideTypeHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/SetOverrideTypeHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/SetOverrideTypeHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/ShortHolder.java b/corba/src/java.corba/share/classes/org/omg/CORBA/ShortHolder.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/ShortHolder.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/ShortHolder.java diff --git a/corba/src/share/classes/org/omg/CORBA/ShortSeqHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/ShortSeqHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/ShortSeqHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/ShortSeqHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/ShortSeqHolder.java b/corba/src/java.corba/share/classes/org/omg/CORBA/ShortSeqHolder.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/ShortSeqHolder.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/ShortSeqHolder.java diff --git a/corba/src/share/classes/org/omg/CORBA/StringHolder.java b/corba/src/java.corba/share/classes/org/omg/CORBA/StringHolder.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/StringHolder.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/StringHolder.java diff --git a/corba/src/share/classes/org/omg/CORBA/StringValueHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/StringValueHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/StringValueHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/StringValueHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/StructMember.java b/corba/src/java.corba/share/classes/org/omg/CORBA/StructMember.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/StructMember.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/StructMember.java diff --git a/corba/src/share/classes/org/omg/CORBA/StructMemberHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/StructMemberHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/StructMemberHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/StructMemberHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/SystemException.java b/corba/src/java.corba/share/classes/org/omg/CORBA/SystemException.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/SystemException.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/SystemException.java diff --git a/corba/src/share/classes/org/omg/CORBA/TCKind.java b/corba/src/java.corba/share/classes/org/omg/CORBA/TCKind.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/TCKind.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/TCKind.java diff --git a/corba/src/share/classes/org/omg/CORBA/TIMEOUT.java b/corba/src/java.corba/share/classes/org/omg/CORBA/TIMEOUT.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/TIMEOUT.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/TIMEOUT.java diff --git a/corba/src/share/classes/org/omg/CORBA/TRANSACTION_MODE.java b/corba/src/java.corba/share/classes/org/omg/CORBA/TRANSACTION_MODE.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/TRANSACTION_MODE.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/TRANSACTION_MODE.java diff --git a/corba/src/share/classes/org/omg/CORBA/TRANSACTION_REQUIRED.java b/corba/src/java.corba/share/classes/org/omg/CORBA/TRANSACTION_REQUIRED.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/TRANSACTION_REQUIRED.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/TRANSACTION_REQUIRED.java diff --git a/corba/src/share/classes/org/omg/CORBA/TRANSACTION_ROLLEDBACK.java b/corba/src/java.corba/share/classes/org/omg/CORBA/TRANSACTION_ROLLEDBACK.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/TRANSACTION_ROLLEDBACK.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/TRANSACTION_ROLLEDBACK.java diff --git a/corba/src/share/classes/org/omg/CORBA/TRANSACTION_UNAVAILABLE.java b/corba/src/java.corba/share/classes/org/omg/CORBA/TRANSACTION_UNAVAILABLE.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/TRANSACTION_UNAVAILABLE.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/TRANSACTION_UNAVAILABLE.java diff --git a/corba/src/share/classes/org/omg/CORBA/TRANSIENT.java b/corba/src/java.corba/share/classes/org/omg/CORBA/TRANSIENT.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/TRANSIENT.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/TRANSIENT.java diff --git a/corba/src/share/classes/org/omg/CORBA/TypeCode.java b/corba/src/java.corba/share/classes/org/omg/CORBA/TypeCode.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/TypeCode.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/TypeCode.java diff --git a/corba/src/share/classes/org/omg/CORBA/TypeCodeHolder.java b/corba/src/java.corba/share/classes/org/omg/CORBA/TypeCodeHolder.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/TypeCodeHolder.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/TypeCodeHolder.java diff --git a/corba/src/share/classes/org/omg/CORBA/TypeCodePackage/BadKind.java b/corba/src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/BadKind.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/TypeCodePackage/BadKind.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/BadKind.java diff --git a/corba/src/share/classes/org/omg/CORBA/TypeCodePackage/Bounds.java b/corba/src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/Bounds.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/TypeCodePackage/Bounds.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/Bounds.java diff --git a/corba/src/share/classes/org/omg/CORBA/TypeCodePackage/package.html b/corba/src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/package.html similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/TypeCodePackage/package.html rename to corba/src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/package.html diff --git a/corba/src/share/classes/org/omg/CORBA/ULongLongSeqHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/ULongLongSeqHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/ULongLongSeqHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/ULongLongSeqHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/ULongLongSeqHolder.java b/corba/src/java.corba/share/classes/org/omg/CORBA/ULongLongSeqHolder.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/ULongLongSeqHolder.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/ULongLongSeqHolder.java diff --git a/corba/src/share/classes/org/omg/CORBA/ULongSeqHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/ULongSeqHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/ULongSeqHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/ULongSeqHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/ULongSeqHolder.java b/corba/src/java.corba/share/classes/org/omg/CORBA/ULongSeqHolder.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/ULongSeqHolder.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/ULongSeqHolder.java diff --git a/corba/src/share/classes/org/omg/CORBA/UNKNOWN.java b/corba/src/java.corba/share/classes/org/omg/CORBA/UNKNOWN.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/UNKNOWN.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/UNKNOWN.java diff --git a/corba/src/share/classes/org/omg/CORBA/UNSUPPORTED_POLICY.java b/corba/src/java.corba/share/classes/org/omg/CORBA/UNSUPPORTED_POLICY.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/UNSUPPORTED_POLICY.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/UNSUPPORTED_POLICY.java diff --git a/corba/src/share/classes/org/omg/CORBA/UNSUPPORTED_POLICY_VALUE.java b/corba/src/java.corba/share/classes/org/omg/CORBA/UNSUPPORTED_POLICY_VALUE.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/UNSUPPORTED_POLICY_VALUE.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/UNSUPPORTED_POLICY_VALUE.java diff --git a/corba/src/share/classes/org/omg/CORBA/UShortSeqHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/UShortSeqHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/UShortSeqHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/UShortSeqHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/UShortSeqHolder.java b/corba/src/java.corba/share/classes/org/omg/CORBA/UShortSeqHolder.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/UShortSeqHolder.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/UShortSeqHolder.java diff --git a/corba/src/share/classes/org/omg/CORBA/UnionMember.java b/corba/src/java.corba/share/classes/org/omg/CORBA/UnionMember.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/UnionMember.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/UnionMember.java diff --git a/corba/src/share/classes/org/omg/CORBA/UnionMemberHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/UnionMemberHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/UnionMemberHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/UnionMemberHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/UnknownUserException.java b/corba/src/java.corba/share/classes/org/omg/CORBA/UnknownUserException.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/UnknownUserException.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/UnknownUserException.java diff --git a/corba/src/share/classes/org/omg/CORBA/UnknownUserExceptionHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/UnknownUserExceptionHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/UnknownUserExceptionHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/UnknownUserExceptionHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/UnknownUserExceptionHolder.java b/corba/src/java.corba/share/classes/org/omg/CORBA/UnknownUserExceptionHolder.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/UnknownUserExceptionHolder.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/UnknownUserExceptionHolder.java diff --git a/corba/src/share/classes/org/omg/CORBA/UserException.java b/corba/src/java.corba/share/classes/org/omg/CORBA/UserException.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/UserException.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/UserException.java diff --git a/corba/src/share/classes/org/omg/CORBA/VM_ABSTRACT.java b/corba/src/java.corba/share/classes/org/omg/CORBA/VM_ABSTRACT.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/VM_ABSTRACT.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/VM_ABSTRACT.java diff --git a/corba/src/share/classes/org/omg/CORBA/VM_CUSTOM.java b/corba/src/java.corba/share/classes/org/omg/CORBA/VM_CUSTOM.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/VM_CUSTOM.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/VM_CUSTOM.java diff --git a/corba/src/share/classes/org/omg/CORBA/VM_NONE.java b/corba/src/java.corba/share/classes/org/omg/CORBA/VM_NONE.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/VM_NONE.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/VM_NONE.java diff --git a/corba/src/share/classes/org/omg/CORBA/VM_TRUNCATABLE.java b/corba/src/java.corba/share/classes/org/omg/CORBA/VM_TRUNCATABLE.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/VM_TRUNCATABLE.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/VM_TRUNCATABLE.java diff --git a/corba/src/share/classes/org/omg/CORBA/ValueBaseHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/ValueBaseHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/ValueBaseHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/ValueBaseHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/ValueBaseHolder.java b/corba/src/java.corba/share/classes/org/omg/CORBA/ValueBaseHolder.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/ValueBaseHolder.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/ValueBaseHolder.java diff --git a/corba/src/share/classes/org/omg/CORBA/ValueMember.java b/corba/src/java.corba/share/classes/org/omg/CORBA/ValueMember.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/ValueMember.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/ValueMember.java diff --git a/corba/src/share/classes/org/omg/CORBA/ValueMemberHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/ValueMemberHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/ValueMemberHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/ValueMemberHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/VersionSpecHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/VersionSpecHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/VersionSpecHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/VersionSpecHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/VisibilityHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/VisibilityHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/VisibilityHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/VisibilityHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/WCharSeqHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/WCharSeqHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/WCharSeqHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/WCharSeqHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/WCharSeqHolder.java b/corba/src/java.corba/share/classes/org/omg/CORBA/WCharSeqHolder.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/WCharSeqHolder.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/WCharSeqHolder.java diff --git a/corba/src/share/classes/org/omg/CORBA/WStringValueHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/WStringValueHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/WStringValueHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/WStringValueHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/WrongTransaction.java b/corba/src/java.corba/share/classes/org/omg/CORBA/WrongTransaction.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/WrongTransaction.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/WrongTransaction.java diff --git a/corba/src/share/classes/org/omg/CORBA/WrongTransactionHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/WrongTransactionHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/WrongTransactionHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/WrongTransactionHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/WrongTransactionHolder.java b/corba/src/java.corba/share/classes/org/omg/CORBA/WrongTransactionHolder.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/WrongTransactionHolder.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/WrongTransactionHolder.java diff --git a/corba/src/share/classes/org/omg/CORBA/_IDLTypeStub.java b/corba/src/java.corba/share/classes/org/omg/CORBA/_IDLTypeStub.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/_IDLTypeStub.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/_IDLTypeStub.java diff --git a/corba/src/share/classes/org/omg/CORBA/_PolicyStub.java b/corba/src/java.corba/share/classes/org/omg/CORBA/_PolicyStub.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/_PolicyStub.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/_PolicyStub.java diff --git a/corba/src/share/classes/org/omg/CORBA/doc-files/compliance.html b/corba/src/java.corba/share/classes/org/omg/CORBA/doc-files/compliance.html similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/doc-files/compliance.html rename to corba/src/java.corba/share/classes/org/omg/CORBA/doc-files/compliance.html diff --git a/corba/src/share/classes/org/omg/CORBA/doc-files/generatedfiles.html b/corba/src/java.corba/share/classes/org/omg/CORBA/doc-files/generatedfiles.html similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/doc-files/generatedfiles.html rename to corba/src/java.corba/share/classes/org/omg/CORBA/doc-files/generatedfiles.html diff --git a/corba/src/share/classes/org/omg/CORBA/ir.idl b/corba/src/java.corba/share/classes/org/omg/CORBA/ir.idl similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/ir.idl rename to corba/src/java.corba/share/classes/org/omg/CORBA/ir.idl diff --git a/corba/src/share/classes/org/omg/CORBA/orb.idl b/corba/src/java.corba/share/classes/org/omg/CORBA/orb.idl similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/orb.idl rename to corba/src/java.corba/share/classes/org/omg/CORBA/orb.idl diff --git a/corba/src/share/classes/org/omg/CORBA/package.html b/corba/src/java.corba/share/classes/org/omg/CORBA/package.html similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/package.html rename to corba/src/java.corba/share/classes/org/omg/CORBA/package.html diff --git a/corba/src/share/classes/org/omg/CORBA/portable/ApplicationException.java b/corba/src/java.corba/share/classes/org/omg/CORBA/portable/ApplicationException.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/portable/ApplicationException.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/portable/ApplicationException.java diff --git a/corba/src/share/classes/org/omg/CORBA/portable/BoxedValueHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/portable/BoxedValueHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/portable/BoxedValueHelper.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/portable/BoxedValueHelper.java diff --git a/corba/src/share/classes/org/omg/CORBA/portable/CustomValue.java b/corba/src/java.corba/share/classes/org/omg/CORBA/portable/CustomValue.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/portable/CustomValue.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/portable/CustomValue.java diff --git a/corba/src/share/classes/org/omg/CORBA/portable/Delegate.java b/corba/src/java.corba/share/classes/org/omg/CORBA/portable/Delegate.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/portable/Delegate.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/portable/Delegate.java diff --git a/corba/src/share/classes/org/omg/CORBA/portable/IDLEntity.java b/corba/src/java.corba/share/classes/org/omg/CORBA/portable/IDLEntity.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/portable/IDLEntity.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/portable/IDLEntity.java diff --git a/corba/src/share/classes/org/omg/CORBA/portable/IndirectionException.java b/corba/src/java.corba/share/classes/org/omg/CORBA/portable/IndirectionException.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/portable/IndirectionException.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/portable/IndirectionException.java diff --git a/corba/src/share/classes/org/omg/CORBA/portable/InputStream.java b/corba/src/java.corba/share/classes/org/omg/CORBA/portable/InputStream.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/portable/InputStream.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/portable/InputStream.java diff --git a/corba/src/share/classes/org/omg/CORBA/portable/InvokeHandler.java b/corba/src/java.corba/share/classes/org/omg/CORBA/portable/InvokeHandler.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/portable/InvokeHandler.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/portable/InvokeHandler.java diff --git a/corba/src/share/classes/org/omg/CORBA/portable/ObjectImpl.java b/corba/src/java.corba/share/classes/org/omg/CORBA/portable/ObjectImpl.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/portable/ObjectImpl.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/portable/ObjectImpl.java diff --git a/corba/src/share/classes/org/omg/CORBA/portable/OutputStream.java b/corba/src/java.corba/share/classes/org/omg/CORBA/portable/OutputStream.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/portable/OutputStream.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/portable/OutputStream.java diff --git a/corba/src/share/classes/org/omg/CORBA/portable/RemarshalException.java b/corba/src/java.corba/share/classes/org/omg/CORBA/portable/RemarshalException.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/portable/RemarshalException.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/portable/RemarshalException.java diff --git a/corba/src/share/classes/org/omg/CORBA/portable/ResponseHandler.java b/corba/src/java.corba/share/classes/org/omg/CORBA/portable/ResponseHandler.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/portable/ResponseHandler.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/portable/ResponseHandler.java diff --git a/corba/src/share/classes/org/omg/CORBA/portable/ServantObject.java b/corba/src/java.corba/share/classes/org/omg/CORBA/portable/ServantObject.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/portable/ServantObject.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/portable/ServantObject.java diff --git a/corba/src/share/classes/org/omg/CORBA/portable/Streamable.java b/corba/src/java.corba/share/classes/org/omg/CORBA/portable/Streamable.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/portable/Streamable.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/portable/Streamable.java diff --git a/corba/src/share/classes/org/omg/CORBA/portable/StreamableValue.java b/corba/src/java.corba/share/classes/org/omg/CORBA/portable/StreamableValue.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/portable/StreamableValue.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/portable/StreamableValue.java diff --git a/corba/src/share/classes/org/omg/CORBA/portable/UnknownException.java b/corba/src/java.corba/share/classes/org/omg/CORBA/portable/UnknownException.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/portable/UnknownException.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/portable/UnknownException.java diff --git a/corba/src/share/classes/org/omg/CORBA/portable/ValueBase.java b/corba/src/java.corba/share/classes/org/omg/CORBA/portable/ValueBase.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/portable/ValueBase.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/portable/ValueBase.java diff --git a/corba/src/share/classes/org/omg/CORBA/portable/ValueFactory.java b/corba/src/java.corba/share/classes/org/omg/CORBA/portable/ValueFactory.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/portable/ValueFactory.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/portable/ValueFactory.java diff --git a/corba/src/share/classes/org/omg/CORBA/portable/ValueInputStream.java b/corba/src/java.corba/share/classes/org/omg/CORBA/portable/ValueInputStream.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/portable/ValueInputStream.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/portable/ValueInputStream.java diff --git a/corba/src/share/classes/org/omg/CORBA/portable/ValueOutputStream.java b/corba/src/java.corba/share/classes/org/omg/CORBA/portable/ValueOutputStream.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/portable/ValueOutputStream.java rename to corba/src/java.corba/share/classes/org/omg/CORBA/portable/ValueOutputStream.java diff --git a/corba/src/share/classes/org/omg/CORBA/portable/package.html b/corba/src/java.corba/share/classes/org/omg/CORBA/portable/package.html similarity index 100% rename from corba/src/share/classes/org/omg/CORBA/portable/package.html rename to corba/src/java.corba/share/classes/org/omg/CORBA/portable/package.html diff --git a/corba/src/share/classes/org/omg/CORBA_2_3/ORB.java b/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/ORB.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA_2_3/ORB.java rename to corba/src/java.corba/share/classes/org/omg/CORBA_2_3/ORB.java diff --git a/corba/src/share/classes/org/omg/CORBA_2_3/package.html b/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/package.html similarity index 100% rename from corba/src/share/classes/org/omg/CORBA_2_3/package.html rename to corba/src/java.corba/share/classes/org/omg/CORBA_2_3/package.html diff --git a/corba/src/share/classes/org/omg/CORBA_2_3/portable/Delegate.java b/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/Delegate.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA_2_3/portable/Delegate.java rename to corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/Delegate.java diff --git a/corba/src/share/classes/org/omg/CORBA_2_3/portable/InputStream.java b/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/InputStream.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA_2_3/portable/InputStream.java rename to corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/InputStream.java diff --git a/corba/src/share/classes/org/omg/CORBA_2_3/portable/ObjectImpl.java b/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/ObjectImpl.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA_2_3/portable/ObjectImpl.java rename to corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/ObjectImpl.java diff --git a/corba/src/share/classes/org/omg/CORBA_2_3/portable/OutputStream.java b/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/OutputStream.java similarity index 100% rename from corba/src/share/classes/org/omg/CORBA_2_3/portable/OutputStream.java rename to corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/OutputStream.java diff --git a/corba/src/share/classes/org/omg/CORBA_2_3/portable/package.html b/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/package.html similarity index 100% rename from corba/src/share/classes/org/omg/CORBA_2_3/portable/package.html rename to corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/package.html diff --git a/corba/src/share/classes/org/omg/CosNaming/NamingContextExtPackage/package.html b/corba/src/java.corba/share/classes/org/omg/CosNaming/NamingContextExtPackage/package.html similarity index 100% rename from corba/src/share/classes/org/omg/CosNaming/NamingContextExtPackage/package.html rename to corba/src/java.corba/share/classes/org/omg/CosNaming/NamingContextExtPackage/package.html diff --git a/corba/src/share/classes/org/omg/CosNaming/NamingContextPackage/package.html b/corba/src/java.corba/share/classes/org/omg/CosNaming/NamingContextPackage/package.html similarity index 100% rename from corba/src/share/classes/org/omg/CosNaming/NamingContextPackage/package.html rename to corba/src/java.corba/share/classes/org/omg/CosNaming/NamingContextPackage/package.html diff --git a/corba/src/share/classes/org/omg/CosNaming/_BindingIteratorImplBase.java b/corba/src/java.corba/share/classes/org/omg/CosNaming/_BindingIteratorImplBase.java similarity index 100% rename from corba/src/share/classes/org/omg/CosNaming/_BindingIteratorImplBase.java rename to corba/src/java.corba/share/classes/org/omg/CosNaming/_BindingIteratorImplBase.java diff --git a/corba/src/share/classes/org/omg/CosNaming/_NamingContextImplBase.java b/corba/src/java.corba/share/classes/org/omg/CosNaming/_NamingContextImplBase.java similarity index 100% rename from corba/src/share/classes/org/omg/CosNaming/_NamingContextImplBase.java rename to corba/src/java.corba/share/classes/org/omg/CosNaming/_NamingContextImplBase.java diff --git a/corba/src/share/classes/org/omg/CosNaming/nameservice.idl b/corba/src/java.corba/share/classes/org/omg/CosNaming/nameservice.idl similarity index 100% rename from corba/src/share/classes/org/omg/CosNaming/nameservice.idl rename to corba/src/java.corba/share/classes/org/omg/CosNaming/nameservice.idl diff --git a/corba/src/share/classes/org/omg/CosNaming/package.html b/corba/src/java.corba/share/classes/org/omg/CosNaming/package.html similarity index 100% rename from corba/src/share/classes/org/omg/CosNaming/package.html rename to corba/src/java.corba/share/classes/org/omg/CosNaming/package.html diff --git a/corba/src/share/classes/org/omg/Dynamic/package.html b/corba/src/java.corba/share/classes/org/omg/Dynamic/package.html similarity index 100% rename from corba/src/share/classes/org/omg/Dynamic/package.html rename to corba/src/java.corba/share/classes/org/omg/Dynamic/package.html diff --git a/corba/src/share/classes/org/omg/DynamicAny/DynAnyFactoryPackage/package.html b/corba/src/java.corba/share/classes/org/omg/DynamicAny/DynAnyFactoryPackage/package.html similarity index 100% rename from corba/src/share/classes/org/omg/DynamicAny/DynAnyFactoryPackage/package.html rename to corba/src/java.corba/share/classes/org/omg/DynamicAny/DynAnyFactoryPackage/package.html diff --git a/corba/src/share/classes/org/omg/DynamicAny/DynAnyPackage/package.html b/corba/src/java.corba/share/classes/org/omg/DynamicAny/DynAnyPackage/package.html similarity index 100% rename from corba/src/share/classes/org/omg/DynamicAny/DynAnyPackage/package.html rename to corba/src/java.corba/share/classes/org/omg/DynamicAny/DynAnyPackage/package.html diff --git a/corba/src/share/classes/org/omg/DynamicAny/DynamicAny.idl b/corba/src/java.corba/share/classes/org/omg/DynamicAny/DynamicAny.idl similarity index 100% rename from corba/src/share/classes/org/omg/DynamicAny/DynamicAny.idl rename to corba/src/java.corba/share/classes/org/omg/DynamicAny/DynamicAny.idl diff --git a/corba/src/share/classes/org/omg/DynamicAny/package.html b/corba/src/java.corba/share/classes/org/omg/DynamicAny/package.html similarity index 100% rename from corba/src/share/classes/org/omg/DynamicAny/package.html rename to corba/src/java.corba/share/classes/org/omg/DynamicAny/package.html diff --git a/corba/src/share/classes/org/omg/IOP/CodecFactoryPackage/package.html b/corba/src/java.corba/share/classes/org/omg/IOP/CodecFactoryPackage/package.html similarity index 100% rename from corba/src/share/classes/org/omg/IOP/CodecFactoryPackage/package.html rename to corba/src/java.corba/share/classes/org/omg/IOP/CodecFactoryPackage/package.html diff --git a/corba/src/share/classes/org/omg/IOP/CodecPackage/package.html b/corba/src/java.corba/share/classes/org/omg/IOP/CodecPackage/package.html similarity index 100% rename from corba/src/share/classes/org/omg/IOP/CodecPackage/package.html rename to corba/src/java.corba/share/classes/org/omg/IOP/CodecPackage/package.html diff --git a/corba/src/share/classes/org/omg/IOP/package.html b/corba/src/java.corba/share/classes/org/omg/IOP/package.html similarity index 100% rename from corba/src/share/classes/org/omg/IOP/package.html rename to corba/src/java.corba/share/classes/org/omg/IOP/package.html diff --git a/corba/src/share/classes/org/omg/Messaging/package.html b/corba/src/java.corba/share/classes/org/omg/Messaging/package.html similarity index 100% rename from corba/src/share/classes/org/omg/Messaging/package.html rename to corba/src/java.corba/share/classes/org/omg/Messaging/package.html diff --git a/corba/src/share/classes/org/omg/PortableInterceptor/CORBAX.idl b/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/CORBAX.idl similarity index 100% rename from corba/src/share/classes/org/omg/PortableInterceptor/CORBAX.idl rename to corba/src/java.corba/share/classes/org/omg/PortableInterceptor/CORBAX.idl diff --git a/corba/src/share/classes/org/omg/PortableInterceptor/IOP.idl b/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/IOP.idl similarity index 100% rename from corba/src/share/classes/org/omg/PortableInterceptor/IOP.idl rename to corba/src/java.corba/share/classes/org/omg/PortableInterceptor/IOP.idl diff --git a/corba/src/share/classes/org/omg/PortableInterceptor/Interceptors.idl b/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/Interceptors.idl similarity index 100% rename from corba/src/share/classes/org/omg/PortableInterceptor/Interceptors.idl rename to corba/src/java.corba/share/classes/org/omg/PortableInterceptor/Interceptors.idl diff --git a/corba/src/share/classes/org/omg/PortableInterceptor/Messaging.idl b/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/Messaging.idl similarity index 100% rename from corba/src/share/classes/org/omg/PortableInterceptor/Messaging.idl rename to corba/src/java.corba/share/classes/org/omg/PortableInterceptor/Messaging.idl diff --git a/corba/src/share/classes/org/omg/PortableInterceptor/ORBInitInfoPackage/package.html b/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/ORBInitInfoPackage/package.html similarity index 100% rename from corba/src/share/classes/org/omg/PortableInterceptor/ORBInitInfoPackage/package.html rename to corba/src/java.corba/share/classes/org/omg/PortableInterceptor/ORBInitInfoPackage/package.html diff --git a/corba/src/share/classes/org/omg/PortableInterceptor/package.html b/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/package.html similarity index 100% rename from corba/src/share/classes/org/omg/PortableInterceptor/package.html rename to corba/src/java.corba/share/classes/org/omg/PortableInterceptor/package.html diff --git a/corba/src/share/classes/org/omg/PortableServer/CurrentHelper.java b/corba/src/java.corba/share/classes/org/omg/PortableServer/CurrentHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/PortableServer/CurrentHelper.java rename to corba/src/java.corba/share/classes/org/omg/PortableServer/CurrentHelper.java diff --git a/corba/src/share/classes/org/omg/PortableServer/CurrentPackage/package.html b/corba/src/java.corba/share/classes/org/omg/PortableServer/CurrentPackage/package.html similarity index 100% rename from corba/src/share/classes/org/omg/PortableServer/CurrentPackage/package.html rename to corba/src/java.corba/share/classes/org/omg/PortableServer/CurrentPackage/package.html diff --git a/corba/src/share/classes/org/omg/PortableServer/DynamicImplementation.java b/corba/src/java.corba/share/classes/org/omg/PortableServer/DynamicImplementation.java similarity index 100% rename from corba/src/share/classes/org/omg/PortableServer/DynamicImplementation.java rename to corba/src/java.corba/share/classes/org/omg/PortableServer/DynamicImplementation.java diff --git a/corba/src/share/classes/org/omg/PortableServer/POAHelper.java b/corba/src/java.corba/share/classes/org/omg/PortableServer/POAHelper.java similarity index 100% rename from corba/src/share/classes/org/omg/PortableServer/POAHelper.java rename to corba/src/java.corba/share/classes/org/omg/PortableServer/POAHelper.java diff --git a/corba/src/share/classes/org/omg/PortableServer/POAManagerPackage/package.html b/corba/src/java.corba/share/classes/org/omg/PortableServer/POAManagerPackage/package.html similarity index 100% rename from corba/src/share/classes/org/omg/PortableServer/POAManagerPackage/package.html rename to corba/src/java.corba/share/classes/org/omg/PortableServer/POAManagerPackage/package.html diff --git a/corba/src/share/classes/org/omg/PortableServer/POAPackage/package.html b/corba/src/java.corba/share/classes/org/omg/PortableServer/POAPackage/package.html similarity index 100% rename from corba/src/share/classes/org/omg/PortableServer/POAPackage/package.html rename to corba/src/java.corba/share/classes/org/omg/PortableServer/POAPackage/package.html diff --git a/corba/src/share/classes/org/omg/PortableServer/Servant.java b/corba/src/java.corba/share/classes/org/omg/PortableServer/Servant.java similarity index 100% rename from corba/src/share/classes/org/omg/PortableServer/Servant.java rename to corba/src/java.corba/share/classes/org/omg/PortableServer/Servant.java diff --git a/corba/src/share/classes/org/omg/PortableServer/ServantLocatorPackage/CookieHolder.java b/corba/src/java.corba/share/classes/org/omg/PortableServer/ServantLocatorPackage/CookieHolder.java similarity index 100% rename from corba/src/share/classes/org/omg/PortableServer/ServantLocatorPackage/CookieHolder.java rename to corba/src/java.corba/share/classes/org/omg/PortableServer/ServantLocatorPackage/CookieHolder.java diff --git a/corba/src/share/classes/org/omg/PortableServer/ServantLocatorPackage/package.html b/corba/src/java.corba/share/classes/org/omg/PortableServer/ServantLocatorPackage/package.html similarity index 100% rename from corba/src/share/classes/org/omg/PortableServer/ServantLocatorPackage/package.html rename to corba/src/java.corba/share/classes/org/omg/PortableServer/ServantLocatorPackage/package.html diff --git a/corba/src/share/classes/org/omg/PortableServer/corba.idl b/corba/src/java.corba/share/classes/org/omg/PortableServer/corba.idl similarity index 100% rename from corba/src/share/classes/org/omg/PortableServer/corba.idl rename to corba/src/java.corba/share/classes/org/omg/PortableServer/corba.idl diff --git a/corba/src/share/classes/org/omg/PortableServer/package.html b/corba/src/java.corba/share/classes/org/omg/PortableServer/package.html similarity index 100% rename from corba/src/share/classes/org/omg/PortableServer/package.html rename to corba/src/java.corba/share/classes/org/omg/PortableServer/package.html diff --git a/corba/src/share/classes/org/omg/PortableServer/poa.idl b/corba/src/java.corba/share/classes/org/omg/PortableServer/poa.idl similarity index 100% rename from corba/src/share/classes/org/omg/PortableServer/poa.idl rename to corba/src/java.corba/share/classes/org/omg/PortableServer/poa.idl diff --git a/corba/src/share/classes/org/omg/PortableServer/portable/Delegate.java b/corba/src/java.corba/share/classes/org/omg/PortableServer/portable/Delegate.java similarity index 100% rename from corba/src/share/classes/org/omg/PortableServer/portable/Delegate.java rename to corba/src/java.corba/share/classes/org/omg/PortableServer/portable/Delegate.java diff --git a/corba/src/share/classes/org/omg/PortableServer/portable/package.html b/corba/src/java.corba/share/classes/org/omg/PortableServer/portable/package.html similarity index 100% rename from corba/src/share/classes/org/omg/PortableServer/portable/package.html rename to corba/src/java.corba/share/classes/org/omg/PortableServer/portable/package.html diff --git a/corba/src/share/classes/org/omg/SendingContext/RunTime.java b/corba/src/java.corba/share/classes/org/omg/SendingContext/RunTime.java similarity index 100% rename from corba/src/share/classes/org/omg/SendingContext/RunTime.java rename to corba/src/java.corba/share/classes/org/omg/SendingContext/RunTime.java diff --git a/corba/src/share/classes/org/omg/SendingContext/RunTimeOperations.java b/corba/src/java.corba/share/classes/org/omg/SendingContext/RunTimeOperations.java similarity index 100% rename from corba/src/share/classes/org/omg/SendingContext/RunTimeOperations.java rename to corba/src/java.corba/share/classes/org/omg/SendingContext/RunTimeOperations.java diff --git a/corba/src/share/classes/org/omg/SendingContext/package.html b/corba/src/java.corba/share/classes/org/omg/SendingContext/package.html similarity index 100% rename from corba/src/share/classes/org/omg/SendingContext/package.html rename to corba/src/java.corba/share/classes/org/omg/SendingContext/package.html diff --git a/corba/src/share/classes/org/omg/stub/java/rmi/_Remote_Stub.java b/corba/src/java.corba/share/classes/org/omg/stub/java/rmi/_Remote_Stub.java similarity index 100% rename from corba/src/share/classes/org/omg/stub/java/rmi/_Remote_Stub.java rename to corba/src/java.corba/share/classes/org/omg/stub/java/rmi/_Remote_Stub.java diff --git a/corba/src/share/classes/org/omg/stub/java/rmi/package.html b/corba/src/java.corba/share/classes/org/omg/stub/java/rmi/package.html similarity index 100% rename from corba/src/share/classes/org/omg/stub/java/rmi/package.html rename to corba/src/java.corba/share/classes/org/omg/stub/java/rmi/package.html diff --git a/corba/src/share/classes/sun/corba/Bridge.java b/corba/src/java.corba/share/classes/sun/corba/Bridge.java similarity index 100% rename from corba/src/share/classes/sun/corba/Bridge.java rename to corba/src/java.corba/share/classes/sun/corba/Bridge.java diff --git a/corba/src/share/classes/sun/corba/BridgePermission.java b/corba/src/java.corba/share/classes/sun/corba/BridgePermission.java similarity index 100% rename from corba/src/share/classes/sun/corba/BridgePermission.java rename to corba/src/java.corba/share/classes/sun/corba/BridgePermission.java diff --git a/corba/src/share/classes/sun/corba/EncapsInputStreamFactory.java b/corba/src/java.corba/share/classes/sun/corba/EncapsInputStreamFactory.java similarity index 100% rename from corba/src/share/classes/sun/corba/EncapsInputStreamFactory.java rename to corba/src/java.corba/share/classes/sun/corba/EncapsInputStreamFactory.java diff --git a/corba/src/share/classes/sun/corba/JavaCorbaAccess.java b/corba/src/java.corba/share/classes/sun/corba/JavaCorbaAccess.java similarity index 100% rename from corba/src/share/classes/sun/corba/JavaCorbaAccess.java rename to corba/src/java.corba/share/classes/sun/corba/JavaCorbaAccess.java diff --git a/corba/src/share/classes/sun/corba/OutputStreamFactory.java b/corba/src/java.corba/share/classes/sun/corba/OutputStreamFactory.java similarity index 100% rename from corba/src/share/classes/sun/corba/OutputStreamFactory.java rename to corba/src/java.corba/share/classes/sun/corba/OutputStreamFactory.java diff --git a/corba/src/share/classes/sun/corba/SharedSecrets.java b/corba/src/java.corba/share/classes/sun/corba/SharedSecrets.java similarity index 100% rename from corba/src/share/classes/sun/corba/SharedSecrets.java rename to corba/src/java.corba/share/classes/sun/corba/SharedSecrets.java diff --git a/corba/src/share/classes/sun/corba/package.html b/corba/src/java.corba/share/classes/sun/corba/package.html similarity index 100% rename from corba/src/share/classes/sun/corba/package.html rename to corba/src/java.corba/share/classes/sun/corba/package.html diff --git a/corba/src/share/classes/javax/transaction/xa/XAException.java b/corba/src/java.sql/share/classes/javax/transaction/xa/XAException.java similarity index 100% rename from corba/src/share/classes/javax/transaction/xa/XAException.java rename to corba/src/java.sql/share/classes/javax/transaction/xa/XAException.java diff --git a/corba/src/share/classes/javax/transaction/xa/XAResource.java b/corba/src/java.sql/share/classes/javax/transaction/xa/XAResource.java similarity index 100% rename from corba/src/share/classes/javax/transaction/xa/XAResource.java rename to corba/src/java.sql/share/classes/javax/transaction/xa/XAResource.java diff --git a/corba/src/share/classes/javax/transaction/xa/Xid.java b/corba/src/java.sql/share/classes/javax/transaction/xa/Xid.java similarity index 100% rename from corba/src/share/classes/javax/transaction/xa/Xid.java rename to corba/src/java.sql/share/classes/javax/transaction/xa/Xid.java diff --git a/corba/src/share/classes/javax/transaction/xa/package.html b/corba/src/java.sql/share/classes/javax/transaction/xa/package.html similarity index 100% rename from corba/src/share/classes/javax/transaction/xa/package.html rename to corba/src/java.sql/share/classes/javax/transaction/xa/package.html diff --git a/corba/src/share/classes/sun/rmi/rmic/iiop/AbstractType.java b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/AbstractType.java similarity index 100% rename from corba/src/share/classes/sun/rmi/rmic/iiop/AbstractType.java rename to corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/AbstractType.java diff --git a/corba/src/share/classes/sun/rmi/rmic/iiop/ArrayType.java b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ArrayType.java similarity index 100% rename from corba/src/share/classes/sun/rmi/rmic/iiop/ArrayType.java rename to corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ArrayType.java diff --git a/corba/src/share/classes/sun/rmi/rmic/iiop/BatchEnvironment.java b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/BatchEnvironment.java similarity index 100% rename from corba/src/share/classes/sun/rmi/rmic/iiop/BatchEnvironment.java rename to corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/BatchEnvironment.java diff --git a/corba/src/share/classes/sun/rmi/rmic/iiop/ClassPathLoader.java b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ClassPathLoader.java similarity index 100% rename from corba/src/share/classes/sun/rmi/rmic/iiop/ClassPathLoader.java rename to corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ClassPathLoader.java diff --git a/corba/src/share/classes/sun/rmi/rmic/iiop/ClassType.java b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ClassType.java similarity index 100% rename from corba/src/share/classes/sun/rmi/rmic/iiop/ClassType.java rename to corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ClassType.java diff --git a/corba/src/share/classes/sun/rmi/rmic/iiop/CompoundType.java b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/CompoundType.java similarity index 100% rename from corba/src/share/classes/sun/rmi/rmic/iiop/CompoundType.java rename to corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/CompoundType.java diff --git a/corba/src/share/classes/sun/rmi/rmic/iiop/Constants.java b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/Constants.java similarity index 100% rename from corba/src/share/classes/sun/rmi/rmic/iiop/Constants.java rename to corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/Constants.java diff --git a/corba/src/share/classes/sun/rmi/rmic/iiop/ContextElement.java b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ContextElement.java similarity index 100% rename from corba/src/share/classes/sun/rmi/rmic/iiop/ContextElement.java rename to corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ContextElement.java diff --git a/corba/src/share/classes/sun/rmi/rmic/iiop/ContextStack.java b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ContextStack.java similarity index 100% rename from corba/src/share/classes/sun/rmi/rmic/iiop/ContextStack.java rename to corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ContextStack.java diff --git a/corba/src/share/classes/sun/rmi/rmic/iiop/DirectoryLoader.java b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/DirectoryLoader.java similarity index 100% rename from corba/src/share/classes/sun/rmi/rmic/iiop/DirectoryLoader.java rename to corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/DirectoryLoader.java diff --git a/corba/src/share/classes/sun/rmi/rmic/iiop/Generator.java b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/Generator.java similarity index 100% rename from corba/src/share/classes/sun/rmi/rmic/iiop/Generator.java rename to corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/Generator.java diff --git a/corba/src/share/classes/sun/rmi/rmic/iiop/IDLGenerator.java b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/IDLGenerator.java similarity index 100% rename from corba/src/share/classes/sun/rmi/rmic/iiop/IDLGenerator.java rename to corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/IDLGenerator.java diff --git a/corba/src/share/classes/sun/rmi/rmic/iiop/IDLNames.java b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/IDLNames.java similarity index 100% rename from corba/src/share/classes/sun/rmi/rmic/iiop/IDLNames.java rename to corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/IDLNames.java diff --git a/corba/src/share/classes/sun/rmi/rmic/iiop/ImplementationType.java b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ImplementationType.java similarity index 100% rename from corba/src/share/classes/sun/rmi/rmic/iiop/ImplementationType.java rename to corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ImplementationType.java diff --git a/corba/src/share/classes/sun/rmi/rmic/iiop/InterfaceType.java b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/InterfaceType.java similarity index 100% rename from corba/src/share/classes/sun/rmi/rmic/iiop/InterfaceType.java rename to corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/InterfaceType.java diff --git a/corba/src/share/classes/sun/rmi/rmic/iiop/NCClassType.java b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/NCClassType.java similarity index 100% rename from corba/src/share/classes/sun/rmi/rmic/iiop/NCClassType.java rename to corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/NCClassType.java diff --git a/corba/src/share/classes/sun/rmi/rmic/iiop/NCInterfaceType.java b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/NCInterfaceType.java similarity index 100% rename from corba/src/share/classes/sun/rmi/rmic/iiop/NCInterfaceType.java rename to corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/NCInterfaceType.java diff --git a/corba/src/share/classes/sun/rmi/rmic/iiop/NameContext.java b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/NameContext.java similarity index 100% rename from corba/src/share/classes/sun/rmi/rmic/iiop/NameContext.java rename to corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/NameContext.java diff --git a/corba/src/share/classes/sun/rmi/rmic/iiop/PrimitiveType.java b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/PrimitiveType.java similarity index 100% rename from corba/src/share/classes/sun/rmi/rmic/iiop/PrimitiveType.java rename to corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/PrimitiveType.java diff --git a/corba/src/share/classes/sun/rmi/rmic/iiop/PrintGenerator.java b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/PrintGenerator.java similarity index 100% rename from corba/src/share/classes/sun/rmi/rmic/iiop/PrintGenerator.java rename to corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/PrintGenerator.java diff --git a/corba/src/share/classes/sun/rmi/rmic/iiop/RemoteType.java b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/RemoteType.java similarity index 100% rename from corba/src/share/classes/sun/rmi/rmic/iiop/RemoteType.java rename to corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/RemoteType.java diff --git a/corba/src/share/classes/sun/rmi/rmic/iiop/SpecialClassType.java b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/SpecialClassType.java similarity index 100% rename from corba/src/share/classes/sun/rmi/rmic/iiop/SpecialClassType.java rename to corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/SpecialClassType.java diff --git a/corba/src/share/classes/sun/rmi/rmic/iiop/SpecialInterfaceType.java b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/SpecialInterfaceType.java similarity index 100% rename from corba/src/share/classes/sun/rmi/rmic/iiop/SpecialInterfaceType.java rename to corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/SpecialInterfaceType.java diff --git a/corba/src/share/classes/sun/rmi/rmic/iiop/StaticStringsHash.java b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/StaticStringsHash.java similarity index 100% rename from corba/src/share/classes/sun/rmi/rmic/iiop/StaticStringsHash.java rename to corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/StaticStringsHash.java diff --git a/corba/src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/StubGenerator.java similarity index 100% rename from corba/src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java rename to corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/StubGenerator.java diff --git a/corba/src/share/classes/sun/rmi/rmic/iiop/Type.java b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/Type.java similarity index 100% rename from corba/src/share/classes/sun/rmi/rmic/iiop/Type.java rename to corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/Type.java diff --git a/corba/src/share/classes/sun/rmi/rmic/iiop/Util.java b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/Util.java similarity index 100% rename from corba/src/share/classes/sun/rmi/rmic/iiop/Util.java rename to corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/Util.java diff --git a/corba/src/share/classes/sun/rmi/rmic/iiop/ValueType.java b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ValueType.java similarity index 100% rename from corba/src/share/classes/sun/rmi/rmic/iiop/ValueType.java rename to corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ValueType.java diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/IRObjectOperations.java b/corba/src/share/classes/com/sun/org/omg/CORBA/IRObjectOperations.java deleted file mode 100644 index b51680fe0e0..00000000000 --- a/corba/src/share/classes/com/sun/org/omg/CORBA/IRObjectOperations.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package com.sun.org.omg.CORBA; - - -/** -* com/sun/org/omg/CORBA/IRObjectOperations.java -* Generated by the IDL-to-Java compiler (portable), version "3.0" -* from ir.idl -* Thursday, May 6, 1999 1:51:43 AM PDT -*/ - -// This file has been manually _CHANGED_ - -public interface IRObjectOperations -{ - - // read interface - - // _CHANGED_ - //com.sun.org.omg.CORBA.DefinitionKind def_kind (); - org.omg.CORBA.DefinitionKind def_kind (); - - // write interface - void destroy (); -} // interface IRObjectOperations diff --git a/corba/src/windows/resource/version.rc b/corba/src/windows/resource/version.rc deleted file mode 100644 index 539c1e8e410..00000000000 --- a/corba/src/windows/resource/version.rc +++ /dev/null @@ -1,73 +0,0 @@ -// -// Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved. -// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -// -// This code is free software; you can redistribute it and/or modify it -// under the terms of the GNU General Public License version 2 only, as -// published by the Free Software Foundation. Oracle designates this -// particular file as subject to the "Classpath" exception as provided -// by Oracle in the LICENSE file that accompanied this code. -// -// This code is distributed in the hope that it will be useful, but WITHOUT -// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -// version 2 for more details (a copy is included in the LICENSE file that -// accompanied this code). -// -// You should have received a copy of the GNU General Public License version -// 2 along with this work; if not, write to the Free Software Foundation, -// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -// -// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -// or visit www.oracle.com if you need additional information or have any -// questions. -// - -#include "windows.h" - -// Need 2 defines so macro argument to XSTR will get expanded before quoting. -#define XSTR(x) STR(x) -#define STR(x) #x - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION JDK_FVER - PRODUCTVERSION JDK_FVER - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - // FILEOS 0x4 is Win32, 0x40004 is Win32 NT only - FILEOS 0x4L - // FILETYPE should be 0x1 for .exe and 0x2 for .dll - FILETYPE JDK_FTYPE - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "000004b0" - BEGIN - VALUE "CompanyName", XSTR(JDK_COMPANY) "\0" - VALUE "FileDescription", XSTR(JDK_COMPONENT) "\0" - VALUE "FileVersion", XSTR(JDK_VER) "\0" - VALUE "Full Version", XSTR(JDK_BUILD_ID) "\0" - VALUE "InternalName", XSTR(JDK_INTERNAL_NAME) "\0" - VALUE "LegalCopyright", XSTR(JDK_COPYRIGHT) "\0" - VALUE "OriginalFilename", XSTR(JDK_FNAME) "\0" - VALUE "ProductName", XSTR(JDK_NAME) "\0" - VALUE "ProductVersion", XSTR(JDK_VER) "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x0, 1200 - END -END diff --git a/hotspot/.hgtags b/hotspot/.hgtags index a39d162f8d8..2dbb04816d9 100644 --- a/hotspot/.hgtags +++ b/hotspot/.hgtags @@ -428,3 +428,4 @@ c1af79d122ec9f715fa29312b5e91763f3a4dfc4 jdk9-b20 dd472cdacc32e3afc7c5bfa7ef16ea0e0befb7fa jdk9-b23 dde2d03b0ea46a27650839e3a1d212c7c1f7b4c8 jdk9-b24 6de94e8693240cec8aae11f6b42f43433456a733 jdk9-b25 +48b95a073d752d6891cc0d1d2836b321ecf3ce0c jdk9-b26 diff --git a/hotspot/src/share/vm/runtime/os.cpp b/hotspot/src/share/vm/runtime/os.cpp index d24c688bf13..6c682a703cd 100644 --- a/hotspot/src/share/vm/runtime/os.cpp +++ b/hotspot/src/share/vm/runtime/os.cpp @@ -1143,36 +1143,110 @@ char* os::format_boot_path(const char* format_string, return formatted_path; } +// returns a PATH of all entries in the given directory that do not start with a '.' +static char* expand_entries_to_path(char* directory, char fileSep, char pathSep) { + DIR* dir = os::opendir(directory); + if (dir == NULL) return NULL; + + char* path = NULL; + size_t path_len = 0; // path length including \0 terminator + + size_t directory_len = strlen(directory); + struct dirent *entry; + char* dbuf = NEW_C_HEAP_ARRAY(char, os::readdir_buf_size(directory), mtInternal); + while ((entry = os::readdir(dir, (dirent *) dbuf)) != NULL) { + const char* name = entry->d_name; + if (name[0] == '.') continue; + + size_t name_len = strlen(name); + size_t needed = directory_len + name_len + 2; + size_t new_len = path_len + needed; + if (path == NULL) { + path = NEW_C_HEAP_ARRAY(char, new_len, mtInternal); + } else { + path = REALLOC_C_HEAP_ARRAY(char, path, new_len, mtInternal); + } + if (path == NULL) + break; + + // append directoryname + char* p = path; + if (path_len > 0) { + p += (path_len -1); + *p = pathSep; + p++; + } + + strcpy(p, directory); + p += directory_len; + + *p = fileSep; + p++; + + strcpy(p, name); + p += name_len; + + path_len = new_len; + } + + FREE_C_HEAP_ARRAY(char, dbuf, mtInternal); + os::closedir(dir); + + return path; +} bool os::set_boot_path(char fileSep, char pathSep) { - const char* home = Arguments::get_java_home(); - int home_len = (int)strlen(home); + const char* home = Arguments::get_java_home(); + int home_len = (int)strlen(home); - static const char* meta_index_dir_format = "%/lib/"; - static const char* meta_index_format = "%/lib/meta-index"; - char* meta_index = format_boot_path(meta_index_format, home, home_len, fileSep, pathSep); - if (meta_index == NULL) return false; - char* meta_index_dir = format_boot_path(meta_index_dir_format, home, home_len, fileSep, pathSep); - if (meta_index_dir == NULL) return false; - Arguments::set_meta_index_path(meta_index, meta_index_dir); + static const char* meta_index_dir_format = "%/lib/"; + static const char* meta_index_format = "%/lib/meta-index"; + char* meta_index = format_boot_path(meta_index_format, home, home_len, fileSep, pathSep); + if (meta_index == NULL) return false; + char* meta_index_dir = format_boot_path(meta_index_dir_format, home, home_len, fileSep, pathSep); + if (meta_index_dir == NULL) return false; + Arguments::set_meta_index_path(meta_index, meta_index_dir); + char* sysclasspath = NULL; + + // images build if rt.jar exists + char* rt_jar = format_boot_path("%/lib/rt.jar", home, home_len, fileSep, pathSep); + if (rt_jar == NULL) return false; + struct stat st; + bool has_rt_jar = (os::stat(rt_jar, &st) == 0); + FREE_C_HEAP_ARRAY(char, rt_jar, mtInternal); + + if (has_rt_jar) { // Any modification to the JAR-file list, for the boot classpath must be // aligned with install/install/make/common/Pack.gmk. Note: boot class // path class JARs, are stripped for StackMapTable to reduce download size. static const char classpath_format[] = - "%/lib/resources.jar:" - "%/lib/rt.jar:" - "%/lib/sunrsasign.jar:" - "%/lib/jsse.jar:" - "%/lib/jce.jar:" - "%/lib/charsets.jar:" - "%/lib/jfr.jar:" - "%/classes"; - char* sysclasspath = format_boot_path(classpath_format, home, home_len, fileSep, pathSep); - if (sysclasspath == NULL) return false; - Arguments::set_sysclasspath(sysclasspath); + "%/lib/resources.jar:" + "%/lib/rt.jar:" + "%/lib/jsse.jar:" + "%/lib/jce.jar:" + "%/lib/charsets.jar:" + "%/lib/jfr.jar:" + "%/classes"; + sysclasspath = format_boot_path(classpath_format, home, home_len, fileSep, pathSep); + } else { + // no rt.jar, check if developer build with exploded modules + char* modules_dir = format_boot_path("%/modules", home, home_len, fileSep, pathSep); + if (os::stat(modules_dir, &st) == 0) { + if ((st.st_mode & S_IFDIR) == S_IFDIR) { + sysclasspath = expand_entries_to_path(modules_dir, fileSep, pathSep); + } + } - return true; + // fallback to classes + if (sysclasspath == NULL) + sysclasspath = format_boot_path("%/classes", home, home_len, fileSep, pathSep); + } + + if (sysclasspath == NULL) return false; + Arguments::set_sysclasspath(sysclasspath); + + return true; } /* diff --git a/jaxp/.hgtags b/jaxp/.hgtags index 63f10acd85e..051c0879c7b 100644 --- a/jaxp/.hgtags +++ b/jaxp/.hgtags @@ -268,3 +268,4 @@ f9c82769a6bc2b219a8f01c24afe5c91039267d7 jdk9-b19 2e5b63006187bfc64d8eace374dbc2806267a160 jdk9-b23 345af113f57206711f75089c3ebf84a36a789122 jdk9-b24 73757f4b8aa353ca8937abc07e79e7ece4c011a1 jdk9-b25 +a5aea8318ae4a9c2105228568688875142d70344 jdk9-b26 diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/xpath.cup b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/xpath.cup deleted file mode 100644 index 12bfa2a82e1..00000000000 --- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/xpath.cup +++ /dev/null @@ -1,1116 +0,0 @@ -/* - * reserved comment block - * DO NOT REMOVE OR ALTER! - */ -/* - * Copyright 2001-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. - */ - -/* - * $Id: xpath.cup,v 1.51 2004/12/15 17:35:39 jycli Exp $ - */ - -/* - * @author Jacek Ambroziak - * @author Santiago Pericas-Geertsen - * @author Morten Jorgensen - * @author G. Todd Miller - */ - -package com.sun.org.apache.xalan.internal.xsltc.compiler; - -import java.util.Stack; -import java.util.Vector; -import java.io.StringReader; -import com.sun.java_cup.internal.runtime.*; - -import com.sun.org.apache.xml.internal.dtm.DTM; -import com.sun.org.apache.xalan.internal.xsltc.DOM; -import com.sun.org.apache.xml.internal.dtm.Axis; -import com.sun.org.apache.xalan.internal.xsltc.runtime.Operators; -import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ErrorMsg; - -parser code {: - /** - * Used by function calls with no args. - */ - static public final Vector EmptyArgs = new Vector(0); - - /** - * Reference to non-existing variable. - */ - static public final VariableRef DummyVarRef = null; - - /** - * Reference to the Parser class. - */ - private Parser _parser; - private XSLTC _xsltc; - - /** - * String representation of the expression being parsed. - */ - private String _expression; - - /** - * Line number where this expression/pattern was declared. - */ - private int _lineNumber = 0; - - /** - * Reference to the symbol table. - */ - public SymbolTable _symbolTable; - - public XPathParser(Parser parser) { - _parser = parser; - _xsltc = parser.getXSLTC(); - _symbolTable = parser.getSymbolTable(); - } - - public int getLineNumber() { - return _lineNumber; - } - - public QName getQNameIgnoreDefaultNs(String name) { - return _parser.getQNameIgnoreDefaultNs(name); - } - - public QName getQName(String namespace, String prefix, String localname) { - return _parser.getQName(namespace, prefix, localname); - } - - public void setMultiDocument(boolean flag) { - _xsltc.setMultiDocument(flag); - } - - public void setCallsNodeset(boolean flag) { - _xsltc.setCallsNodeset(flag); - } - - public void setHasIdCall(boolean flag) { - _xsltc.setHasIdCall(flag); - } - - - /** - * This method is similar to findNodeType(int, Object) except that it - * creates a StepPattern instead of just returning a node type. It also - * differs in the way it handles "{uri}:*" and "{uri}:@*". The last two - * patterns are expanded as "*[namespace-uri() = 'uri']" and - * "@*[namespace-uri() = 'uri']", respectively. This expansion considerably - * simplifies the grouping of patterns in the Mode class. For this - * expansion to be correct, the priority of the pattern/template must be - * set to -0.25 (when no other predicates are present). - */ - public StepPattern createStepPattern(int axis, Object test, Vector predicates) { - int nodeType; - - if (test == null) { // "*" - nodeType = (axis == Axis.ATTRIBUTE) ? NodeTest.ATTRIBUTE : - (axis == Axis.NAMESPACE) ? -1 : NodeTest.ELEMENT; - - return new StepPattern(axis, nodeType, predicates); - } - else if (test instanceof Integer) { - nodeType = ((Integer) test).intValue(); - - return new StepPattern(axis, nodeType, predicates); - } - else { - QName name = (QName)test; - boolean setPriority = false; - - if (axis == Axis.NAMESPACE) { - nodeType = (name.toString().equals("*")) ? -1 - : _xsltc.registerNamespacePrefix(name);; - } - else { - final String uri = name.getNamespace(); - final String local = name.getLocalPart(); - final QName namespace_uri = - _parser.getQNameIgnoreDefaultNs("namespace-uri"); - - // Expand {uri}:* to *[namespace-uri() = 'uri'] - same for @* - if (uri != null && (local.equals("*") || local.equals("@*"))) { - if (predicates == null) { - predicates = new Vector(2); - } - - // Priority is set by hand if no other predicates exist - setPriority = (predicates.size() == 0); - - predicates.add( - new Predicate( - new EqualityExpr(Operators.EQ, - new NamespaceUriCall(namespace_uri), - new LiteralExpr(uri)))); - } - - if (local.equals("*")) { - nodeType = (axis == Axis.ATTRIBUTE) ? NodeTest.ATTRIBUTE - : NodeTest.ELEMENT; - } - else if (local.equals("@*")) { - nodeType = NodeTest.ATTRIBUTE; - } - else { - nodeType = (axis == Axis.ATTRIBUTE) ? _xsltc.registerAttribute(name) - : _xsltc.registerElement(name); - } - } - - final StepPattern result = new StepPattern(axis, nodeType, predicates); - - // Set priority for case prefix:* and prefix:@* (no predicates) - if (setPriority) { - result.setPriority(-0.25); - } - - return result; - } - } - - public int findNodeType(int axis, Object test) { - if (test == null) { // * - return (axis == Axis.ATTRIBUTE) ? - NodeTest.ATTRIBUTE : - (axis == Axis.NAMESPACE) ? -1 : NodeTest.ELEMENT; - } - else if (test instanceof Integer) { - return ((Integer)test).intValue(); - } - else { - QName name = (QName)test; - - if (axis == Axis.NAMESPACE) { - return (name.toString().equals("*")) ? -1 - : _xsltc.registerNamespacePrefix(name); - } - - if (name.getNamespace() == null) { - final String local = name.getLocalPart(); - - if (local.equals("*")) { - return (axis == Axis.ATTRIBUTE) ? NodeTest.ATTRIBUTE - : NodeTest.ELEMENT; - } - else if (local.equals("@*")) { - return NodeTest.ATTRIBUTE; - } - } - - return (axis == Axis.ATTRIBUTE) ? _xsltc.registerAttribute(name) - : _xsltc.registerElement(name); - } - } - - /** - * Parse the expression passed to the current scanner. If this - * expression contains references to local variables and it will be - * compiled in an external module (not in the main class) request - * the current template to create a new variable stack frame. - * - * @param lineNumber Line where the current expression is defined. - * @param external Set to true if this expression is - * compiled in a separate module. - * - */ - public Symbol parse(String expression, int lineNumber) throws Exception { - try { - _expression = expression; - _lineNumber = lineNumber; - return super.parse(); - } - catch (IllegalCharException e) { - ErrorMsg err = new ErrorMsg(ErrorMsg.ILLEGAL_CHAR_ERR, - lineNumber, e.getMessage()); - _parser.reportError(Constants.FATAL, err); - } - return null; - } - - /** - * Lookup a variable or parameter in the symbol table given its name. - * - * @param name Name of the symbol being looked up. - */ - final SyntaxTreeNode lookupName(QName name) { - // Is it a local var or param ? - final SyntaxTreeNode result = _parser.lookupVariable(name); - if (result != null) - return(result); - else - return(_symbolTable.lookupName(name)); - } - - public final void addError(ErrorMsg error) { - _parser.reportError(Constants.ERROR, error); - } - - public void report_error(String message, Object info) { - final ErrorMsg err = new ErrorMsg(ErrorMsg.SYNTAX_ERR, _lineNumber, - _expression); - _parser.reportError(Constants.FATAL, err); - } - - public void report_fatal_error(String message, Object info) { - // empty - } - - public RelativeLocationPath insertStep(Step step, RelativeLocationPath rlp) { - if (rlp instanceof Step) { - return new ParentLocationPath(step, (Step) rlp); - } - else if (rlp instanceof ParentLocationPath) { - final ParentLocationPath plp = (ParentLocationPath) rlp; - final RelativeLocationPath newrlp = insertStep(step, plp.getPath()); - return new ParentLocationPath(newrlp, plp.getStep()); - } - else { - addError(new ErrorMsg(ErrorMsg.INTERNAL_ERR, "XPathParser.insertStep")); - return rlp; - } - } - - /** - * Returns true if the axis applies to elements only. The axes - * child, attribute, namespace, descendant result in non-empty - * nodesets only if the context node is of type element. - */ - public boolean isElementAxis(int axis) { - return (axis == Axis.CHILD || axis == Axis.ATTRIBUTE || - axis == Axis.NAMESPACE || axis == Axis.DESCENDANT); - } -:} - -terminal SLASH, DOT, LBRACK, RBRACK, VBAR, LPAREN, RPAREN, STAR, COMMA; -terminal DOLLAR, ATSIGN; -terminal DDOT, DCOLON, DSLASH; -terminal EQ, NE; -terminal LT, GT, LE, GE; -terminal PLUS, MINUS, DIV, MOD, MULT; -terminal String Literal; -terminal String QNAME; -terminal ID, KEY, TEXT, NODE, OR, AND, COMMENT, PI, PIPARAM, PRECEDINGSIBLING; -terminal SELF, PARENT, CHILD, ATTRIBUTE, ANCESTOR, ANCESTORORSELF, DESCENDANT; -terminal DESCENDANTORSELF, FOLLOWING, FOLLOWINGSIBLING, NAMESPACE, PRECEDING; -terminal Double REAL; -terminal Long INT; -terminal PATTERN, EXPRESSION; - -non terminal SyntaxTreeNode TopLevel; - -non terminal Expression Expr, Argument, LocationPath; -non terminal Expression Predicate, FilterExpr, Step; -non terminal Expression OrExpr, AndExpr, EqualityExpr; -non terminal Expression RelationalExpr, AdditiveExpr; -non terminal Expression MultiplicativeExpr, UnaryExpr; -non terminal Expression VariableReference, FunctionCall; -non terminal Expression PrimaryExpr, UnionExpr, PathExpr, AbbreviatedStep; -non terminal Expression RelativeLocationPath, AbbreviatedRelativeLocationPath; -non terminal Expression AbsoluteLocationPath, AbbreviatedAbsoluteLocationPath; - -non terminal Object NodeTest, NameTest; - -non terminal IdKeyPattern IdKeyPattern; -non terminal Pattern Pattern; -non terminal Pattern LocationPathPattern; -non terminal StepPattern ProcessingInstructionPattern; -non terminal RelativePathPattern RelativePathPattern; -non terminal StepPattern StepPattern; -non terminal Object NodeTestPattern, NameTestPattern; - -non terminal Vector Predicates, NonemptyArgumentList; -non terminal QName QName, FunctionName, VariableName; -non terminal Integer AxisName, AxisSpecifier; -non terminal Integer ChildOrAttributeAxisSpecifier; - -precedence left VBAR; -precedence left OR; -precedence left AND; -precedence nonassoc EQ, NE; -precedence left LT, GT, LE, GE; - -precedence left PLUS, MINUS; -precedence left DIV, MOD, MULT; -precedence left DOLLAR; -precedence left ATSIGN; -precedence right DCOLON; - -start with TopLevel; - -TopLevel ::= PATTERN Pattern:pattern - {: RESULT = pattern; :} - - | EXPRESSION Expr:expr - {: RESULT = expr; :}; - -/* --------------------------- Patterns ----------------------------------- */ - -Pattern ::= LocationPathPattern:lpp - {: RESULT = lpp; :} - - | LocationPathPattern:lpp VBAR Pattern:p - {: RESULT = new AlternativePattern(lpp, p); :}; - -LocationPathPattern ::= SLASH - {: RESULT = new AbsolutePathPattern(null); :} - - | SLASH RelativePathPattern:rpp - {: RESULT = new AbsolutePathPattern(rpp); :} - - | IdKeyPattern:ikp - {: RESULT = ikp; :} - - | IdKeyPattern:ikp SLASH RelativePathPattern:rpp - {: RESULT = new ParentPattern(ikp, rpp); :} - - | IdKeyPattern:ikp DSLASH RelativePathPattern:rpp - {: RESULT = new AncestorPattern(ikp, rpp); :} - - | DSLASH RelativePathPattern:rpp - {: RESULT = new AncestorPattern(rpp); :} - - | RelativePathPattern:rpp - {: RESULT = rpp; :}; - -IdKeyPattern ::= ID LPAREN Literal:l RPAREN - {: RESULT = new IdPattern(l); - parser.setHasIdCall(true); - :} - - | KEY LPAREN Literal:l1 COMMA Literal:l2 RPAREN - {: RESULT = new KeyPattern(l1, l2); :}; - -ProcessingInstructionPattern ::= PIPARAM LPAREN Literal:l RPAREN - {: RESULT = new ProcessingInstructionPattern(l); :}; - -RelativePathPattern ::= StepPattern:sp - {: RESULT = sp; :} - - | StepPattern:sp SLASH RelativePathPattern:rpp - {: RESULT = new ParentPattern(sp, rpp); :} - - | StepPattern:sp DSLASH RelativePathPattern:rpp - {: RESULT = new AncestorPattern(sp, rpp); :}; - -StepPattern ::= NodeTestPattern:nt - {: - RESULT = parser.createStepPattern(Axis.CHILD, nt, null); - :} - - | NodeTestPattern:nt Predicates:pp - {: - RESULT = parser.createStepPattern(Axis.CHILD, nt, pp); - :} - - | ProcessingInstructionPattern:pip - {: RESULT = pip; :} - - | ProcessingInstructionPattern:pip Predicates:pp - {: RESULT = (ProcessingInstructionPattern)pip.setPredicates(pp); :} - - | ChildOrAttributeAxisSpecifier:axis NodeTestPattern:nt - {: - RESULT = parser.createStepPattern(axis.intValue(), nt, null); - :} - - | ChildOrAttributeAxisSpecifier:axis - NodeTestPattern:nt Predicates:pp - {: - RESULT = parser.createStepPattern(axis.intValue(), nt, pp); - :} - - | ChildOrAttributeAxisSpecifier:axis ProcessingInstructionPattern:pip - {: - RESULT = pip; // TODO: report error if axis is attribute - :} - - | ChildOrAttributeAxisSpecifier:axis ProcessingInstructionPattern:pip - Predicates:pp - {: - // TODO: report error if axis is attribute - RESULT = (ProcessingInstructionPattern)pip.setPredicates(pp); - :}; - -NodeTestPattern ::= NameTestPattern:nt - {: RESULT = nt; :} - - | NODE - {: RESULT = new Integer(NodeTest.ANODE); :} - - | TEXT - {: RESULT = new Integer(NodeTest.TEXT); :} - - | COMMENT - {: RESULT = new Integer(NodeTest.COMMENT); :} - - | PI - {: RESULT = new Integer(NodeTest.PI); :}; - -NameTestPattern ::= STAR - {: RESULT = null; :} - - | QName:qn - {: RESULT = qn; :}; - -ChildOrAttributeAxisSpecifier ::= ATSIGN - {: RESULT = new Integer(Axis.ATTRIBUTE); :} - - | CHILD DCOLON - {: RESULT = new Integer(Axis.CHILD); :} - - | ATTRIBUTE DCOLON - {: RESULT = new Integer(Axis.ATTRIBUTE); :}; - -Predicates ::= Predicate:p - {: - Vector temp = new Vector(); - temp.addElement(p); - RESULT = temp; - :} - - | Predicate:p Predicates:pp - {: pp.insertElementAt(p, 0); RESULT = pp; :}; - -Predicate ::= LBRACK Expr:e RBRACK - {: - RESULT = new Predicate(e); - :}; - -/* --------------------------- Expressions --------------------------------- */ - -Expr ::= OrExpr:ex - {: RESULT = ex; :}; - -OrExpr ::= AndExpr:ae - {: RESULT = ae; :} - - | OrExpr:oe OR AndExpr:ae - {: RESULT = new LogicalExpr(LogicalExpr.OR, oe, ae); :}; - -AndExpr ::= EqualityExpr:e - {: RESULT = e; :} - - | AndExpr:ae AND EqualityExpr:ee - {: RESULT = new LogicalExpr(LogicalExpr.AND, ae, ee); :}; - -EqualityExpr ::= RelationalExpr:re - {: RESULT = re; :} - - | EqualityExpr:ee EQ RelationalExpr:re - {: RESULT = new EqualityExpr(Operators.EQ, ee, re); :} - - | EqualityExpr:ee NE RelationalExpr:re - {: RESULT = new EqualityExpr(Operators.NE, ee, re); :}; - -RelationalExpr ::= AdditiveExpr:ae - {: RESULT = ae; :} - - | RelationalExpr:re LT AdditiveExpr:ae - {: RESULT = new RelationalExpr(Operators.LT, re, ae); :} - - | RelationalExpr:re GT AdditiveExpr:ae - {: RESULT = new RelationalExpr(Operators.GT, re, ae); :} - - | RelationalExpr:re LE AdditiveExpr:ae - {: RESULT = new RelationalExpr(Operators.LE, re, ae); :} - - | RelationalExpr:re GE AdditiveExpr:ae - {: RESULT = new RelationalExpr(Operators.GE, re, ae); :}; - -AdditiveExpr ::= MultiplicativeExpr:me - {: RESULT = me; :} - - | AdditiveExpr:ae PLUS MultiplicativeExpr:me - {: RESULT = new BinOpExpr(BinOpExpr.PLUS, ae, me); :} - - | AdditiveExpr:ae MINUS MultiplicativeExpr:me - {: RESULT = new BinOpExpr(BinOpExpr.MINUS, ae, me); :}; - -MultiplicativeExpr ::= UnaryExpr:ue - {: RESULT = ue; :} - - | MultiplicativeExpr:me MULT UnaryExpr:ue - {: RESULT = new BinOpExpr(BinOpExpr.TIMES, me, ue); :} - - | MultiplicativeExpr:me DIV UnaryExpr:ue - {: RESULT = new BinOpExpr(BinOpExpr.DIV, me, ue); :} - - | MultiplicativeExpr:me MOD UnaryExpr:ue - {: RESULT = new BinOpExpr(BinOpExpr.MOD, me, ue); :}; - -UnaryExpr ::= UnionExpr:ue - {: RESULT = ue; :} - - | MINUS UnaryExpr:ue - {: RESULT = new UnaryOpExpr(ue); :}; - -UnionExpr ::= PathExpr:pe - {: RESULT = pe; :} - - | PathExpr:pe VBAR UnionExpr:rest - {: RESULT = new UnionPathExpr(pe, rest); :}; - -PathExpr ::= LocationPath:lp - {: RESULT = lp; :} - - | FilterExpr:fexp - {: RESULT = fexp; :} - - | FilterExpr:fexp SLASH RelativeLocationPath:rlp - {: RESULT = new FilterParentPath(fexp, rlp); :} - - | FilterExpr:fexp DSLASH RelativeLocationPath:rlp - {: - // - // Expand '//' into '/descendant-or-self::node()/' or - // into /descendant-or-self::*/ - // - int nodeType = DOM.NO_TYPE; - if (rlp instanceof Step && - parser.isElementAxis(((Step) rlp).getAxis())) - { - nodeType = DTM.ELEMENT_NODE; - } - final Step step = new Step(Axis.DESCENDANTORSELF, nodeType, null); - FilterParentPath fpp = new FilterParentPath(fexp, step); - fpp = new FilterParentPath(fpp, rlp); - if (fexp instanceof KeyCall == false) { - fpp.setDescendantAxis(); - } - RESULT = fpp; - :}; - -LocationPath ::= RelativeLocationPath:rlp - {: RESULT = rlp; :} - - | AbsoluteLocationPath:alp - {: RESULT = alp; :}; - -RelativeLocationPath ::= Step:step - {: RESULT = step; :} - - | RelativeLocationPath:rlp SLASH Step:step - {: - if (rlp instanceof Step && ((Step) rlp).isAbbreviatedDot()) { - RESULT = step; // Remove './' from the middle - } - else if (((Step) step).isAbbreviatedDot()) { - RESULT = rlp; // Remove '/.' from the end - } - else { - RESULT = - new ParentLocationPath((RelativeLocationPath) rlp, step); - } - :} - - | AbbreviatedRelativeLocationPath:arlp - {: RESULT = arlp; :}; - -AbsoluteLocationPath ::= SLASH - {: RESULT = new AbsoluteLocationPath(); :} - - | SLASH RelativeLocationPath:rlp - {: RESULT = new AbsoluteLocationPath(rlp); :} - - | AbbreviatedAbsoluteLocationPath:aalp - {: RESULT = aalp; :}; - -AbbreviatedRelativeLocationPath ::= RelativeLocationPath:rlp DSLASH Step:step - {: - final Step right = (Step)step; - final int axis = right.getAxis(); - final int type = right.getNodeType(); - final Vector predicates = right.getPredicates(); - - if ((axis == Axis.CHILD) && (type != NodeTest.ATTRIBUTE)) { - // Compress './/child:E' into 'descendant::E' - if possible - if (predicates == null) { - right.setAxis(Axis.DESCENDANT); - if (rlp instanceof Step && ((Step)rlp).isAbbreviatedDot()) { - RESULT = right; - } - else { - // Expand 'rlp//child::E' into 'rlp/descendant::E' - RelativeLocationPath left = (RelativeLocationPath)rlp; - RESULT = new ParentLocationPath(left, right); - } - } - else { - // Expand './/step' -> 'descendant-or-self::*/step' - if (rlp instanceof Step && ((Step)rlp).isAbbreviatedDot()) { - Step left = new Step(Axis.DESCENDANTORSELF, - DTM.ELEMENT_NODE, null); - RESULT = new ParentLocationPath(left, right); - } - else { - // Expand 'rlp//step' -> 'rlp/descendant-or-self::*/step' - RelativeLocationPath left = (RelativeLocationPath)rlp; - Step mid = new Step(Axis.DESCENDANTORSELF, - DTM.ELEMENT_NODE, null); - ParentLocationPath ppl = new ParentLocationPath(mid, right); - RESULT = new ParentLocationPath(left, ppl); - } - } - } - else if ((axis == Axis.ATTRIBUTE) || (type == NodeTest.ATTRIBUTE)) { - // Expand 'rlp//step' -> 'rlp/descendant-or-self::*/step' - RelativeLocationPath left = (RelativeLocationPath)rlp; - Step middle = new Step(Axis.DESCENDANTORSELF, - DTM.ELEMENT_NODE, null); - ParentLocationPath ppl = new ParentLocationPath(middle, right); - RESULT = new ParentLocationPath(left, ppl); - } - else { - // Expand 'rlp//step' -> 'rlp/descendant-or-self::node()/step' - RelativeLocationPath left = (RelativeLocationPath)rlp; - Step middle = new Step(Axis.DESCENDANTORSELF, - DOM.NO_TYPE, null); - ParentLocationPath ppl = new ParentLocationPath(middle, right); - RESULT = new ParentLocationPath(left, ppl); - } - :}; - - -AbbreviatedAbsoluteLocationPath ::= DSLASH RelativeLocationPath:rlp - {: - // - // Expand '//' into '/descendant-or-self::node()/' or - // into /descendant-or-self::*/ - // - int nodeType = DOM.NO_TYPE; - if (rlp instanceof Step && - parser.isElementAxis(((Step) rlp).getAxis())) - { - nodeType = DTM.ELEMENT_NODE; - } - final Step step = new Step(Axis.DESCENDANTORSELF, nodeType, null); - RESULT = new AbsoluteLocationPath(parser.insertStep(step, - (RelativeLocationPath) rlp)); - :}; - -Step ::= NodeTest:ntest - {: - if (ntest instanceof Step) { - RESULT = (Step)ntest; - } - else { - RESULT = new Step(Axis.CHILD, - parser.findNodeType(Axis.CHILD, ntest), - null); - } - :} - - | NodeTest:ntest Predicates:pp - {: - if (ntest instanceof Step) { - Step step = (Step)ntest; - step.addPredicates(pp); - RESULT = (Step)ntest; - } - else { - RESULT = new Step(Axis.CHILD, - parser.findNodeType(Axis.CHILD, ntest), pp); - } - :} - - | AxisSpecifier:axis NodeTest:ntest Predicates:pp - {: RESULT = new Step(axis.intValue(), - parser.findNodeType(axis.intValue(), ntest), - pp); - :} - - | AxisSpecifier:axis NodeTest:ntest - {: RESULT = new Step(axis.intValue(), - parser.findNodeType(axis.intValue(), ntest), - null); - :} - - | AbbreviatedStep:abbrev - {: RESULT = abbrev; :}; - -AxisSpecifier ::= AxisName:an DCOLON - {: RESULT = an; :} - - | ATSIGN - {: RESULT = new Integer(Axis.ATTRIBUTE); :}; - -AxisName ::= ANCESTOR - {: RESULT = new Integer(Axis.ANCESTOR); :} - - | ANCESTORORSELF - {: RESULT = new Integer(Axis.ANCESTORORSELF); :} - - | ATTRIBUTE - {: RESULT = new Integer(Axis.ATTRIBUTE); :} - - | CHILD - {: RESULT = new Integer(Axis.CHILD); :} - - | DESCENDANT - {: RESULT = new Integer(Axis.DESCENDANT); :} - - | DESCENDANTORSELF - {: RESULT = new Integer(Axis.DESCENDANTORSELF); :} - - | FOLLOWING - {: RESULT = new Integer(Axis.FOLLOWING); :} - - | FOLLOWINGSIBLING - {: RESULT = new Integer(Axis.FOLLOWINGSIBLING); :} - - | NAMESPACE - {: RESULT = new Integer(Axis.NAMESPACE); :} - - | PARENT - {: RESULT = new Integer(Axis.PARENT); :} - - | PRECEDING - {: RESULT = new Integer(Axis.PRECEDING); :} - - | PRECEDINGSIBLING - {: RESULT = new Integer(Axis.PRECEDINGSIBLING); :} - - | SELF - {: RESULT = new Integer(Axis.SELF); :}; - -AbbreviatedStep ::= DOT - {: RESULT = new Step(Axis.SELF, NodeTest.ANODE, null); :} - - | DDOT - {: RESULT = new Step(Axis.PARENT, NodeTest.ANODE, null); :}; - -FilterExpr ::= PrimaryExpr:primary - {: RESULT = primary; :} - - | PrimaryExpr:primary Predicates:pp - {: RESULT = new FilterExpr(primary, pp); :}; - -PrimaryExpr ::= VariableReference:vr - {: RESULT = vr; :} - - | LPAREN Expr:ex RPAREN - {: RESULT = ex; :} - - | Literal:string - {: - /* - * If the string appears to have the syntax of a QName, store - * namespace info in the literal expression. This is used for - * element-available and function-available functions, among - * others. Also, the default namespace must be ignored. - */ - String namespace = null; - final int index = string.lastIndexOf(':'); - - if (index > 0) { - final String prefix = string.substring(0, index); - namespace = parser._symbolTable.lookupNamespace(prefix); - } - RESULT = (namespace == null) ? new LiteralExpr(string) - : new LiteralExpr(string, namespace); - :} - - | INT:num - {: - long value = num.longValue(); - if (value < Integer.MIN_VALUE || value > Integer.MAX_VALUE) { - RESULT = new RealExpr(value); - } - else { - if (num.doubleValue() == -0) - RESULT = new RealExpr(num.doubleValue()); - else if (num.intValue() == 0) - RESULT = new IntExpr(num.intValue()); - else if (num.doubleValue() == 0.0) - RESULT = new RealExpr(num.doubleValue()); - else - RESULT = new IntExpr(num.intValue()); - } - :} - - | REAL:num - {: RESULT = new RealExpr(num.doubleValue()); :} - - | FunctionCall:fc - {: RESULT = fc; :}; - -VariableReference ::= DOLLAR VariableName:varName - {: - // An empty qname prefix for a variable or parameter reference - // should map to the null namespace and not the default URI. - SyntaxTreeNode node = parser.lookupName(varName); - - if (node != null) { - if (node instanceof Variable) { - RESULT = new VariableRef((Variable)node); - } - else if (node instanceof Param) { - RESULT = new ParameterRef((Param)node); - } - else { - RESULT = new UnresolvedRef(varName); - } - } - - if (node == null) { - RESULT = new UnresolvedRef(varName); - } - :}; - -FunctionCall ::= FunctionName:fname LPAREN RPAREN - {: - - if (parser.getQNameIgnoreDefaultNs("current").equals(fname)) { - RESULT = new CurrentCall(fname); - } - else if (parser.getQNameIgnoreDefaultNs("number").equals(fname)) { - RESULT = new NumberCall(fname, parser.EmptyArgs); - } - else if (parser.getQNameIgnoreDefaultNs("string").equals(fname)) { - RESULT = new StringCall(fname, parser.EmptyArgs); - } - else if (parser.getQNameIgnoreDefaultNs("concat").equals(fname)) { - RESULT = new ConcatCall(fname, parser.EmptyArgs); - } - else if (parser.getQNameIgnoreDefaultNs("true").equals(fname)) { - RESULT = new BooleanExpr(true); - } - else if (parser.getQNameIgnoreDefaultNs("false").equals(fname)) { - RESULT = new BooleanExpr(false); - } - else if (parser.getQNameIgnoreDefaultNs("name").equals(fname)) { - RESULT = new NameCall(fname); - } - else if (parser.getQNameIgnoreDefaultNs("generate-id").equals(fname)) { - RESULT = new GenerateIdCall(fname, parser.EmptyArgs); - } - else if (parser.getQNameIgnoreDefaultNs("string-length").equals(fname)) { - RESULT = new StringLengthCall(fname, parser.EmptyArgs); - } - else if (parser.getQNameIgnoreDefaultNs("position").equals(fname)) { - RESULT = new PositionCall(fname); - } - else if (parser.getQNameIgnoreDefaultNs("last").equals(fname)) { - RESULT = new LastCall(fname); - } - else if (parser.getQNameIgnoreDefaultNs("local-name").equals(fname)) { - RESULT = new LocalNameCall(fname); - } - else if (parser.getQNameIgnoreDefaultNs("namespace-uri").equals(fname)) { - RESULT = new NamespaceUriCall(fname); - } - else { - RESULT = new FunctionCall(fname, parser.EmptyArgs); - } - :} - - | FunctionName:fname LPAREN NonemptyArgumentList:argl RPAREN - {: - if (parser.getQNameIgnoreDefaultNs("concat").equals(fname)) { - RESULT = new ConcatCall(fname, argl); - } - else if (parser.getQNameIgnoreDefaultNs("number").equals(fname)) { - RESULT = new NumberCall(fname, argl); - } - else if (parser.getQNameIgnoreDefaultNs("document").equals(fname)) { - parser.setMultiDocument(true); - RESULT = new DocumentCall(fname, argl); - } - else if (parser.getQNameIgnoreDefaultNs("string").equals(fname)) { - RESULT = new StringCall(fname, argl); - } - else if (parser.getQNameIgnoreDefaultNs("boolean").equals(fname)) { - RESULT = new BooleanCall(fname, argl); - } - else if (parser.getQNameIgnoreDefaultNs("name").equals(fname)) { - RESULT = new NameCall(fname, argl); - } - else if (parser.getQNameIgnoreDefaultNs("generate-id").equals(fname)) { - RESULT = new GenerateIdCall(fname, argl); - } - else if (parser.getQNameIgnoreDefaultNs("not").equals(fname)) { - RESULT = new NotCall(fname, argl); - } - else if (parser.getQNameIgnoreDefaultNs("format-number").equals(fname)) { - RESULT = new FormatNumberCall(fname, argl); - } - else if (parser.getQNameIgnoreDefaultNs("unparsed-entity-uri").equals(fname)) { - RESULT = new UnparsedEntityUriCall(fname, argl); - } - else if (parser.getQNameIgnoreDefaultNs("key").equals(fname)) { - RESULT = new KeyCall(fname, argl); - } - else if (parser.getQNameIgnoreDefaultNs("id").equals(fname)) { - RESULT = new KeyCall(fname, argl); - parser.setHasIdCall(true); - } - else if (parser.getQNameIgnoreDefaultNs("ceiling").equals(fname)) { - RESULT = new CeilingCall(fname, argl); - } - else if (parser.getQNameIgnoreDefaultNs("round").equals(fname)) { - RESULT = new RoundCall(fname, argl); - } - else if (parser.getQNameIgnoreDefaultNs("floor").equals(fname)) { - RESULT = new FloorCall(fname, argl); - } - else if (parser.getQNameIgnoreDefaultNs("contains").equals(fname)) { - RESULT = new ContainsCall(fname, argl); - } - else if (parser.getQNameIgnoreDefaultNs("string-length").equals(fname)) { - RESULT = new StringLengthCall(fname, argl); - } - else if (parser.getQNameIgnoreDefaultNs("starts-with").equals(fname)) { - RESULT = new StartsWithCall(fname, argl); - } - else if (parser.getQNameIgnoreDefaultNs("function-available").equals(fname)) { - RESULT = new FunctionAvailableCall(fname, argl); - } - else if (parser.getQNameIgnoreDefaultNs("element-available").equals(fname)) { - RESULT = new ElementAvailableCall(fname, argl); - } - else if (parser.getQNameIgnoreDefaultNs("local-name").equals(fname)) { - RESULT = new LocalNameCall(fname, argl); - } - else if (parser.getQNameIgnoreDefaultNs("lang").equals(fname)) { - RESULT = new LangCall(fname, argl); - } - else if (parser.getQNameIgnoreDefaultNs("namespace-uri").equals(fname)) { - RESULT = new NamespaceUriCall(fname, argl); - } - else if (parser.getQName(Constants.TRANSLET_URI, "xsltc", "cast").equals(fname)) { - RESULT = new CastCall(fname, argl); - } - // Special case for extension function nodeset() - else if (fname.getLocalPart().equals("nodeset") || fname.getLocalPart().equals("node-set")) { - parser.setCallsNodeset(true); // implies MultiDOM - RESULT = new FunctionCall(fname, argl); - } - else { - RESULT = new FunctionCall(fname, argl); - } - :}; - -NonemptyArgumentList ::= Argument:arg - {: - Vector temp = new Vector(); - temp.addElement(arg); - RESULT = temp; - :} - - | Argument:arg COMMA NonemptyArgumentList:argl - {: argl.insertElementAt(arg, 0); RESULT = argl; :}; - -FunctionName ::= QName:fname - {: - RESULT = fname; - :}; - -VariableName ::= QName:vname - {: - RESULT = vname; - :}; - -Argument ::= Expr:ex - {: RESULT = ex; :}; - -NodeTest ::= NameTest:nt - {: RESULT = nt; :} - - | NODE - {: RESULT = new Integer(NodeTest.ANODE); :} - - | TEXT - {: RESULT = new Integer(NodeTest.TEXT); :} - - | COMMENT - {: RESULT = new Integer(NodeTest.COMMENT); :} - - | PIPARAM LPAREN Literal:l RPAREN - {: - QName name = parser.getQNameIgnoreDefaultNs("name"); - Expression exp = new EqualityExpr(Operators.EQ, - new NameCall(name), - new LiteralExpr(l)); - Vector predicates = new Vector(); - predicates.addElement(new Predicate(exp)); - RESULT = new Step(Axis.CHILD, NodeTest.PI, predicates); - :} - - | PI - {: RESULT = new Integer(NodeTest.PI); :}; - -NameTest ::= STAR - {: RESULT = null; :} - - | QName:qn - {: RESULT = qn; :}; - -QName ::= QNAME:qname - {: RESULT = parser.getQNameIgnoreDefaultNs(qname); :} - - | DIV - {: RESULT = parser.getQNameIgnoreDefaultNs("div"); :} - - | MOD - {: RESULT = parser.getQNameIgnoreDefaultNs("mod"); :} - - | KEY - {: RESULT = parser.getQNameIgnoreDefaultNs("key"); :} - - | ANCESTOR - {: RESULT = parser.getQNameIgnoreDefaultNs("child"); :} - - | ANCESTORORSELF - {: RESULT = parser.getQNameIgnoreDefaultNs("ancestor-or-self"); :} - - | ATTRIBUTE - {: RESULT = parser.getQNameIgnoreDefaultNs("attribute"); :} - - | CHILD - {: RESULT = parser.getQNameIgnoreDefaultNs("child"); :} - - | DESCENDANT - {: RESULT = parser.getQNameIgnoreDefaultNs("decendant"); :} - - | DESCENDANTORSELF - {: RESULT = parser.getQNameIgnoreDefaultNs("decendant-or-self"); :} - - | FOLLOWING - {: RESULT = parser.getQNameIgnoreDefaultNs("following"); :} - - | FOLLOWINGSIBLING - {: RESULT = parser.getQNameIgnoreDefaultNs("following-sibling"); :} - - | NAMESPACE - {: RESULT = parser.getQNameIgnoreDefaultNs("namespace"); :} - - | PARENT - {: RESULT = parser.getQNameIgnoreDefaultNs("parent"); :} - - | PRECEDING - {: RESULT = parser.getQNameIgnoreDefaultNs("preceding"); :} - - | PRECEDINGSIBLING - {: RESULT = parser.getQNameIgnoreDefaultNs("preceding-sibling"); :} - - | SELF - {: RESULT = parser.getQNameIgnoreDefaultNs("self"); :} - - | ID - {: RESULT = parser.getQNameIgnoreDefaultNs("id"); :}; - diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/xpath.lex b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/xpath.lex deleted file mode 100644 index f1013f38eba..00000000000 --- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/xpath.lex +++ /dev/null @@ -1,260 +0,0 @@ -/* - * reserved comment block - * DO NOT REMOVE OR ALTER! - */ -/* - * Copyright 2001-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. - */ -/* - * $Id: xpath.lex,v 1.12 2005/08/02 02:59:03 mcnamara Exp $ - */ - -/* - * @author Jacek Ambroziak - * @author Santiago Pericas-Geertsen - * @author Morten Jorgensen - * - */ - -package com.sun.org.apache.xalan.internal.xsltc.compiler; - -import com.sun.java_cup.internal.runtime.Symbol; -%% -%cup -%unicode -%class XPathLexer -%yyeof - -%{ - int last; - - void initialize() { - last = -1; - } - - static boolean isWhitespace(int c) { - return (c == ' ' || c == '\t' || c == '\r' || c == '\n' || c == '\f'); - } - - /** - * If symbol is not followed by '::' or '(', then treat it as a - * name instead of an axis or function (Jira-1912). - */ - Symbol disambiguateAxisOrFunction(int ss) throws Exception { - // Peek in the input buffer without changing the internal state - int index = yy_buffer_index; - - // Skip whitespace - while (index < yy_buffer_read && isWhitespace(yy_buffer[index])) { - index++; - } - - // If end of buffer, can't disambiguate :( - if (index >= yy_buffer_read) { - // Can't disambiguate, so return as symbol - return new Symbol(ss); - } - - // Return symbol if next token is '::' or '(' - return (yy_buffer[index] == ':' && yy_buffer[index+1] == ':' || - yy_buffer[index] == '(') ? - newSymbol(ss) : newSymbol(sym.QNAME, yytext()); - } - - /** - * If symbol is first token or if it follows any of the operators - * listed in http://www.w3.org/TR/xpath#exprlex then treat as a - * name instead of a keyword (Jira-1912). - */ - Symbol disambiguateOperator(int ss) throws Exception { - switch (last) { - case -1: // first token - case sym.ATSIGN: - case sym.DCOLON: - case sym.LPAREN: - case sym.LBRACK: - case sym.COMMA: - case sym.AND: - case sym.OR: - case sym.MOD: - case sym.DIV: - case sym.MULT: - case sym.SLASH: - case sym.DSLASH: - case sym.VBAR: - case sym.PLUS: - case sym.MINUS: - case sym.EQ: - case sym.NE: - case sym.LT: - case sym.LE: - case sym.GT: - case sym.GE: - return newSymbol(sym.QNAME, yytext()); - } - return newSymbol(ss); - } - - /** - * If symbol is first token or if it follows any of the operators - * listed in http://www.w3.org/TR/xpath#exprlex then treat as a - * wildcard instead of a multiplication operator - */ - Symbol disambiguateStar() throws Exception { - switch (last) { - case -1: // first token - case sym.ATSIGN: - case sym.DCOLON: - case sym.LPAREN: - case sym.LBRACK: - case sym.COMMA: - case sym.AND: - case sym.OR: - case sym.MOD: - case sym.DIV: - case sym.MULT: - case sym.SLASH: - case sym.DSLASH: - case sym.VBAR: - case sym.PLUS: - case sym.MINUS: - case sym.EQ: - case sym.NE: - case sym.LT: - case sym.LE: - case sym.GT: - case sym.GE: - return newSymbol(sym.STAR); - } - return newSymbol(sym.MULT); - } - - Symbol newSymbol(int ss) { - last = ss; - return new Symbol(ss); - } - - Symbol newSymbol(int ss, String value) { - last = ss; - return new Symbol(ss, value); - } - - Symbol newSymbol(int ss, Long value) { - last = ss; - return new Symbol(ss, value); - } - - Symbol newSymbol(int ss, Double value) { - last = ss; - return new Symbol(ss, value); - } -%} - -%eofval{ -return newSymbol(sym.EOF); -%eofval} - -%yylexthrow{ -Exception -%yylexthrow} - -Letter={BaseChar}|{Ideographic} - -BaseChar=[\u0041-\u005A\u0061-\u007A\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF\u0100-\u0131\u0134-\u013E\u0141-\u0148\u014A-\u017E\u0180-\u01C3\u01CD-\u01F0\u01F4-\u01F5\u01FA-\u0217\u0250-\u02A8\u02BB-\u02C1\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03CE\u03D0-\u03D6\u03DA\u03DC\u03DE\u03E0\u03E2-\u03F3\u0401-\u040C\u040E-\u044F\u0451-\u045C\u045E-\u0481\u0490-\u04C4\u04C7-\u04C8\u04CB-\u04CC\u04D0-\u04EB\u04EE-\u04F5\u04F8-\u04F9\u0531-\u0556\u0559\u0561-\u0586\u05D0-\u05EA\u05F0-\u05F2\u0621-\u063A\u0641-\u064A\u0671-\u06B7\u06BA-\u06BE\u06C0-\u06CE\u06D0-\u06D3\u06D5\u06E5-\u06E6\u0905-\u0939\u093D\u0958-\u0961\u0985-\u098C\u098F-\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09DC-\u09DD\u09DF-\u09E1\u09F0-\u09F1\u0A05-\u0A0A\u0A0F-\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32-\u0A33\u0A35-\u0A36\u0A38-\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8B\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2-\u0AB3\u0AB5-\u0AB9\u0ABD\u0AE0\u0B05-\u0B0C\u0B0F-\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32-\u0B33\u0B36-\u0B39\u0B3D\u0B5C-\u0B5D\u0B5F-\u0B61\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99-\u0B9A\u0B9C\u0B9E-\u0B9F\u0BA3-\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB5\u0BB7-\u0BB9\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C33\u0C35-\u0C39\u0C60-\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CDE\u0CE0-\u0CE1\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D28\u0D2A-\u0D39\u0D60-\u0D61\u0E01-\u0E2E\u0E30\u0E32-\u0E33\u0E40-\u0E45\u0E81-\u0E82\u0E84\u0E87-\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA-\u0EAB\u0EAD-\u0EAE\u0EB0\u0EB2-\u0EB3\u0EBD\u0EC0-\u0EC4\u0F40-\u0F47\u0F49-\u0F69\u10A0-\u10C5\u10D0-\u10F6\u1100\u1102-\u1103\u1105-\u1107\u1109\u110B-\u110C\u110E-\u1112\u113C\u113E\u1140\u114C\u114E\u1150\u1154-\u1155\u1159\u115F-\u1161\u1163\u1165\u1167\u1169\u116D-\u116E\u1172-\u1173\u1175\u119E\u11A8\u11AB\u11AE-\u11AF\u11B7-\u11B8\u11BA\u11BC-\u11C2\u11EB\u11F0\u11F9\u1E00-\u1E9B\u1EA0-\u1EF9\u1F00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2126\u212A-\u212B\u212E\u2180-\u2182\u3041-\u3094\u30A1-\u30FA\u3105-\u312C\uAC00-\uD7A3] - -Ideographic=[\u4E00-\u9FA5\u3007\u3021-\u3029] - -CombiningChar=[\u0300-\u0345\u0360-\u0361\u0483-\u0486\u0591-\u05A1\u05A3-\u05B9\u05BB-\u05BD\u05BF\u05C1-\u05C2\u05C4\u064B-\u0652\u0670\u06D6-\u06DC\u06DD-\u06DF\u06E0-\u06E4\u06E7-\u06E8\u06EA-\u06ED\u0901-\u0903\u093C\u093E-\u094C\u094D\u0951-\u0954\u0962-\u0963\u0981-\u0983\u09BC\u09BE\u09BF\u09C0-\u09C4\u09C7-\u09C8\u09CB-\u09CD\u09D7\u09E2-\u09E3\u0A02\u0A3C\u0A3E\u0A3F\u0A40-\u0A42\u0A47-\u0A48\u0A4B-\u0A4D\u0A70-\u0A71\u0A81-\u0A83\u0ABC\u0ABE-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0B01-\u0B03\u0B3C\u0B3E-\u0B43\u0B47-\u0B48\u0B4B-\u0B4D\u0B56-\u0B57\u0B82-\u0B83\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD7\u0C01-\u0C03\u0C3E-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55-\u0C56\u0C82-\u0C83\u0CBE-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5-\u0CD6\u0D02-\u0D03\u0D3E-\u0D43\u0D46-\u0D48\u0D4A-\u0D4D\u0D57\u0E31\u0E34-\u0E3A\u0E47-\u0E4E\u0EB1\u0EB4-\u0EB9\u0EBB-\u0EBC\u0EC8-\u0ECD\u0F18-\u0F19\u0F35\u0F37\u0F39\u0F3E\u0F3F\u0F71-\u0F84\u0F86-\u0F8B\u0F90-\u0F95\u0F97\u0F99-\u0FAD\u0FB1-\u0FB7\u0FB9\u20D0-\u20DC\u20E1\u302A-\u302F\u3099\u309A] - -Digit=[\u0030-\u0039\u0660-\u0669\u06F0-\u06F9\u0966-\u096F\u09E6-\u09EF\u0A66-\u0A6F\u0AE6-\u0AEF\u0B66-\u0B6F\u0BE7-\u0BEF\u0C66-\u0C6F\u0CE6-\u0CEF\u0D66-\u0D6F\u0E50-\u0E59\u0ED0-\u0ED9\u0F20-\u0F29] - -Extender=[\u00B7\u02D0\u02D1\u0387\u0640\u0E46\u0EC6\u3005\u3031-\u3035\u309D-\u309E\u30FC-\u30FE] - -NCName=({Letter}|"_"|{NCNameStartChar})({NCNameChar})* - -NCNameChar={Letter}|{Digit}|"."|"-"|"_"|{CombiningChar}|{Extender}|{NCNameStartChar}| \u00B7 | [\u0300-\u036F] | [\u203F-\u2040] | [\u0130-\u0136] - -NCNameStartChar=[\u0041-\u005A\u0061-\u007A\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD] | \u005F |({HighSurrogate}{LowSurrogate}) - -HighSurrogate=[\uD800-\uDBFF] - -LowSurrogate=[\uDC00-\uDFFF] - -%% - -"*" { return disambiguateStar(); } -"/" { return newSymbol(sym.SLASH); } -"+" { return newSymbol(sym.PLUS); } -"-" { return newSymbol(sym.MINUS); } -"div" { return disambiguateOperator(sym.DIV); } -"mod" { return disambiguateOperator(sym.MOD); } -"::" { return newSymbol(sym.DCOLON); } -"," { return newSymbol(sym.COMMA); } -"@" { return newSymbol(sym.ATSIGN); } -".." { return newSymbol(sym.DDOT); } -"|" { return newSymbol(sym.VBAR); } -"$" { return newSymbol(sym.DOLLAR); } -"//" { return newSymbol(sym.DSLASH); } -"=" { return newSymbol(sym.EQ); } -"!=" { return newSymbol(sym.NE); } -"<" { return newSymbol(sym.LT); } -">" { return newSymbol(sym.GT); } -"<=" { return newSymbol(sym.LE); } -">=" { return newSymbol(sym.GE); } -"id" { return disambiguateAxisOrFunction(sym.ID); } -"key" { return disambiguateAxisOrFunction(sym.KEY); } -"text()" { return newSymbol(sym.TEXT); } -"text"+[ \t\r\n\f]+"()" { return newSymbol(sym.TEXT); } -"node()" { return newSymbol(sym.NODE); } -"node"+[ \t\r\n\f]+"()" { return newSymbol(sym.NODE); } -"comment()" { return newSymbol(sym.COMMENT); } -"comment"+[ \t\r\n\f]+"()" { return newSymbol(sym.COMMENT); } -"processing-instruction" { return disambiguateAxisOrFunction(sym.PIPARAM); } -"processing-instruction()" { return newSymbol(sym.PI); } -"processing-instruction"+[ \t\r\n\f]+"()" { return newSymbol(sym.PI); } -"or" { return disambiguateOperator(sym.OR); } -"and" { return disambiguateOperator(sym.AND); } -"child" { return disambiguateAxisOrFunction(sym.CHILD); } -"attribute" { return disambiguateAxisOrFunction(sym.ATTRIBUTE); } -"ancestor" { return disambiguateAxisOrFunction(sym.ANCESTOR); } -"ancestor-or-self" { return disambiguateAxisOrFunction(sym.ANCESTORORSELF); } -"descendant" { return disambiguateAxisOrFunction(sym.DESCENDANT); } -"descendant-or-self" { return disambiguateAxisOrFunction(sym.DESCENDANTORSELF); } -"following" { return disambiguateAxisOrFunction(sym.FOLLOWING); } -"following-sibling" { return disambiguateAxisOrFunction(sym.FOLLOWINGSIBLING); } -"namespace" { return disambiguateAxisOrFunction(sym.NAMESPACE); } -"parent" { return disambiguateAxisOrFunction(sym.PARENT); } -"preceding" { return disambiguateAxisOrFunction(sym.PRECEDING); } -"preceding-sibling" { return disambiguateAxisOrFunction(sym.PRECEDINGSIBLING); } -"self" { return disambiguateAxisOrFunction(sym.SELF); } -"[" { return newSymbol(sym.LBRACK); } -"]" { return newSymbol(sym.RBRACK); } -"(" { return newSymbol(sym.LPAREN); } -")" { return newSymbol(sym.RPAREN); } -"" { initialize(); return new Symbol(sym.PATTERN); } -"" { initialize(); return new Symbol(sym.EXPRESSION); } -\"[^\"]*\" { return newSymbol(sym.Literal, - yytext().substring(1, yytext().length() - 1)); } -\'[^\']*\' { return newSymbol(sym.Literal, - yytext().substring(1, yytext().length() - 1)); } -{Digit}+ { return newSymbol(sym.INT, new Long(yytext())); } -{Digit}+("."{Digit}*)? { return newSymbol(sym.REAL, new Double(yytext())); } -"."{Digit}+ { return newSymbol(sym.REAL, new Double(yytext())); } -"." { return newSymbol(sym.DOT); } -({NCName}":")?{NCName} { return newSymbol(sym.QNAME, yytext()); } -({NCName}":")?"*" { return newSymbol(sym.QNAME, yytext()); } -({NCName}":")?"@*" { return newSymbol(sym.QNAME, yytext()); } -[ \t\r\n\f] { /* ignore white space. */ } -. { throw new Exception(yytext()); } diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/HTMLEntities.res b/jaxp/src/com/sun/org/apache/xml/internal/serialize/HTMLEntities.res deleted file mode 100644 index 0423630112d..00000000000 --- a/jaxp/src/com/sun/org/apache/xml/internal/serialize/HTMLEntities.res +++ /dev/null @@ -1,290 +0,0 @@ -# $Id: HTMLEntities.res,v 1.3 2000/08/30 18:59:20 arkin Exp $ -# -# @author Assaf Arkin -# -# Character entity references for markup-significant -# -quot 34 -amp 38 -lt 60 -gt 62 -nbsp 160 -# -# Character entity references for ISO 8859-1 characters -# -iexcl 161 -cent 162 -pound 163 -curren 164 -yen 165 -brvbar 166 -sect 167 -uml 168 -copy 169 -ordf 170 -laquo 171 -not 172 -shy 173 -reg 174 -macr 175 -deg 176 -plusmn 177 -sup2 178 -sup3 179 -acute 180 -micro 181 -para 182 -middot 183 -cedil 184 -sup1 185 -ordm 186 -raquo 187 -frac14 188 -frac12 189 -frac34 190 -iquest 191 -Agrave 192 -Aacute 193 -Acirc 194 -Atilde 195 -Auml 196 -Aring 197 -AElig 198 -Ccedil 199 -Egrave 200 -Eacute 201 -Ecirc 202 -Euml 203 -Igrave 204 -Iacute 205 -Icirc 206 -Iuml 207 -ETH 208 -Ntilde 209 -Ograve 210 -Oacute 211 -Ocirc 212 -Otilde 213 -Ouml 214 -times 215 -Oslash 216 -Ugrave 217 -Uacute 218 -Ucirc 219 -Uuml 220 -Yacute 221 -THORN 222 -szlig 223 -agrave 224 -aacute 225 -acirc 226 -atilde 227 -auml 228 -aring 229 -aelig 230 -ccedil 231 -egrave 232 -eacute 233 -ecirc 234 -euml 235 -igrave 236 -iacute 237 -icirc 238 -iuml 239 -eth 240 -ntilde 241 -ograve 242 -oacute 243 -ocirc 244 -otilde 245 -ouml 246 -divide 247 -oslash 248 -ugrave 249 -uacute 250 -ucirc 251 -uuml 252 -yacute 253 -thorn 254 -yuml 255 -# -# Character entity references for symbols, mathematical symbols, and Greek letters -# -# Latin Extended -fnof 402 -# -# Greek -Alpha 913 -Beta 914 -Gamma 915 -Delta 916 -Epsilon 917 -Zeta 918 -Eta 919 -Theta 920 -Iota 921 -Kappa 922 -Lambda 923 -Mu 924 -Nu 925 -Xi 926 -Omicron 927 -Pi 928 -Rho 929 -Sigma 931 -Tau 932 -Upsilon 933 -Phi 934 -Chi 935 -Psi 936 -Omega 937 -alpha 945 -beta 946 -gamma 947 -delta 948 -epsilon 949 -zeta 950 -eta 951 -theta 952 -iota 953 -kappa 954 -lambda 955 -mu 956 -nu 957 -xi 958 -omicron 959 -pi 960 -rho 961 -sigmaf 962 -sigma 963 -tau 964 -upsilon 965 -phi 966 -chi 967 -psi 968 -omega 969 -thetasym 977 -upsih 978 -piv 982 -# -# General Punctuation -bull 8226 -hellip 8230 -prime 8242 -Prime 8243 -oline 8254 -frasl 8260 -# -# Letterlike Symbols -weierp 8472 -image 8465 -real 8476 -trade 8482 -alefsym 8501 -# -# Arrows -larr 8592 -uarr 8593 -rarr 8594 -darr 8595 -harr 8596 -crarr 8629 -lArr 8656 -uArr 8657 -rArr 8658 -dArr 8659 -hArr 8660 -# -# Mathematical Operators -forall 8704 -part 8706 -exist 8707 -empty 8709 -nabla 8711 -isin 8712 -notin 8713 -ni 8715 -prod 8719 -sum 8721 -minus 8722 -lowast 8727 -radic 8730 -prop 8733 -infin 8734 -ang 8736 -and 8743 -or 8744 -cap 8745 -cup 8746 -int 8747 -there4 8756 -sim 8764 -cong 8773 -asymp 8776 -ne 8800 -equiv 8801 -le 8804 -ge 8805 -sub 8834 -sup 8835 -nsub 8836 -sube 8838 -supe 8839 -oplus 8853 -otimes 8855 -perp 8869 -sdot 8901 -# -# Miscellaneous Technical -lceil 8968 -rceil 8969 -lfloor 8970 -rfloor 8971 -lang 9001 -rang 9002 -# -# Geometric Shapes -loz 9674 -# -# Miscellaneous Symbols -spades 9824 -clubs 9827 -hearts 9829 -diams 9830 -# -# Character entity references for internationalization characters -# -# Latin Extended-A -OElig 338 -oelig 339 -#-- Commented out. NN 4.7 does not seem to support these -- -#Scaron 352 -#scaron 353 -Yuml 376 -# -# Spacing Modifier Letters -circ 710 -tilde 732 -# -# General Punctuation -ensp 8194 -emsp 8195 -thinsp 8201 -zwnj 8204 -zwj 8205 -lrm 8206 -rlm 8207 -ndash 8211 -mdash 8212 -lsquo 8216 -rsquo 8217 -sbquo 8218 -ldquo 8220 -rdquo 8221 -bdquo 8222 -dagger 8224 -Dagger 8225 -permil 8240 -lsaquo 8249 -rsaquo 8250 -euro 8364 diff --git a/jaxp/src/com/sun/java_cup/internal/runtime/Scanner.java b/jaxp/src/java.xml/share/classes/com/sun/java_cup/internal/runtime/Scanner.java similarity index 100% rename from jaxp/src/com/sun/java_cup/internal/runtime/Scanner.java rename to jaxp/src/java.xml/share/classes/com/sun/java_cup/internal/runtime/Scanner.java diff --git a/jaxp/src/com/sun/java_cup/internal/runtime/Symbol.java b/jaxp/src/java.xml/share/classes/com/sun/java_cup/internal/runtime/Symbol.java similarity index 100% rename from jaxp/src/com/sun/java_cup/internal/runtime/Symbol.java rename to jaxp/src/java.xml/share/classes/com/sun/java_cup/internal/runtime/Symbol.java diff --git a/jaxp/src/com/sun/java_cup/internal/runtime/lr_parser.java b/jaxp/src/java.xml/share/classes/com/sun/java_cup/internal/runtime/lr_parser.java similarity index 100% rename from jaxp/src/com/sun/java_cup/internal/runtime/lr_parser.java rename to jaxp/src/java.xml/share/classes/com/sun/java_cup/internal/runtime/lr_parser.java diff --git a/jaxp/src/com/sun/java_cup/internal/runtime/virtual_parse_stack.java b/jaxp/src/java.xml/share/classes/com/sun/java_cup/internal/runtime/virtual_parse_stack.java similarity index 100% rename from jaxp/src/com/sun/java_cup/internal/runtime/virtual_parse_stack.java rename to jaxp/src/java.xml/share/classes/com/sun/java_cup/internal/runtime/virtual_parse_stack.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/Constants.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/Constants.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/Constants.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/Constants.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/ExceptionConstants.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/ExceptionConstants.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/ExceptionConstants.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/ExceptionConstants.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/Repository.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/Repository.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/Repository.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/Repository.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/AccessFlags.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/AccessFlags.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/AccessFlags.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/AccessFlags.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Attribute.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Attribute.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/Attribute.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Attribute.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/AttributeReader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/AttributeReader.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/AttributeReader.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/AttributeReader.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ClassFormatException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ClassFormatException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ClassFormatException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ClassFormatException.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ClassParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ClassParser.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ClassParser.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ClassParser.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Code.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Code.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/Code.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Code.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/CodeException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/CodeException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/CodeException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/CodeException.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Constant.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Constant.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/Constant.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Constant.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantCP.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantCP.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantCP.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantCP.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantClass.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantClass.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantClass.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantClass.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantDouble.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantDouble.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantDouble.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantDouble.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantFieldref.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantFieldref.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantFieldref.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantFieldref.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantFloat.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantFloat.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantFloat.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantFloat.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantInteger.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantInteger.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantInteger.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantInteger.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantInterfaceMethodref.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantInterfaceMethodref.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantInterfaceMethodref.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantInterfaceMethodref.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantLong.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantLong.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantLong.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantLong.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantMethodref.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantMethodref.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantMethodref.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantMethodref.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantNameAndType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantNameAndType.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantNameAndType.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantNameAndType.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantObject.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantObject.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantObject.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantObject.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantPool.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantPool.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantPool.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantPool.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantString.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantString.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantString.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantString.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantUtf8.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantUtf8.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantUtf8.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantUtf8.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantValue.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantValue.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantValue.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantValue.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Deprecated.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Deprecated.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/Deprecated.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Deprecated.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ExceptionTable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ExceptionTable.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ExceptionTable.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ExceptionTable.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Field.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Field.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/Field.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Field.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/FieldOrMethod.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/FieldOrMethod.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/FieldOrMethod.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/FieldOrMethod.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/InnerClass.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/InnerClass.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/InnerClass.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/InnerClass.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/InnerClasses.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/InnerClasses.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/InnerClasses.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/InnerClasses.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/JavaClass.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/JavaClass.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/JavaClass.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/JavaClass.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/LineNumber.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LineNumber.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/LineNumber.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LineNumber.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/LineNumberTable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LineNumberTable.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/LineNumberTable.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LineNumberTable.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/LocalVariable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LocalVariable.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/LocalVariable.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LocalVariable.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/LocalVariableTable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LocalVariableTable.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/LocalVariableTable.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LocalVariableTable.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/LocalVariableTypeTable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LocalVariableTypeTable.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/LocalVariableTypeTable.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LocalVariableTypeTable.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Method.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Method.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/Method.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Method.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Node.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Node.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/Node.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Node.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/PMGClass.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/PMGClass.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/PMGClass.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/PMGClass.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Signature.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Signature.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/Signature.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Signature.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/SourceFile.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/SourceFile.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/SourceFile.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/SourceFile.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/StackMap.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/StackMap.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/StackMap.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/StackMap.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/StackMapEntry.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/StackMapEntry.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/StackMapEntry.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/StackMapEntry.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/StackMapType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/StackMapType.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/StackMapType.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/StackMapType.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Synthetic.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Synthetic.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/Synthetic.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Synthetic.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Unknown.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Unknown.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/Unknown.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Unknown.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Utility.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Utility.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/Utility.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Utility.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Visitor.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Visitor.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/Visitor.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Visitor.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/package.html similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/package.html rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/package.html diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/AALOAD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AALOAD.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/AALOAD.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AALOAD.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/AASTORE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AASTORE.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/AASTORE.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AASTORE.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ACONST_NULL.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ACONST_NULL.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ACONST_NULL.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ACONST_NULL.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ALOAD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ALOAD.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ALOAD.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ALOAD.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ANEWARRAY.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ANEWARRAY.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ANEWARRAY.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ANEWARRAY.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ARETURN.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ARETURN.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ARETURN.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ARETURN.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ARRAYLENGTH.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ARRAYLENGTH.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ARRAYLENGTH.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ARRAYLENGTH.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ASTORE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ASTORE.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ASTORE.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ASTORE.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ATHROW.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ATHROW.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ATHROW.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ATHROW.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/AllocationInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AllocationInstruction.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/AllocationInstruction.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AllocationInstruction.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ArithmeticInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArithmeticInstruction.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ArithmeticInstruction.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArithmeticInstruction.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ArrayInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArrayInstruction.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ArrayInstruction.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArrayInstruction.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ArrayType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArrayType.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ArrayType.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArrayType.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/BALOAD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BALOAD.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/BALOAD.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BALOAD.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/BASTORE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BASTORE.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/BASTORE.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BASTORE.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/BIPUSH.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BIPUSH.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/BIPUSH.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BIPUSH.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/BREAKPOINT.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BREAKPOINT.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/BREAKPOINT.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BREAKPOINT.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/BasicType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BasicType.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/BasicType.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BasicType.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/BranchHandle.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BranchHandle.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/BranchHandle.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BranchHandle.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/BranchInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BranchInstruction.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/BranchInstruction.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BranchInstruction.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/CALOAD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CALOAD.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/CALOAD.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CALOAD.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/CASTORE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CASTORE.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/CASTORE.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CASTORE.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/CHECKCAST.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CHECKCAST.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/CHECKCAST.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CHECKCAST.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/CPInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CPInstruction.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/CPInstruction.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CPInstruction.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ClassGen.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassGen.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ClassGen.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassGen.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ClassGenException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassGenException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ClassGenException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassGenException.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ClassObserver.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassObserver.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ClassObserver.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassObserver.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/CodeExceptionGen.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CodeExceptionGen.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/CodeExceptionGen.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CodeExceptionGen.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/CompoundInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CompoundInstruction.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/CompoundInstruction.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CompoundInstruction.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ConstantPoolGen.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConstantPoolGen.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ConstantPoolGen.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConstantPoolGen.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ConstantPushInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConstantPushInstruction.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ConstantPushInstruction.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConstantPushInstruction.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ConversionInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConversionInstruction.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ConversionInstruction.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConversionInstruction.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/D2F.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2F.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/D2F.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2F.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/D2I.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2I.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/D2I.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2I.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/D2L.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2L.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/D2L.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2L.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DADD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DADD.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DADD.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DADD.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DALOAD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DALOAD.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DALOAD.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DALOAD.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DASTORE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DASTORE.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DASTORE.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DASTORE.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DCMPG.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCMPG.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DCMPG.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCMPG.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DCMPL.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCMPL.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DCMPL.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCMPL.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DCONST.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCONST.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DCONST.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCONST.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DDIV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DDIV.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DDIV.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DDIV.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DLOAD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DLOAD.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DLOAD.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DLOAD.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DMUL.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DMUL.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DMUL.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DMUL.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DNEG.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DNEG.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DNEG.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DNEG.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DREM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DREM.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DREM.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DREM.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DRETURN.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DRETURN.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DRETURN.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DRETURN.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DSTORE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DSTORE.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DSTORE.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DSTORE.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DSUB.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DSUB.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DSUB.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DSUB.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DUP.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DUP.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DUP2.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DUP2.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DUP2_X1.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2_X1.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DUP2_X1.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2_X1.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DUP2_X2.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2_X2.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DUP2_X2.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2_X2.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DUP_X1.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP_X1.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DUP_X1.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP_X1.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DUP_X2.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP_X2.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DUP_X2.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP_X2.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/EmptyVisitor.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/EmptyVisitor.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/EmptyVisitor.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/EmptyVisitor.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ExceptionThrower.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ExceptionThrower.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ExceptionThrower.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ExceptionThrower.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/F2D.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2D.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/F2D.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2D.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/F2I.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2I.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/F2I.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2I.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/F2L.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2L.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/F2L.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2L.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FADD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FADD.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FADD.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FADD.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FALOAD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FALOAD.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FALOAD.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FALOAD.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FASTORE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FASTORE.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FASTORE.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FASTORE.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FCMPG.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCMPG.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FCMPG.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCMPG.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FCMPL.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCMPL.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FCMPL.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCMPL.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FCONST.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCONST.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FCONST.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCONST.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FDIV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FDIV.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FDIV.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FDIV.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FLOAD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FLOAD.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FLOAD.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FLOAD.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FMUL.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FMUL.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FMUL.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FMUL.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FNEG.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FNEG.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FNEG.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FNEG.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FREM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FREM.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FREM.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FREM.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FRETURN.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FRETURN.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FRETURN.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FRETURN.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FSTORE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FSTORE.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FSTORE.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FSTORE.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FSUB.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FSUB.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FSUB.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FSUB.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FieldGen.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldGen.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FieldGen.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldGen.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FieldGenOrMethodGen.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldGenOrMethodGen.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FieldGenOrMethodGen.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldGenOrMethodGen.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FieldInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldInstruction.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FieldInstruction.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldInstruction.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FieldObserver.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldObserver.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FieldObserver.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldObserver.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FieldOrMethod.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldOrMethod.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FieldOrMethod.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldOrMethod.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/GETFIELD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GETFIELD.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/GETFIELD.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GETFIELD.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/GETSTATIC.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GETSTATIC.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/GETSTATIC.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GETSTATIC.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/GOTO.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GOTO.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/GOTO.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GOTO.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/GOTO_W.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GOTO_W.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/GOTO_W.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GOTO_W.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/GotoInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GotoInstruction.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/GotoInstruction.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GotoInstruction.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/I2B.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2B.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/I2B.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2B.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/I2C.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2C.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/I2C.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2C.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/I2D.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2D.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/I2D.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2D.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/I2F.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2F.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/I2F.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2F.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/I2L.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2L.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/I2L.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2L.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/I2S.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2S.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/I2S.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2S.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IADD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IADD.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IADD.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IADD.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IALOAD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IALOAD.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IALOAD.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IALOAD.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IAND.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IAND.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IAND.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IAND.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IASTORE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IASTORE.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IASTORE.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IASTORE.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ICONST.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ICONST.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ICONST.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ICONST.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IDIV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IDIV.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IDIV.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IDIV.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IFEQ.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFEQ.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IFEQ.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFEQ.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IFGE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFGE.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IFGE.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFGE.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IFGT.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFGT.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IFGT.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFGT.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IFLE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFLE.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IFLE.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFLE.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IFLT.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFLT.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IFLT.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFLT.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IFNE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNE.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IFNE.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNE.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IFNONNULL.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNONNULL.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IFNONNULL.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNONNULL.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IFNULL.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNULL.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IFNULL.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNULL.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ACMPEQ.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ACMPEQ.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ACMPEQ.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ACMPEQ.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ACMPNE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ACMPNE.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ACMPNE.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ACMPNE.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPEQ.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPEQ.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPEQ.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPEQ.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPGE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPGE.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPGE.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPGE.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPGT.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPGT.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPGT.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPGT.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPLE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPLE.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPLE.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPLE.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPLT.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPLT.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPLT.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPLT.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPNE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPNE.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPNE.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPNE.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IINC.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IINC.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IINC.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IINC.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ILOAD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ILOAD.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ILOAD.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ILOAD.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IMPDEP1.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMPDEP1.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IMPDEP1.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMPDEP1.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IMPDEP2.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMPDEP2.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IMPDEP2.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMPDEP2.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IMUL.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMUL.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IMUL.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMUL.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/INEG.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INEG.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/INEG.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INEG.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/INSTANCEOF.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INSTANCEOF.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/INSTANCEOF.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INSTANCEOF.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/INVOKEINTERFACE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEINTERFACE.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/INVOKEINTERFACE.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEINTERFACE.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/INVOKESPECIAL.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKESPECIAL.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/INVOKESPECIAL.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKESPECIAL.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/INVOKESTATIC.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKESTATIC.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/INVOKESTATIC.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKESTATIC.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/INVOKEVIRTUAL.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEVIRTUAL.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/INVOKEVIRTUAL.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEVIRTUAL.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IOR.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IOR.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IOR.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IOR.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IREM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IREM.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IREM.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IREM.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IRETURN.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IRETURN.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IRETURN.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IRETURN.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ISHL.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISHL.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ISHL.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISHL.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ISHR.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISHR.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ISHR.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISHR.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ISTORE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISTORE.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ISTORE.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISTORE.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ISUB.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISUB.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ISUB.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISUB.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IUSHR.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IUSHR.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IUSHR.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IUSHR.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IXOR.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IXOR.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IXOR.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IXOR.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IfInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IfInstruction.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IfInstruction.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IfInstruction.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IndexedInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IndexedInstruction.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IndexedInstruction.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IndexedInstruction.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/Instruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Instruction.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/Instruction.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Instruction.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/InstructionComparator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionComparator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/InstructionComparator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionComparator.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/InstructionConstants.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionConstants.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/InstructionConstants.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionConstants.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/InstructionFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionFactory.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/InstructionFactory.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionFactory.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/InstructionHandle.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionHandle.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/InstructionHandle.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionHandle.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/InstructionList.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionList.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/InstructionList.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionList.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/InstructionListObserver.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionListObserver.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/InstructionListObserver.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionListObserver.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/InstructionTargeter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionTargeter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/InstructionTargeter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionTargeter.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/InvokeInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InvokeInstruction.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/InvokeInstruction.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InvokeInstruction.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/JSR.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JSR.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/JSR.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JSR.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/JSR_W.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JSR_W.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/JSR_W.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JSR_W.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/JsrInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JsrInstruction.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/JsrInstruction.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JsrInstruction.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/L2D.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2D.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/L2D.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2D.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/L2F.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2F.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/L2F.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2F.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/L2I.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2I.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/L2I.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2I.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LADD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LADD.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LADD.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LADD.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LALOAD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LALOAD.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LALOAD.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LALOAD.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LAND.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LAND.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LAND.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LAND.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LASTORE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LASTORE.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LASTORE.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LASTORE.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LCMP.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LCMP.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LCMP.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LCMP.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LCONST.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LCONST.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LCONST.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LCONST.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LDC.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LDC.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LDC2_W.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC2_W.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LDC2_W.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC2_W.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LDC_W.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC_W.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LDC_W.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC_W.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LDIV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDIV.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LDIV.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDIV.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LLOAD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LLOAD.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LLOAD.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LLOAD.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LMUL.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LMUL.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LMUL.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LMUL.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LNEG.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LNEG.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LNEG.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LNEG.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LOOKUPSWITCH.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LOOKUPSWITCH.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LOOKUPSWITCH.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LOOKUPSWITCH.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LOR.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LOR.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LOR.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LOR.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LREM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LREM.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LREM.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LREM.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LRETURN.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LRETURN.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LRETURN.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LRETURN.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LSHL.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSHL.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LSHL.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSHL.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LSHR.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSHR.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LSHR.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSHR.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LSTORE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSTORE.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LSTORE.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSTORE.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LSUB.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSUB.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LSUB.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSUB.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LUSHR.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LUSHR.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LUSHR.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LUSHR.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LXOR.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LXOR.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LXOR.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LXOR.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LineNumberGen.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LineNumberGen.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LineNumberGen.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LineNumberGen.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LoadClass.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LoadClass.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LoadClass.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LoadClass.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LoadInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LoadInstruction.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LoadInstruction.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LoadInstruction.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LocalVariableGen.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LocalVariableGen.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LocalVariableGen.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LocalVariableGen.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LocalVariableInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LocalVariableInstruction.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LocalVariableInstruction.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LocalVariableInstruction.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/MONITORENTER.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITORENTER.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/MONITORENTER.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITORENTER.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/MONITOREXIT.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITOREXIT.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/MONITOREXIT.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITOREXIT.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/MULTIANEWARRAY.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MULTIANEWARRAY.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/MULTIANEWARRAY.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MULTIANEWARRAY.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/MethodGen.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MethodGen.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/MethodGen.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MethodGen.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/MethodObserver.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MethodObserver.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/MethodObserver.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MethodObserver.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/NEW.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NEW.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/NEW.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NEW.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/NEWARRAY.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NEWARRAY.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/NEWARRAY.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NEWARRAY.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/NOP.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NOP.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/NOP.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NOP.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/NamedAndTyped.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NamedAndTyped.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/NamedAndTyped.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NamedAndTyped.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ObjectType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ObjectType.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ObjectType.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ObjectType.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/POP.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/POP.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/POP.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/POP.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/POP2.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/POP2.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/POP2.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/POP2.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/PUSH.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUSH.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/PUSH.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUSH.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/PUTFIELD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUTFIELD.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/PUTFIELD.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUTFIELD.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/PUTSTATIC.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUTSTATIC.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/PUTSTATIC.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUTSTATIC.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/PopInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PopInstruction.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/PopInstruction.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PopInstruction.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/PushInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PushInstruction.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/PushInstruction.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PushInstruction.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/RET.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/RET.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/RET.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/RET.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/RETURN.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/RETURN.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/RETURN.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/RETURN.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ReferenceType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReferenceType.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ReferenceType.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReferenceType.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ReturnInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReturnInstruction.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ReturnInstruction.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReturnInstruction.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ReturnaddressType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReturnaddressType.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ReturnaddressType.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReturnaddressType.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/SALOAD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SALOAD.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/SALOAD.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SALOAD.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/SASTORE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SASTORE.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/SASTORE.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SASTORE.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/SIPUSH.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SIPUSH.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/SIPUSH.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SIPUSH.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/SWAP.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SWAP.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/SWAP.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SWAP.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/SWITCH.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SWITCH.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/SWITCH.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SWITCH.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/Select.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Select.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/Select.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Select.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/StackConsumer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackConsumer.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/StackConsumer.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackConsumer.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/StackInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackInstruction.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/StackInstruction.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackInstruction.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/StackProducer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackProducer.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/StackProducer.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackProducer.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/StoreInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StoreInstruction.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/StoreInstruction.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StoreInstruction.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/TABLESWITCH.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/TABLESWITCH.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/TABLESWITCH.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/TABLESWITCH.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/TargetLostException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/TargetLostException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/TargetLostException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/TargetLostException.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/Type.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Type.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/Type.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Type.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/TypedInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/TypedInstruction.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/TypedInstruction.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/TypedInstruction.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/UnconditionalBranch.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/UnconditionalBranch.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/UnconditionalBranch.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/UnconditionalBranch.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/VariableLengthInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/VariableLengthInstruction.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/VariableLengthInstruction.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/VariableLengthInstruction.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/Visitor.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Visitor.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/Visitor.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Visitor.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/package.html similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/package.html rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/package.html diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/package.html similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/package.html rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/package.html diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/AttributeHTML.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/AttributeHTML.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/util/AttributeHTML.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/AttributeHTML.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/BCELFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/BCELFactory.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/util/BCELFactory.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/BCELFactory.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/BCELifier.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/BCELifier.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/util/BCELifier.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/BCELifier.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/ByteSequence.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ByteSequence.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/util/ByteSequence.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ByteSequence.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/Class2HTML.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/Class2HTML.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/util/Class2HTML.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/Class2HTML.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/ClassLoader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassLoader.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/util/ClassLoader.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassLoader.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/ClassLoaderRepository.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassLoaderRepository.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/util/ClassLoaderRepository.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassLoaderRepository.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/ClassPath.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassPath.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/util/ClassPath.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassPath.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/ClassQueue.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassQueue.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/util/ClassQueue.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassQueue.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/ClassSet.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassSet.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/util/ClassSet.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassSet.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/ClassStack.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassStack.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/util/ClassStack.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassStack.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/ClassVector.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassVector.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/util/ClassVector.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassVector.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/CodeHTML.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/CodeHTML.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/util/CodeHTML.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/CodeHTML.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/ConstantHTML.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ConstantHTML.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/util/ConstantHTML.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ConstantHTML.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/InstructionFinder.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/InstructionFinder.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/util/InstructionFinder.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/InstructionFinder.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/JavaWrapper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/JavaWrapper.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/util/JavaWrapper.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/JavaWrapper.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/MethodHTML.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/MethodHTML.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/util/MethodHTML.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/MethodHTML.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/Repository.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/Repository.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/util/Repository.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/Repository.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/SecuritySupport.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/SecuritySupport.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/util/SecuritySupport.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/SecuritySupport.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/SyntheticRepository.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/SyntheticRepository.java similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/util/SyntheticRepository.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/SyntheticRepository.java diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/package.html similarity index 100% rename from jaxp/src/com/sun/org/apache/bcel/internal/util/package.html rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/package.html diff --git a/jaxp/src/com/sun/org/apache/regexp/internal/CharacterArrayCharacterIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/CharacterArrayCharacterIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/regexp/internal/CharacterArrayCharacterIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/CharacterArrayCharacterIterator.java diff --git a/jaxp/src/com/sun/org/apache/regexp/internal/CharacterIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/CharacterIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/regexp/internal/CharacterIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/CharacterIterator.java diff --git a/jaxp/src/com/sun/org/apache/regexp/internal/RE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/RE.java similarity index 100% rename from jaxp/src/com/sun/org/apache/regexp/internal/RE.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/RE.java diff --git a/jaxp/src/com/sun/org/apache/regexp/internal/RECompiler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/RECompiler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/regexp/internal/RECompiler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/RECompiler.java diff --git a/jaxp/src/com/sun/org/apache/regexp/internal/REDebugCompiler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/REDebugCompiler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/regexp/internal/REDebugCompiler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/REDebugCompiler.java diff --git a/jaxp/src/com/sun/org/apache/regexp/internal/REProgram.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/REProgram.java similarity index 100% rename from jaxp/src/com/sun/org/apache/regexp/internal/REProgram.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/REProgram.java diff --git a/jaxp/src/com/sun/org/apache/regexp/internal/RESyntaxException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/RESyntaxException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/regexp/internal/RESyntaxException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/RESyntaxException.java diff --git a/jaxp/src/com/sun/org/apache/regexp/internal/RETest.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/RETest.java similarity index 100% rename from jaxp/src/com/sun/org/apache/regexp/internal/RETest.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/RETest.java diff --git a/jaxp/src/com/sun/org/apache/regexp/internal/REUtil.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/REUtil.java similarity index 100% rename from jaxp/src/com/sun/org/apache/regexp/internal/REUtil.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/REUtil.java diff --git a/jaxp/src/com/sun/org/apache/regexp/internal/ReaderCharacterIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/ReaderCharacterIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/regexp/internal/ReaderCharacterIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/ReaderCharacterIterator.java diff --git a/jaxp/src/com/sun/org/apache/regexp/internal/StreamCharacterIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/StreamCharacterIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/regexp/internal/StreamCharacterIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/StreamCharacterIterator.java diff --git a/jaxp/src/com/sun/org/apache/regexp/internal/StringCharacterIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/StringCharacterIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/regexp/internal/StringCharacterIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/StringCharacterIterator.java diff --git a/jaxp/src/com/sun/org/apache/regexp/internal/recompile.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/recompile.java similarity index 100% rename from jaxp/src/com/sun/org/apache/regexp/internal/recompile.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/recompile.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/Version.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/Version.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/Version.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/Version.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/XalanConstants.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/XalanConstants.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/XalanConstants.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/XalanConstants.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/extensions/ExpressionContext.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/extensions/ExpressionContext.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/extensions/ExpressionContext.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/extensions/ExpressionContext.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/extensions/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/extensions/package.html similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/extensions/package.html rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/extensions/package.html diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltBase.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltBase.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltBase.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltBase.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltCommon.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltCommon.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltCommon.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltCommon.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltDatetime.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltDatetime.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltDatetime.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltDatetime.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltDynamic.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltDynamic.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltDynamic.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltDynamic.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltMath.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltMath.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltMath.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltMath.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltSets.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltSets.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltStrings.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltStrings.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltStrings.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltStrings.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/lib/Extensions.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/Extensions.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/lib/Extensions.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/Extensions.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/lib/NodeInfo.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/NodeInfo.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/lib/NodeInfo.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/NodeInfo.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/lib/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/package.html similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/lib/package.html rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/package.html diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLMessages.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLMessages.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/res/XSLMessages.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLMessages.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_en.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_en.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_en.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_en.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_pt_BR.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_pt_BR.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_pt_BR.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_pt_BR.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTInfo.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTInfo.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTInfo.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTInfo.properties diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/package.html similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/res/package.html rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/package.html diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/templates/Constants.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/templates/Constants.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/templates/Constants.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/templates/Constants.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/templates/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/templates/package.html similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/templates/package.html rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/templates/package.html diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/utils/ConfigurationError.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ConfigurationError.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/utils/ConfigurationError.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ConfigurationError.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/utils/FactoryImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/FactoryImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/utils/FactoryImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/FactoryImpl.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/utils/FeatureManager.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/FeatureManager.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/utils/FeatureManager.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/FeatureManager.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/utils/FeaturePropertyBase.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/FeaturePropertyBase.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/utils/FeaturePropertyBase.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/FeaturePropertyBase.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xslt/Process.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xslt/Process.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xslt/Process.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xslt/Process.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xslt/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xslt/package.html similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xslt/package.html rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xslt/package.html diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/CollatorFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/CollatorFactory.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/CollatorFactory.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/CollatorFactory.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/DOM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/DOM.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/DOM.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/DOM.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/DOMCache.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/DOMCache.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/DOMCache.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/DOMCache.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/DOMEnhancedForDTM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/DOMEnhancedForDTM.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/DOMEnhancedForDTM.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/DOMEnhancedForDTM.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/NodeIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/NodeIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/NodeIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/NodeIterator.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/ProcessorVersion.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/ProcessorVersion.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/ProcessorVersion.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/ProcessorVersion.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/StripFilter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/StripFilter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/StripFilter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/StripFilter.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/Translet.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/Translet.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/Translet.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/Translet.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/TransletException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/TransletException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/TransletException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/TransletException.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/Compile.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/Compile.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/Compile.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/Compile.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/Transform.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/Transform.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/Transform.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/Transform.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOpt.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOpt.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOpt.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOpt.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOptsException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOptsException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOptsException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOptsException.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/IllegalArgumentException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/IllegalArgumentException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/IllegalArgumentException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/IllegalArgumentException.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/MissingOptArgException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/MissingOptArgException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/MissingOptArgException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/MissingOptArgException.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsoluteLocationPath.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsoluteLocationPath.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsoluteLocationPath.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsoluteLocationPath.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsolutePathPattern.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsolutePathPattern.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsolutePathPattern.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsolutePathPattern.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AlternativePattern.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AlternativePattern.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AlternativePattern.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AlternativePattern.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AncestorPattern.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AncestorPattern.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AncestorPattern.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AncestorPattern.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyImports.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyImports.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyImports.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyImports.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyTemplates.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyTemplates.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyTemplates.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyTemplates.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ArgumentList.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ArgumentList.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ArgumentList.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ArgumentList.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Attribute.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Attribute.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Attribute.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Attribute.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeSet.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeSet.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeSet.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeSet.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValue.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValue.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValue.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValue.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValueTemplate.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValueTemplate.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValueTemplate.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValueTemplate.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/BinOpExpr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BinOpExpr.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/BinOpExpr.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BinOpExpr.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanCall.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanCall.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanCall.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanExpr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanExpr.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanExpr.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanExpr.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CallTemplate.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CallTemplate.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CallTemplate.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CallTemplate.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CastCall.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastCall.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CastCall.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CeilingCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CeilingCall.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CeilingCall.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CeilingCall.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Choose.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Choose.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Choose.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Choose.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Closure.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Closure.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Closure.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Closure.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Comment.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Comment.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Comment.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Comment.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CompilerException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CompilerException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CompilerException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CompilerException.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ConcatCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ConcatCall.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ConcatCall.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ConcatCall.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Constants.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Constants.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Constants.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Constants.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ContainsCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ContainsCall.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ContainsCall.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ContainsCall.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Copy.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Copy.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Copy.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Copy.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CopyOf.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CopyOf.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CopyOf.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CopyOf.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CurrentCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CurrentCall.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CurrentCall.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CurrentCall.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/DecimalFormatting.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/DecimalFormatting.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/DecimalFormatting.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/DecimalFormatting.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/DocumentCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/DocumentCall.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/DocumentCall.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/DocumentCall.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ElementAvailableCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ElementAvailableCall.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ElementAvailableCall.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ElementAvailableCall.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/EqualityExpr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/EqualityExpr.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/EqualityExpr.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/EqualityExpr.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Expression.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Expression.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Expression.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Expression.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Fallback.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Fallback.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Fallback.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Fallback.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterExpr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterExpr.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterExpr.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterExpr.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterParentPath.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterParentPath.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterParentPath.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterParentPath.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FilteredAbsoluteLocationPath.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FilteredAbsoluteLocationPath.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FilteredAbsoluteLocationPath.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FilteredAbsoluteLocationPath.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FloorCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FloorCall.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FloorCall.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FloorCall.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FlowList.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FlowList.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FlowList.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FlowList.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ForEach.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ForEach.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ForEach.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ForEach.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FormatNumberCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FormatNumberCall.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FormatNumberCall.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FormatNumberCall.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/GenerateIdCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/GenerateIdCall.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/GenerateIdCall.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/GenerateIdCall.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IdKeyPattern.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IdKeyPattern.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IdKeyPattern.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IdKeyPattern.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IdPattern.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IdPattern.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IdPattern.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IdPattern.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/If.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/If.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/If.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/If.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IllegalCharException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IllegalCharException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IllegalCharException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IllegalCharException.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Instruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Instruction.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Instruction.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Instruction.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IntExpr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IntExpr.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IntExpr.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IntExpr.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Key.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Key.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Key.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Key.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyCall.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyCall.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyCall.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyPattern.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyPattern.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyPattern.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyPattern.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LangCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LangCall.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LangCall.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LangCall.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LastCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LastCall.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LastCall.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LastCall.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralAttribute.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralAttribute.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralAttribute.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralAttribute.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralExpr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralExpr.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralExpr.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralExpr.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LocalNameCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LocalNameCall.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LocalNameCall.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LocalNameCall.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LocationPathPattern.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LocationPathPattern.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LocationPathPattern.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LocationPathPattern.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LogicalExpr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LogicalExpr.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LogicalExpr.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LogicalExpr.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Message.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Message.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Message.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Message.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NameBase.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NameBase.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NameBase.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NameBase.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NameCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NameCall.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NameCall.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NameCall.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceAlias.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceAlias.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceAlias.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceAlias.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceUriCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceUriCall.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceUriCall.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceUriCall.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NodeTest.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NodeTest.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NodeTest.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NodeTest.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NotCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NotCall.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NotCall.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NotCall.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Number.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Number.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Number.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Number.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NumberCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NumberCall.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NumberCall.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NumberCall.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Otherwise.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Otherwise.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Otherwise.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Otherwise.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Output.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Output.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Output.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Output.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Param.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Param.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Param.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Param.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ParameterRef.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ParameterRef.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ParameterRef.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ParameterRef.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentLocationPath.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentLocationPath.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentLocationPath.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentLocationPath.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentPattern.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentPattern.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentPattern.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentPattern.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Pattern.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Pattern.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Pattern.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Pattern.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/PositionCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/PositionCall.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/PositionCall.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/PositionCall.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Predicate.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Predicate.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Predicate.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Predicate.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstruction.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstruction.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstruction.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstructionPattern.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstructionPattern.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstructionPattern.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstructionPattern.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/QName.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/QName.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/QName.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/QName.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RealExpr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RealExpr.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RealExpr.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RealExpr.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RelationalExpr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RelationalExpr.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RelationalExpr.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RelationalExpr.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativeLocationPath.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativeLocationPath.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativeLocationPath.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativeLocationPath.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativePathPattern.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativePathPattern.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativePathPattern.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativePathPattern.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RoundCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RoundCall.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RoundCall.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RoundCall.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SimpleAttributeValue.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SimpleAttributeValue.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SimpleAttributeValue.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SimpleAttributeValue.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SourceLoader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SourceLoader.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SourceLoader.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SourceLoader.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StartsWithCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StartsWithCall.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StartsWithCall.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StartsWithCall.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Step.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Step.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Step.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Step.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StepPattern.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StepPattern.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StepPattern.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StepPattern.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StringCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StringCall.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StringCall.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StringCall.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Template.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Template.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Template.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Template.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/TestSeq.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TestSeq.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/TestSeq.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TestSeq.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Text.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Text.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Text.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Text.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/TopLevelElement.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TopLevelElement.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/TopLevelElement.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TopLevelElement.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/TransletOutput.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TransletOutput.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/TransletOutput.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TransletOutput.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnaryOpExpr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnaryOpExpr.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnaryOpExpr.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnaryOpExpr.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnionPathExpr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnionPathExpr.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnionPathExpr.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnionPathExpr.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnparsedEntityUriCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnparsedEntityUriCall.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnparsedEntityUriCall.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnparsedEntityUriCall.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnresolvedRef.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnresolvedRef.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnresolvedRef.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnresolvedRef.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnsupportedElement.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnsupportedElement.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnsupportedElement.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnsupportedElement.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UseAttributeSets.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UseAttributeSets.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UseAttributeSets.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UseAttributeSets.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ValueOf.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ValueOf.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ValueOf.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ValueOf.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Variable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Variable.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Variable.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Variable.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableBase.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableBase.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableBase.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableBase.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRef.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRef.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRef.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRef.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRefBase.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRefBase.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRefBase.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRefBase.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/When.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/When.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/When.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/When.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Whitespace.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Whitespace.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Whitespace.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Whitespace.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/WithParam.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/WithParam.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/WithParam.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/WithParam.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathLexer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathLexer.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathLexer.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathLexer.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathParser.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathParser.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathParser.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XslAttribute.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XslAttribute.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XslAttribute.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XslAttribute.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XslElement.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XslElement.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XslElement.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XslElement.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/sym.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/sym.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/sym.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/sym.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/AttributeSetMethodGenerator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/AttributeSetMethodGenerator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/AttributeSetMethodGenerator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/AttributeSetMethodGenerator.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/BooleanType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/BooleanType.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/BooleanType.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/BooleanType.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ClassGenerator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ClassGenerator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ClassGenerator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ClassGenerator.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/CompareGenerator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/CompareGenerator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/CompareGenerator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/CompareGenerator.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/FilterGenerator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/FilterGenerator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/FilterGenerator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/FilterGenerator.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/IntType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/IntType.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/IntType.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/IntType.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/InternalError.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/InternalError.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/InternalError.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/InternalError.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MarkerInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MarkerInstruction.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MarkerInstruction.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MarkerInstruction.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MatchGenerator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MatchGenerator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MatchGenerator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MatchGenerator.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodType.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodType.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodType.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NamedMethodGenerator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NamedMethodGenerator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NamedMethodGenerator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NamedMethodGenerator.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeCounterGenerator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeCounterGenerator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeCounterGenerator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeCounterGenerator.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSetType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSetType.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSetType.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSetType.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordFactGenerator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordFactGenerator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordFactGenerator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordFactGenerator.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordGenerator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordGenerator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordGenerator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordGenerator.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeType.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeType.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeType.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NumberType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NumberType.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NumberType.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NumberType.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectType.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectType.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectType.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/OutlineableChunkEnd.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/OutlineableChunkEnd.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/OutlineableChunkEnd.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/OutlineableChunkEnd.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/OutlineableChunkStart.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/OutlineableChunkStart.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/OutlineableChunkStart.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/OutlineableChunkStart.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RealType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RealType.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RealType.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RealType.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ReferenceType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ReferenceType.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ReferenceType.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ReferenceType.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ResultTreeType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ResultTreeType.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ResultTreeType.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ResultTreeType.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RtMethodGenerator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RtMethodGenerator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RtMethodGenerator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RtMethodGenerator.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/SlotAllocator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/SlotAllocator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/SlotAllocator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/SlotAllocator.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringStack.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringStack.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringStack.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringStack.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringType.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringType.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringType.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TestGenerator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TestGenerator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TestGenerator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TestGenerator.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Type.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Type.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Type.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Type.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TypeCheckError.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TypeCheckError.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TypeCheckError.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TypeCheckError.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Util.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Util.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Util.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Util.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/VoidType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/VoidType.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/VoidType.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/VoidType.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/AbsoluteIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/AbsoluteIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/AbsoluteIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/AbsoluteIterator.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/AnyNodeCounter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/AnyNodeCounter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/AnyNodeCounter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/AnyNodeCounter.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/ArrayNodeListIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/ArrayNodeListIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/ArrayNodeListIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/ArrayNodeListIterator.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/BitArray.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/BitArray.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/BitArray.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/BitArray.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/CachedNodeListIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CachedNodeListIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/CachedNodeListIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CachedNodeListIterator.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/ClonedNodeListIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/ClonedNodeListIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/ClonedNodeListIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/ClonedNodeListIterator.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/CollatorFactoryBase.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CollatorFactoryBase.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/CollatorFactoryBase.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CollatorFactoryBase.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListFilter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListFilter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListFilter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListFilter.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListIterator.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMAdapter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DOMAdapter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMAdapter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DOMAdapter.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMBuilder.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DOMBuilder.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMBuilder.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DOMBuilder.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DupFilterIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DupFilterIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DupFilterIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DupFilterIterator.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/EmptyFilter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/EmptyFilter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/EmptyFilter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/EmptyFilter.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/ExtendedSAX.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/ExtendedSAX.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/ExtendedSAX.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/ExtendedSAX.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/Filter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/Filter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/Filter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/Filter.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/FilterIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/FilterIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/FilterIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/FilterIterator.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/FilteredStepIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/FilteredStepIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/FilteredStepIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/FilteredStepIterator.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/ForwardPositionIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/ForwardPositionIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/ForwardPositionIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/ForwardPositionIterator.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MatchingIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/MatchingIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MatchingIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/MatchingIterator.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiValuedNodeHeapIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/MultiValuedNodeHeapIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiValuedNodeHeapIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/MultiValuedNodeHeapIterator.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultipleNodeCounter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/MultipleNodeCounter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultipleNodeCounter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/MultipleNodeCounter.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeCounter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeCounter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeCounter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeCounter.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeIteratorBase.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeIteratorBase.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeIteratorBase.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeIteratorBase.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecordFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecordFactory.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecordFactory.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecordFactory.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/NthIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NthIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/NthIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NthIterator.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SimpleResultTreeImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SimpleResultTreeImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SimpleResultTreeImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SimpleResultTreeImpl.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SingleNodeCounter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SingleNodeCounter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SingleNodeCounter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SingleNodeCounter.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SingletonIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SingletonIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SingletonIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SingletonIterator.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SortSettings.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SortSettings.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SortSettings.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SortSettings.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SortingIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SortingIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SortingIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SortingIterator.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/StepIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/StepIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/StepIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/StepIterator.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/StripWhitespaceFilter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/StripWhitespaceFilter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/StripWhitespaceFilter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/StripWhitespaceFilter.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/UnionIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/UnionIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/UnionIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/UnionIterator.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/XSLTCDTMManager.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/XSLTCDTMManager.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/XSLTCDTMManager.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/XSLTCDTMManager.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Attributes.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Attributes.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Attributes.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Attributes.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Constants.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Constants.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Constants.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Constants.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ca.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ca.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ca.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ca.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_cs.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_cs.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_cs.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_cs.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_es.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_es.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_es.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_es.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_fr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_fr.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_fr.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_fr.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_it.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_it.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_it.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_it.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ko.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ko.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ko.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ko.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_pt_BR.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_pt_BR.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_pt_BR.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_pt_BR.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sk.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sk.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sk.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sk.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sv.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sv.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sv.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sv.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_TW.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_TW.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_TW.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_TW.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Hashtable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Hashtable.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Hashtable.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Hashtable.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/InternalRuntimeError.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/InternalRuntimeError.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/InternalRuntimeError.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/InternalRuntimeError.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/MessageHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/MessageHandler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/MessageHandler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/MessageHandler.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Node.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Node.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Node.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Node.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Operators.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Operators.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Operators.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Operators.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Parameter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Parameter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Parameter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Parameter.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/StringValueHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/StringValueHandler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/StringValueHandler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/StringValueHandler.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/OutputBuffer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/OutputBuffer.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/OutputBuffer.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/OutputBuffer.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/StringOutputBuffer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/StringOutputBuffer.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/StringOutputBuffer.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/StringOutputBuffer.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/TransletOutputHandlerFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/TransletOutputHandlerFactory.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/TransletOutputHandlerFactory.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/TransletOutputHandlerFactory.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2TO.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2TO.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2TO.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2TO.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/OutputSettings.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/OutputSettings.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/OutputSettings.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/OutputSettings.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXBaseWriter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXBaseWriter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXBaseWriter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXBaseWriter.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXEventWriter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXEventWriter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXEventWriter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXEventWriter.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXStreamWriter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXStreamWriter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXStreamWriter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXStreamWriter.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/SmartTransformerFactoryImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SmartTransformerFactoryImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/SmartTransformerFactoryImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SmartTransformerFactoryImpl.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/StAXEvent2SAX.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/StAXEvent2SAX.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/StAXEvent2SAX.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/StAXEvent2SAX.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/StAXStream2SAX.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/StAXStream2SAX.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/StAXStream2SAX.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/StAXStream2SAX.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TrAXFilter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TrAXFilter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TrAXFilter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TrAXFilter.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerHandlerImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerHandlerImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerHandlerImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerHandlerImpl.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/XSLTCSource.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/XSLTCSource.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/XSLTCSource.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/XSLTCSource.java diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/util/IntegerArray.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/util/IntegerArray.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/util/IntegerArray.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/util/IntegerArray.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/AttrImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AttrImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/AttrImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AttrImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/AttrNSImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AttrNSImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/AttrNSImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AttrNSImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/AttributeMap.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AttributeMap.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/AttributeMap.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AttributeMap.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/CDATASectionImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CDATASectionImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/CDATASectionImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CDATASectionImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/CharacterDataImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CharacterDataImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/CharacterDataImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CharacterDataImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/ChildNode.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ChildNode.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/ChildNode.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ChildNode.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/CommentImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CommentImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/CommentImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CommentImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDOMImplementationImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CoreDOMImplementationImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDOMImplementationImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CoreDOMImplementationImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMErrorImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMErrorImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMErrorImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMErrorImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMImplementationImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMImplementationImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMImplementationListImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationListImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMImplementationListImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationListImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMImplementationSourceImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationSourceImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMImplementationSourceImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationSourceImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMInputImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMInputImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMInputImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMInputImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMLocatorImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMLocatorImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMLocatorImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMLocatorImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMMessageFormatter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMMessageFormatter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMMessageFormatter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMMessageFormatter.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMNormalizer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMNormalizer.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMNormalizer.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMNormalizer.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMOutputImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMOutputImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMOutputImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMOutputImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMStringListImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMStringListImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMStringListImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMStringListImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMXSImplementationSourceImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMXSImplementationSourceImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMXSImplementationSourceImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMXSImplementationSourceImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeepNodeListImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeepNodeListImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DeepNodeListImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeepNodeListImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredAttrImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredAttrImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredAttrImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredAttrImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredAttrNSImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredAttrNSImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredAttrNSImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredAttrNSImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredCDATASectionImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredCDATASectionImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredCDATASectionImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredCDATASectionImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredCommentImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredCommentImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredCommentImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredCommentImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDOMImplementationImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDOMImplementationImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDOMImplementationImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDOMImplementationImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentTypeImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDocumentTypeImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentTypeImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDocumentTypeImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredElementDefinitionImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredElementDefinitionImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredElementDefinitionImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredElementDefinitionImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredElementImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredElementImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredElementImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredElementImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredElementNSImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredElementNSImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredElementNSImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredElementNSImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredEntityImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredEntityImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredEntityImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredEntityImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredEntityReferenceImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredEntityReferenceImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredEntityReferenceImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredEntityReferenceImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredNode.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredNode.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredNode.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredNode.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredNotationImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredNotationImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredNotationImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredNotationImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredProcessingInstructionImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredProcessingInstructionImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredProcessingInstructionImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredProcessingInstructionImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredTextImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredTextImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredTextImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredTextImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentFragmentImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentFragmentImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentFragmentImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentFragmentImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/ElementDefinitionImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ElementDefinitionImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/ElementDefinitionImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ElementDefinitionImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/ElementImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ElementImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/ElementImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ElementImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/ElementNSImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ElementNSImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/ElementNSImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ElementNSImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/EntityImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/EntityImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/EntityImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/EntityImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/EntityReferenceImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/EntityReferenceImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/EntityReferenceImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/EntityReferenceImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/LCount.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/LCount.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/LCount.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/LCount.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/NodeImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NodeImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/NodeImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NodeImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/NodeIteratorImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NodeIteratorImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/NodeIteratorImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NodeIteratorImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/NodeListCache.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NodeListCache.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/NodeListCache.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NodeListCache.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/NotationImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NotationImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/NotationImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NotationImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/PSVIAttrNSImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIAttrNSImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/PSVIAttrNSImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIAttrNSImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/PSVIDOMImplementationImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIDOMImplementationImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/PSVIDOMImplementationImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIDOMImplementationImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/PSVIDocumentImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIDocumentImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/PSVIDocumentImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIDocumentImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/PSVIElementNSImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIElementNSImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/PSVIElementNSImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIElementNSImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/ParentNode.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ParentNode.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/ParentNode.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ParentNode.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/ProcessingInstructionImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ProcessingInstructionImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/ProcessingInstructionImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ProcessingInstructionImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/RangeExceptionImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/RangeExceptionImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/RangeExceptionImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/RangeExceptionImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/RangeImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/RangeImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/RangeImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/RangeImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/TextImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/TextImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/TextImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/TextImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/TreeWalkerImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/TreeWalkerImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/TreeWalkerImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/TreeWalkerImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/events/EventImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/events/EventImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/events/EventImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/events/EventImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/events/MutationEventImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/events/MutationEventImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/events/MutationEventImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/events/MutationEventImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/Constants.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/Constants.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/Constants.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/Constants.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/ExternalSubsetResolver.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/ExternalSubsetResolver.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/ExternalSubsetResolver.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/ExternalSubsetResolver.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/PropertyManager.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/PropertyManager.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/PropertyManager.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/PropertyManager.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/RevalidationHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/RevalidationHandler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/RevalidationHandler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/RevalidationHandler.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/Version.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/Version.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/Version.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/Version.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11DTDScannerImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11DTDScannerImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11DTDScannerImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11DTDScannerImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11NamespaceBinder.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11NamespaceBinder.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11NamespaceBinder.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11NamespaceBinder.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityDescription.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityDescription.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityDescription.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityDescription.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityHandler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityHandler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityHandler.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLNamespaceBinder.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLNamespaceBinder.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLNamespaceBinder.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLNamespaceBinder.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLScanner.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLScanner.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLStreamFilterImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLStreamFilterImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLStreamFilterImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLStreamFilterImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLVersionDetector.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLVersionDetector.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLVersionDetector.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLVersionDetector.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/BalancedDTDGrammar.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/BalancedDTDGrammar.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/BalancedDTDGrammar.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/BalancedDTDGrammar.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDProcessor.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDProcessor.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDProcessor.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDProcessor.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDValidator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDValidator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDValidator.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XML11NSDTDValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XML11NSDTDValidator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XML11NSDTDValidator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XML11NSDTDValidator.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLAttributeDecl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLAttributeDecl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLAttributeDecl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLAttributeDecl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLContentSpec.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLContentSpec.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLContentSpec.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLContentSpec.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDDescription.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDDescription.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDDescription.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDDescription.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDLoader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDLoader.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDLoader.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDLoader.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDProcessor.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDProcessor.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDProcessor.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDProcessor.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidator.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidatorFilter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidatorFilter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidatorFilter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidatorFilter.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLElementDecl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLElementDecl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLElementDecl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLElementDecl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLEntityDecl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLEntityDecl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLEntityDecl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLEntityDecl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLNSDTDValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLNSDTDValidator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLNSDTDValidator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLNSDTDValidator.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLNotationDecl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLNotationDecl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLNotationDecl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLNotationDecl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLSimpleType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLSimpleType.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLSimpleType.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLSimpleType.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMAny.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMAny.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMAny.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMAny.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMBinOp.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMBinOp.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMBinOp.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMBinOp.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMLeaf.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMLeaf.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMLeaf.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMLeaf.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMNode.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMNode.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMNode.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMNode.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMStateSet.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMStateSet.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMStateSet.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMStateSet.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMUniOp.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMUniOp.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMUniOp.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMUniOp.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/ContentModelValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/ContentModelValidator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/ContentModelValidator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/ContentModelValidator.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/MixedContentModel.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/MixedContentModel.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/MixedContentModel.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/MixedContentModel.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/SimpleContentModel.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/SimpleContentModel.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/SimpleContentModel.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/SimpleContentModel.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/DVFactoryException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DVFactoryException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/DVFactoryException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DVFactoryException.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/DatatypeValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DatatypeValidator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/DatatypeValidator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DatatypeValidator.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeFacetException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeFacetException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeFacetException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeFacetException.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeValueException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeValueException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeValueException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeValueException.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/SchemaDVFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/SchemaDVFactory.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/SchemaDVFactory.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/SchemaDVFactory.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/ValidatedInfo.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/ValidatedInfo.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/ValidatedInfo.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/ValidatedInfo.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/ValidationContext.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/ValidationContext.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/ValidationContext.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/ValidationContext.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/XSFacets.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/XSFacets.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/XSFacets.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/XSFacets.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/XSSimpleType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/XSSimpleType.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/XSSimpleType.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/XSSimpleType.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/ENTITYDatatypeValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/ENTITYDatatypeValidator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/ENTITYDatatypeValidator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/ENTITYDatatypeValidator.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDDatatypeValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDDatatypeValidator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDDatatypeValidator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDDatatypeValidator.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDREFDatatypeValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDREFDatatypeValidator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDREFDatatypeValidator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDREFDatatypeValidator.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/ListDatatypeValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/ListDatatypeValidator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/ListDatatypeValidator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/ListDatatypeValidator.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/NMTOKENDatatypeValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/NMTOKENDatatypeValidator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/NMTOKENDatatypeValidator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/NMTOKENDatatypeValidator.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/NOTATIONDatatypeValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/NOTATIONDatatypeValidator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/NOTATIONDatatypeValidator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/NOTATIONDatatypeValidator.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/StringDatatypeValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/StringDatatypeValidator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/StringDatatypeValidator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/StringDatatypeValidator.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDDatatypeValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDDatatypeValidator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDDatatypeValidator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDDatatypeValidator.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDREFDatatypeValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDREFDatatypeValidator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDREFDatatypeValidator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDREFDatatypeValidator.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/util/Base64.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/Base64.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/util/Base64.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/Base64.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/util/ByteListImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/ByteListImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/util/ByteListImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/ByteListImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/util/HexBin.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/HexBin.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/util/HexBin.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/HexBin.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AbstractDateTimeDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/AbstractDateTimeDV.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AbstractDateTimeDV.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/AbstractDateTimeDV.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyAtomicDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyAtomicDV.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyAtomicDV.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyAtomicDV.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AnySimpleDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/AnySimpleDV.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AnySimpleDV.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/AnySimpleDV.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyURIDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyURIDV.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyURIDV.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyURIDV.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/Base64BinaryDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/Base64BinaryDV.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/Base64BinaryDV.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/Base64BinaryDV.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseDVFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseDVFactory.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseDVFactory.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseDVFactory.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseSchemaDVFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseSchemaDVFactory.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseSchemaDVFactory.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseSchemaDVFactory.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/BooleanDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/BooleanDV.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/BooleanDV.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/BooleanDV.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DateDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DateDV.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DateDV.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DateDV.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DateTimeDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DateTimeDV.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DateTimeDV.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DateTimeDV.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DayDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DayDV.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DayDV.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DayDV.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DayTimeDurationDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DayTimeDurationDV.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DayTimeDurationDV.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DayTimeDurationDV.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DecimalDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DecimalDV.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DecimalDV.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DecimalDV.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DoubleDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DoubleDV.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DoubleDV.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DoubleDV.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DurationDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DurationDV.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DurationDV.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DurationDV.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/EntityDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/EntityDV.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/EntityDV.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/EntityDV.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/ExtendedSchemaDVFactoryImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/ExtendedSchemaDVFactoryImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/ExtendedSchemaDVFactoryImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/ExtendedSchemaDVFactoryImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/FloatDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/FloatDV.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/FloatDV.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/FloatDV.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/FullDVFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/FullDVFactory.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/FullDVFactory.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/FullDVFactory.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/HexBinaryDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/HexBinaryDV.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/HexBinaryDV.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/HexBinaryDV.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/IDDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/IDDV.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/IDDV.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/IDDV.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/IDREFDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/IDREFDV.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/IDREFDV.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/IDREFDV.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/IntegerDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/IntegerDV.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/IntegerDV.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/IntegerDV.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/ListDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/ListDV.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/ListDV.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/ListDV.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDV.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDV.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDV.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDayDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDayDV.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDayDV.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDayDV.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/PrecisionDecimalDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/PrecisionDecimalDV.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/PrecisionDecimalDV.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/PrecisionDecimalDV.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/QNameDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/QNameDV.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/QNameDV.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/QNameDV.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDVFactoryImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDVFactoryImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDVFactoryImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDVFactoryImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDateTimeException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDateTimeException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDateTimeException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDateTimeException.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/StringDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/StringDV.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/StringDV.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/StringDV.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/TimeDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/TimeDV.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/TimeDV.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/TimeDV.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/TypeValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/TypeValidator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/TypeValidator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/TypeValidator.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/UnionDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/UnionDV.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/UnionDV.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/UnionDV.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDecl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDecl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDecl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDecl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDelegate.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDelegate.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDelegate.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDelegate.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/YearDV.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearDV.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/YearDV.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDV.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDV.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDV.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDurationDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDurationDV.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDurationDV.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDurationDV.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/io/ASCIIReader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/io/ASCIIReader.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/io/ASCIIReader.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/io/ASCIIReader.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/io/MalformedByteSequenceException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/io/MalformedByteSequenceException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/io/MalformedByteSequenceException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/io/MalformedByteSequenceException.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/io/UCSReader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/io/UCSReader.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/io/UCSReader.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/io/UCSReader.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_es.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_es.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_es.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_es.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_fr.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_fr.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_fr.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_fr.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_it.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_it.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_it.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_it.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ja.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ja.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ja.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ja.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ko.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ko.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ko.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ko.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_pt_BR.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_pt_BR.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_pt_BR.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_pt_BR.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_sv.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_sv.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_sv.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_sv.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_CN.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_CN.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_CN.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_CN.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_TW.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_TW.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_TW.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_TW.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_de.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_de.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_de.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_de.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_es.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_es.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_es.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_es.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_fr.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_fr.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_fr.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_fr.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_it.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_it.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_it.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_it.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ja.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ja.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ja.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ja.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ko.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ko.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ko.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ko.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_pt_BR.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_pt_BR.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_pt_BR.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_pt_BR.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_sv.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_sv.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_sv.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_sv.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_CN.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_CN.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_CN.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_CN.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_TW.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_TW.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_TW.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_TW.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_es.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_es.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_es.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_es.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_fr.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_fr.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_fr.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_fr.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_it.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_it.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_it.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_it.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ja.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ja.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ja.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ja.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ko.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ko.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ko.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ko.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_pt_BR.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_pt_BR.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_pt_BR.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_pt_BR.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_sv.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_sv.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_sv.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_sv.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_CN.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_CN.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_CN.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_CN.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_TW.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_TW.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_TW.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_TW.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_de.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_de.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_de.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_de.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_es.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_es.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_es.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_es.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_fr.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_fr.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_fr.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_fr.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_it.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_it.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_it.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_it.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ja.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ja.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ja.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ja.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ko.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ko.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ko.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ko.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_pt_BR.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_pt_BR.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_pt_BR.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_pt_BR.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_CN.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_CN.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_CN.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_CN.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_TW.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_TW.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_TW.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_TW.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_es.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_es.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_es.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_es.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_fr.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_fr.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_fr.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_fr.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_it.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_it.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_it.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_it.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ko.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ko.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ko.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ko.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_pt_BR.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_pt_BR.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_pt_BR.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_pt_BR.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_TW.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_TW.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_TW.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_TW.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_de.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_de.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_de.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_de.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_es.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_es.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_es.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_es.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_fr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_fr.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_fr.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_fr.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_it.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_it.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_it.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_it.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ja.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ja.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ja.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ja.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ko.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ko.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ko.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ko.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_pt_BR.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_pt_BR.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_pt_BR.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_pt_BR.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_sv.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_sv.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_sv.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_sv.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_CN.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_CN.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_CN.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_CN.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_TW.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_TW.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_TW.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_TW.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_es.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_es.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_es.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_es.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_fr.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_fr.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_fr.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_fr.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ko.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ko.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ko.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ko.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_pt_BR.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_pt_BR.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_pt_BR.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_pt_BR.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_TW.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_TW.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_TW.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_TW.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_de.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_de.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_de.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_de.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_es.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_es.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_es.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_es.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_fr.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_fr.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_fr.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_fr.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_it.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_it.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_it.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_it.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ja.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ja.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ja.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ja.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ko.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ko.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ko.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ko.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_pt_BR.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_pt_BR.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_pt_BR.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_pt_BR.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_CN.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_CN.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_CN.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_CN.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_TW.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_TW.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_TW.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_TW.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_de.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_de.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_de.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_de.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_es.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_es.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_es.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_es.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_fr.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_fr.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_fr.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_fr.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_it.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_it.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_it.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_it.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ja.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ja.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ja.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ja.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ko.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ko.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ko.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ko.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_pt_BR.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_pt_BR.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_pt_BR.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_pt_BR.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_sv.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_sv.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_sv.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_sv.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_CN.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_CN.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_CN.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_CN.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_TW.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_TW.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_TW.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_TW.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/validation/EntityState.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/EntityState.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/validation/EntityState.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/EntityState.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/validation/ValidationManager.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ValidationManager.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/validation/ValidationManager.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ValidationManager.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/validation/ValidationState.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ValidationState.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/validation/ValidationState.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ValidationState.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPathException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/XPathException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPathException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/XPathException.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/BMPattern.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/BMPattern.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/BMPattern.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/BMPattern.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/CaseInsensitiveMap.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/CaseInsensitiveMap.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/CaseInsensitiveMap.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/CaseInsensitiveMap.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Match.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/Match.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Match.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/Match.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Op.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/Op.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Op.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/Op.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParseException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParseException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParseException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParseException.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/REUtil.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/REUtil.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/REUtil.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/REUtil.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RangeToken.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RangeToken.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RangeToken.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RangeToken.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_de.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_de.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_de.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_de.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_es.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_es.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_es.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_es.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_fr.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_fr.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_fr.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_fr.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_it.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_it.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_it.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_it.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ko.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ko.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ko.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ko.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_pt_BR.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_pt_BR.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_pt_BR.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_pt_BR.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_sv.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_sv.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_sv.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_sv.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_CN.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_CN.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_CN.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_CN.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_TW.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_TW.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_TW.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_TW.properties diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/AttributePSVImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/AttributePSVImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/AttributePSVImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/AttributePSVImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/ElementPSVImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/ElementPSVImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/ElementPSVImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/ElementPSVImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SchemaGrammar.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SchemaGrammar.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SchemaGrammar.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SchemaGrammar.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SchemaNamespaceSupport.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SchemaNamespaceSupport.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SchemaNamespaceSupport.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SchemaNamespaceSupport.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SchemaSymbols.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SchemaSymbols.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SchemaSymbols.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SchemaSymbols.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaException.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSAnnotationImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAnnotationImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSAnnotationImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAnnotationImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeDecl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeDecl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeDecl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeDecl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeGroupDecl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeGroupDecl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeGroupDecl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeGroupDecl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeUseImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeUseImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeUseImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeUseImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSComplexTypeDecl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSComplexTypeDecl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSComplexTypeDecl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSComplexTypeDecl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSConstraints.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSConstraints.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSConstraints.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSConstraints.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSDDescription.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSDDescription.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSDDescription.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSDDescription.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSDeclarationPool.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSDeclarationPool.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSDeclarationPool.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSDeclarationPool.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSElementDecl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSElementDecl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSElementDecl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSElementDecl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSGroupDecl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSGroupDecl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSGroupDecl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSGroupDecl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSImplementationImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSImplementationImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSImplementationImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSImplementationImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSLoaderImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSLoaderImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSLoaderImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSLoaderImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSModelGroupImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSModelGroupImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSModelGroupImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSModelGroupImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSModelImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSModelImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSModelImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSModelImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSNotationDecl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSNotationDecl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSNotationDecl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSNotationDecl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSParticleDecl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSParticleDecl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSParticleDecl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSParticleDecl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSWildcardDecl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSWildcardDecl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSWildcardDecl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSWildcardDecl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/Field.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/Field.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/Field.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/Field.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/FieldActivator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/FieldActivator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/FieldActivator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/FieldActivator.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/IdentityConstraint.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/IdentityConstraint.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/IdentityConstraint.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/IdentityConstraint.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/KeyRef.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/KeyRef.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/KeyRef.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/KeyRef.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/Selector.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/Selector.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/Selector.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/Selector.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/UniqueOrKey.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/UniqueOrKey.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/UniqueOrKey.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/UniqueOrKey.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/ValueStore.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/ValueStore.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/ValueStore.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/ValueStore.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/XPathMatcher.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/XPathMatcher.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/XPathMatcher.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/XPathMatcher.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMBuilder.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/CMBuilder.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMBuilder.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/CMBuilder.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSAllCM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSAllCM.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSAllCM.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSAllCM.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMBinOp.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMBinOp.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMBinOp.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMBinOp.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMLeaf.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMLeaf.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMLeaf.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMLeaf.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMRepeatingLeaf.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMRepeatingLeaf.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMRepeatingLeaf.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMRepeatingLeaf.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMUniOp.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMUniOp.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMUniOp.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMUniOp.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMValidator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMValidator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMValidator.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/AttrImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/AttrImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/AttrImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/AttrImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultDocument.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultDocument.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultDocument.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultDocument.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultElement.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultElement.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultElement.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultElement.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultNode.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultNode.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultNode.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultNode.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultText.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultText.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultText.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultText.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultXMLDocumentHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultXMLDocumentHandler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultXMLDocumentHandler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultXMLDocumentHandler.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/ElementImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/ElementImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/ElementImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/ElementImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/NamedNodeMapImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/NamedNodeMapImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/NamedNodeMapImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/NamedNodeMapImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/NodeImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/NodeImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/NodeImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/NodeImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOM.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOM.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOM.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMImplementation.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMImplementation.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMImplementation.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMImplementation.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMParser.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMParser.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMParser.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/TextImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/TextImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/TextImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/TextImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/SchemaContentHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/SchemaContentHandler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/SchemaContentHandler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/SchemaContentHandler.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/StAXSchemaParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/StAXSchemaParser.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/StAXSchemaParser.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/StAXSchemaParser.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAnnotationInfo.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAnnotationInfo.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAnnotationInfo.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAnnotationInfo.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractIDConstraintTraverser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractIDConstraintTraverser.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractIDConstraintTraverser.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractIDConstraintTraverser.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractParticleTraverser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractParticleTraverser.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractParticleTraverser.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractParticleTraverser.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractTraverser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractTraverser.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractTraverser.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractTraverser.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeGroupTraverser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeGroupTraverser.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeGroupTraverser.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeGroupTraverser.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeTraverser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeTraverser.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeTraverser.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeTraverser.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDComplexTypeTraverser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDComplexTypeTraverser.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDComplexTypeTraverser.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDComplexTypeTraverser.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDElementTraverser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDElementTraverser.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDElementTraverser.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDElementTraverser.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDGroupTraverser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDGroupTraverser.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDGroupTraverser.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDGroupTraverser.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDKeyrefTraverser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDKeyrefTraverser.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDKeyrefTraverser.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDKeyrefTraverser.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDNotationTraverser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDNotationTraverser.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDNotationTraverser.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDNotationTraverser.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDSimpleTypeTraverser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDSimpleTypeTraverser.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDSimpleTypeTraverser.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDSimpleTypeTraverser.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDUniqueOrKeyTraverser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDUniqueOrKeyTraverser.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDUniqueOrKeyTraverser.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDUniqueOrKeyTraverser.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDWildcardTraverser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDWildcardTraverser.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDWildcardTraverser.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDWildcardTraverser.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDocumentInfo.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDocumentInfo.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDocumentInfo.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDocumentInfo.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/LSInputListImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/LSInputListImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/LSInputListImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/LSInputListImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/ObjectListImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/ObjectListImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/ObjectListImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/ObjectListImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/ShortListImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/ShortListImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/ShortListImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/ShortListImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/SimpleLocator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/SimpleLocator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/SimpleLocator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/SimpleLocator.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/StringListImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/StringListImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/StringListImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/StringListImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XInt.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XInt.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XInt.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XInt.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XIntPool.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XIntPool.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XIntPool.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XIntPool.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSGrammarPool.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSGrammarPool.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSGrammarPool.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSGrammarPool.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSInputSource.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSInputSource.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSInputSource.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSInputSource.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMap4Types.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMap4Types.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMap4Types.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMap4Types.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMapImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMapImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMapImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMapImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSObjectListImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSObjectListImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSObjectListImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSObjectListImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DefaultValidationErrorHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DefaultValidationErrorHandler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DefaultValidationErrorHandler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DefaultValidationErrorHandler.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/JAXPConstants.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/JAXPConstants.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/JAXPConstants.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/JAXPConstants.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/JAXPValidatorComponent.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/JAXPValidatorComponent.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/JAXPValidatorComponent.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/JAXPValidatorComponent.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SchemaValidatorConfiguration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SchemaValidatorConfiguration.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SchemaValidatorConfiguration.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SchemaValidatorConfiguration.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/TeeXMLDocumentFilterImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/TeeXMLDocumentFilterImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/TeeXMLDocumentFilterImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/TeeXMLDocumentFilterImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/UnparsedEntityHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/UnparsedEntityHandler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/UnparsedEntityHandler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/UnparsedEntityHandler.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMDocumentHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMDocumentHandler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMDocumentHandler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMDocumentHandler.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultAugmentor.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultAugmentor.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultAugmentor.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultAugmentor.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultBuilder.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultBuilder.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultBuilder.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultBuilder.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMValidatorHelper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMValidatorHelper.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMValidatorHelper.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMValidatorHelper.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/DraconianErrorHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DraconianErrorHandler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/DraconianErrorHandler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DraconianErrorHandler.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/EmptyXMLSchema.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/EmptyXMLSchema.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/EmptyXMLSchema.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/EmptyXMLSchema.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ErrorHandlerAdaptor.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ErrorHandlerAdaptor.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ErrorHandlerAdaptor.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ErrorHandlerAdaptor.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ReadOnlyGrammarPool.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ReadOnlyGrammarPool.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ReadOnlyGrammarPool.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ReadOnlyGrammarPool.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/SimpleXMLSchema.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/SimpleXMLSchema.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/SimpleXMLSchema.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/SimpleXMLSchema.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/SoftReferenceGrammarPool.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/SoftReferenceGrammarPool.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/SoftReferenceGrammarPool.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/SoftReferenceGrammarPool.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/Util.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/Util.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/Util.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/Util.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHelper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHelper.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHelper.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHelper.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/WeakReferenceXMLSchema.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WeakReferenceXMLSchema.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/WeakReferenceXMLSchema.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WeakReferenceXMLSchema.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchema.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchema.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchema.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchema.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XSGrammarPoolContainer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XSGrammarPoolContainer.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XSGrammarPoolContainer.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XSGrammarPoolContainer.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/AbstractXMLDocumentParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractXMLDocumentParser.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/AbstractXMLDocumentParser.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractXMLDocumentParser.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/BasicParserConfiguration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/BasicParserConfiguration.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/BasicParserConfiguration.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/BasicParserConfiguration.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/CachingParserPool.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/CachingParserPool.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/CachingParserPool.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/CachingParserPool.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/DOMParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DOMParser.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/DOMParser.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DOMParser.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/DOMParserImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DOMParserImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/DOMParserImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DOMParserImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/DTDParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DTDParser.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/DTDParser.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DTDParser.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/IntegratedParserConfiguration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/IntegratedParserConfiguration.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/IntegratedParserConfiguration.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/IntegratedParserConfiguration.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/SAXParser.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/SAXParser.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/StandardParserConfiguration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/StandardParserConfiguration.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/StandardParserConfiguration.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/StandardParserConfiguration.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XIncludeAwareParserConfiguration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XIncludeAwareParserConfiguration.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/XIncludeAwareParserConfiguration.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XIncludeAwareParserConfiguration.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XIncludeParserConfiguration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XIncludeParserConfiguration.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/XIncludeParserConfiguration.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XIncludeParserConfiguration.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11Configurable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11Configurable.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11Configurable.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11Configurable.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11DTDConfiguration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11DTDConfiguration.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11DTDConfiguration.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11DTDConfiguration.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11NonValidatingConfiguration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11NonValidatingConfiguration.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11NonValidatingConfiguration.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11NonValidatingConfiguration.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLDocumentParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLDocumentParser.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLDocumentParser.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLDocumentParser.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarCachingConfiguration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLGrammarCachingConfiguration.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarCachingConfiguration.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLGrammarCachingConfiguration.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLGrammarParser.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarParser.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLGrammarParser.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLParser.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLParser.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLParser.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XPointerParserConfiguration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XPointerParserConfiguration.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/XPointerParserConfiguration.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XPointerParserConfiguration.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/AttributesProxy.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/AttributesProxy.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/AttributesProxy.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/AttributesProxy.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/DOMEntityResolverWrapper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMEntityResolverWrapper.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/DOMEntityResolverWrapper.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMEntityResolverWrapper.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/DOMInputSource.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMInputSource.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/DOMInputSource.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMInputSource.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/DOMUtil.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMUtil.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/DOMUtil.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMUtil.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/DatatypeMessageFormatter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DatatypeMessageFormatter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/DatatypeMessageFormatter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DatatypeMessageFormatter.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/DefaultErrorHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DefaultErrorHandler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/DefaultErrorHandler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DefaultErrorHandler.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/DraconianErrorHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DraconianErrorHandler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/DraconianErrorHandler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DraconianErrorHandler.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/EncodingMap.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/EncodingMap.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/EncodingMap.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/EncodingMap.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/EntityResolver2Wrapper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/EntityResolver2Wrapper.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/EntityResolver2Wrapper.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/EntityResolver2Wrapper.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/EntityResolverWrapper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/EntityResolverWrapper.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/EntityResolverWrapper.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/EntityResolverWrapper.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/ErrorHandlerProxy.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ErrorHandlerProxy.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/ErrorHandlerProxy.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ErrorHandlerProxy.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/ErrorHandlerWrapper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ErrorHandlerWrapper.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/ErrorHandlerWrapper.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ErrorHandlerWrapper.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/FeatureState.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/FeatureState.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/FeatureState.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/FeatureState.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/HTTPInputSource.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/HTTPInputSource.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/HTTPInputSource.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/HTTPInputSource.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/IntStack.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/IntStack.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/IntStack.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/IntStack.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/JAXPNamespaceContextWrapper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/JAXPNamespaceContextWrapper.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/JAXPNamespaceContextWrapper.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/JAXPNamespaceContextWrapper.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/LocatorProxy.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/LocatorProxy.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/LocatorProxy.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/LocatorProxy.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/LocatorWrapper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/LocatorWrapper.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/LocatorWrapper.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/LocatorWrapper.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/MessageFormatter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/MessageFormatter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/MessageFormatter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/MessageFormatter.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/NamespaceContextWrapper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/NamespaceContextWrapper.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/NamespaceContextWrapper.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/NamespaceContextWrapper.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/NamespaceSupport.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/NamespaceSupport.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/NamespaceSupport.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/NamespaceSupport.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/ParserConfigurationSettings.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ParserConfigurationSettings.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/ParserConfigurationSettings.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ParserConfigurationSettings.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/PropertyState.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/PropertyState.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/PropertyState.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/PropertyState.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/SAX2XNI.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAX2XNI.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/SAX2XNI.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAX2XNI.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/SAXInputSource.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAXInputSource.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/SAXInputSource.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAXInputSource.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/SAXLocatorWrapper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAXLocatorWrapper.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/SAXLocatorWrapper.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAXLocatorWrapper.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/SecurityManager.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SecurityManager.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/SecurityManager.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SecurityManager.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/ShadowedSymbolTable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ShadowedSymbolTable.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/ShadowedSymbolTable.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ShadowedSymbolTable.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/StAXInputSource.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/StAXInputSource.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/StAXInputSource.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/StAXInputSource.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/StAXLocationWrapper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/StAXLocationWrapper.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/StAXLocationWrapper.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/StAXLocationWrapper.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/Status.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/Status.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/Status.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/Status.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/SymbolHash.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SymbolHash.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/SymbolHash.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SymbolHash.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/SymbolTable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SymbolTable.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/SymbolTable.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SymbolTable.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/SynchronizedSymbolTable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SynchronizedSymbolTable.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/SynchronizedSymbolTable.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SynchronizedSymbolTable.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/TeeXMLDocumentFilterImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/TeeXMLDocumentFilterImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/TeeXMLDocumentFilterImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/TeeXMLDocumentFilterImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/TypeInfoImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/TypeInfoImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/TypeInfoImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/TypeInfoImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/URI.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/URI.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/URI.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/URI.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/XML11Char.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XML11Char.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/XML11Char.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XML11Char.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLAttributesImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLAttributesImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/XMLAttributesImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLAttributesImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLAttributesIteratorImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLAttributesIteratorImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/XMLAttributesIteratorImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLAttributesIteratorImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLCatalogResolver.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLCatalogResolver.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/XMLCatalogResolver.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLCatalogResolver.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLChar.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLChar.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/XMLChar.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLChar.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLDocumentFilterImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLDocumentFilterImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/XMLDocumentFilterImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLDocumentFilterImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLEntityDescriptionImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLEntityDescriptionImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/XMLEntityDescriptionImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLEntityDescriptionImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLErrorCode.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLErrorCode.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/XMLErrorCode.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLErrorCode.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLGrammarPoolImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLGrammarPoolImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/XMLGrammarPoolImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLGrammarPoolImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLInputSourceAdaptor.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLInputSourceAdaptor.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/XMLInputSourceAdaptor.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLInputSourceAdaptor.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLResourceIdentifierImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLResourceIdentifierImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/XMLResourceIdentifierImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLResourceIdentifierImpl.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLStringBuffer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLStringBuffer.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/XMLStringBuffer.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLStringBuffer.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLSymbols.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLSymbols.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/util/XMLSymbols.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLSymbols.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/utils/ConfigurationError.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ConfigurationError.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/utils/ConfigurationError.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ConfigurationError.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/utils/SecuritySupport.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/SecuritySupport.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/utils/SecuritySupport.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/SecuritySupport.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/MultipleScopeNamespaceSupport.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/MultipleScopeNamespaceSupport.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xinclude/MultipleScopeNamespaceSupport.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/MultipleScopeNamespaceSupport.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/SecuritySupport.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/SecuritySupport.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xinclude/SecuritySupport.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/SecuritySupport.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XInclude11TextReader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XInclude11TextReader.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XInclude11TextReader.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XInclude11TextReader.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeMessageFormatter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeMessageFormatter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeMessageFormatter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeMessageFormatter.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeNamespaceSupport.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeNamespaceSupport.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeNamespaceSupport.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeNamespaceSupport.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeTextReader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeTextReader.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeTextReader.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeTextReader.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XPointerElementHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XPointerElementHandler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XPointerElementHandler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XPointerElementHandler.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XPointerFramework.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XPointerFramework.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XPointerFramework.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XPointerFramework.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XPointerSchema.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XPointerSchema.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XPointerSchema.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XPointerSchema.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/Augmentations.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/Augmentations.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/Augmentations.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/Augmentations.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/NamespaceContext.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/NamespaceContext.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/NamespaceContext.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/NamespaceContext.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/QName.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/QName.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/QName.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/QName.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLAttributes.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLAttributes.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLAttributes.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLAttributes.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLDTDContentModelHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLDTDContentModelHandler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLDTDContentModelHandler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLDTDContentModelHandler.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLDTDHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLDTDHandler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLDTDHandler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLDTDHandler.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLDocumentFragmentHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLDocumentFragmentHandler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLDocumentFragmentHandler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLDocumentFragmentHandler.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLDocumentHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLDocumentHandler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLDocumentHandler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLDocumentHandler.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLLocator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLLocator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLLocator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLLocator.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLResourceIdentifier.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLResourceIdentifier.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLResourceIdentifier.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLResourceIdentifier.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLString.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLString.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLString.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLString.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/XNIException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XNIException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/XNIException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XNIException.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/Grammar.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/Grammar.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/Grammar.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/Grammar.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLDTDDescription.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLDTDDescription.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLDTDDescription.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLDTDDescription.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarDescription.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarDescription.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarDescription.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarDescription.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarLoader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarLoader.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarLoader.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarLoader.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarPool.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarPool.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarPool.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarPool.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLSchemaDescription.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLSchemaDescription.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLSchemaDescription.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLSchemaDescription.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/XSGrammar.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XSGrammar.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/XSGrammar.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XSGrammar.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLComponent.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLComponent.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLComponent.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLComponent.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLComponentManager.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLComponentManager.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLComponentManager.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLComponentManager.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLConfigurationException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLConfigurationException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLConfigurationException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLConfigurationException.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelFilter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelFilter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelFilter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelFilter.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelSource.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelSource.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelSource.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelSource.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDFilter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDFilter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDFilter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDFilter.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDSource.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDSource.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDSource.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDSource.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentFilter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentFilter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentFilter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentFilter.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentScanner.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentScanner.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentScanner.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentScanner.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentSource.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentSource.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentSource.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentSource.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLEntityResolver.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLEntityResolver.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLEntityResolver.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLEntityResolver.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLErrorHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLErrorHandler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLErrorHandler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLErrorHandler.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLInputSource.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLInputSource.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLInputSource.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLInputSource.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLParseException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLParseException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLParseException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLParseException.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLParserConfiguration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLParserConfiguration.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLParserConfiguration.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLParserConfiguration.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLPullParserConfiguration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLPullParserConfiguration.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLPullParserConfiguration.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLPullParserConfiguration.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xpointer/ElementSchemePointer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/ElementSchemePointer.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xpointer/ElementSchemePointer.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/ElementSchemePointer.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xpointer/ShortHandPointer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/ShortHandPointer.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xpointer/ShortHandPointer.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/ShortHandPointer.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xpointer/XPointerErrorHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerErrorHandler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xpointer/XPointerErrorHandler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerErrorHandler.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xpointer/XPointerHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerHandler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xpointer/XPointerHandler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerHandler.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xpointer/XPointerPart.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerPart.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xpointer/XPointerPart.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerPart.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xpointer/XPointerProcessor.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerProcessor.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xpointer/XPointerProcessor.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerProcessor.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/AttributePSVI.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/AttributePSVI.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/AttributePSVI.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/AttributePSVI.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/ElementPSVI.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/ElementPSVI.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/ElementPSVI.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/ElementPSVI.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/ItemPSVI.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/ItemPSVI.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/ItemPSVI.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/ItemPSVI.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/LSInputList.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/LSInputList.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/LSInputList.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/LSInputList.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/PSVIProvider.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/PSVIProvider.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/PSVIProvider.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/PSVIProvider.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/ShortList.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/ShortList.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/ShortList.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/ShortList.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/StringList.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/StringList.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/StringList.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/StringList.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSAnnotation.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSAnnotation.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSAnnotation.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSAnnotation.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSAttributeDeclaration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSAttributeDeclaration.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSAttributeDeclaration.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSAttributeDeclaration.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSAttributeGroupDefinition.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSAttributeGroupDefinition.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSAttributeGroupDefinition.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSAttributeGroupDefinition.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSAttributeUse.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSAttributeUse.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSAttributeUse.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSAttributeUse.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSComplexTypeDefinition.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSComplexTypeDefinition.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSComplexTypeDefinition.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSComplexTypeDefinition.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSConstants.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSConstants.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSConstants.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSConstants.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSElementDeclaration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSElementDeclaration.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSElementDeclaration.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSElementDeclaration.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSException.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSFacet.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSFacet.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSFacet.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSFacet.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSIDCDefinition.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSIDCDefinition.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSIDCDefinition.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSIDCDefinition.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSImplementation.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSImplementation.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSImplementation.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSImplementation.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSLoader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSLoader.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSLoader.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSLoader.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSModel.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSModel.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSModel.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSModel.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSModelGroup.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSModelGroup.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSModelGroup.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSModelGroup.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSModelGroupDefinition.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSModelGroupDefinition.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSModelGroupDefinition.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSModelGroupDefinition.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSMultiValueFacet.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSMultiValueFacet.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSMultiValueFacet.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSMultiValueFacet.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSNamedMap.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamedMap.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSNamedMap.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamedMap.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSNamespaceItem.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamespaceItem.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSNamespaceItem.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamespaceItem.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSNamespaceItemList.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamespaceItemList.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSNamespaceItemList.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamespaceItemList.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSNotationDeclaration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNotationDeclaration.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSNotationDeclaration.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNotationDeclaration.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSObject.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSObject.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSObject.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSObject.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSObjectList.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSObjectList.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSObjectList.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSObjectList.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSParticle.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSParticle.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSParticle.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSParticle.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSSimpleTypeDefinition.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSSimpleTypeDefinition.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSSimpleTypeDefinition.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSSimpleTypeDefinition.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSTerm.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSTerm.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSTerm.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSTerm.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSTypeDefinition.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSTypeDefinition.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSTypeDefinition.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSTypeDefinition.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSWildcard.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSWildcard.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSWildcard.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSWildcard.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/ByteList.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/ByteList.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/ByteList.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/ByteList.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/ObjectList.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/ObjectList.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/ObjectList.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/ObjectList.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSDateTime.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSDateTime.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSDateTime.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSDateTime.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSDecimal.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSDecimal.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSDecimal.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSDecimal.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSDouble.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSDouble.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSDouble.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSDouble.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSFloat.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSFloat.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSFloat.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSFloat.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSQName.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSQName.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSQName.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSQName.java diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/package.html similarity index 100% rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/package.html rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/package.html diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/Axis.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/Axis.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/Axis.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/Axis.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/DTM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTM.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/DTM.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTM.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMAxisIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMAxisIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMAxisIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMAxisIterator.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMAxisTraverser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMAxisTraverser.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMAxisTraverser.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMAxisTraverser.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMConfigurationException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMConfigurationException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMConfigurationException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMConfigurationException.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMDOMException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMDOMException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMDOMException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMDOMException.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMException.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMFilter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMFilter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMFilter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMFilter.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMIterator.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMManager.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMManager.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMManager.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMManager.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMWSFilter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMWSFilter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMWSFilter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMWSFilter.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/ChunkedIntArray.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/ChunkedIntArray.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/ChunkedIntArray.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/ChunkedIntArray.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/CoroutineManager.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/CoroutineManager.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/CoroutineManager.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/CoroutineManager.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/CoroutineParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/CoroutineParser.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/CoroutineParser.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/CoroutineParser.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIteratorBase.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIteratorBase.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIteratorBase.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIteratorBase.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMChildIterNodeList.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMChildIterNodeList.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMChildIterNodeList.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMChildIterNodeList.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseIterators.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseIterators.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseIterators.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseIterators.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseTraversers.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseTraversers.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseTraversers.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseTraversers.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDocumentImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDocumentImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDocumentImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDocumentImpl.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMManagerDefault.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMManagerDefault.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMManagerDefault.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMManagerDefault.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNamedNodeMap.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNamedNodeMap.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNamedNodeMap.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNamedNodeMap.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeIterator.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeList.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeList.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeList.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeList.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeListBase.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeListBase.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeListBase.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeListBase.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMSafeStringPool.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMSafeStringPool.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMSafeStringPool.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMSafeStringPool.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMStringPool.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMStringPool.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMStringPool.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMStringPool.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMTreeWalker.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMTreeWalker.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMTreeWalker.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMTreeWalker.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/EmptyIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/EmptyIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/EmptyIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/EmptyIterator.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/ExpandedNameTable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/ExpandedNameTable.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/ExpandedNameTable.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/ExpandedNameTable.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/ExtendedType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/ExtendedType.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/ExtendedType.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/ExtendedType.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Filter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Filter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Filter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Filter.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Xerces.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Xerces.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Xerces.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Xerces.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/NodeLocator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/NodeLocator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/NodeLocator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/NodeLocator.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTM.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTM.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTM.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2RTFDTM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2RTFDTM.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2RTFDTM.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2RTFDTM.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ca.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_ca.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ca.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_ca.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_cs.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_cs.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_cs.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_cs.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_en.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_en.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_en.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_en.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_es.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_es.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_es.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_es.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_fr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_fr.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_fr.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_fr.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_it.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_it.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_it.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_it.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ja.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_ja.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ja.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_ja.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ko.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_ko.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ko.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_ko.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_pt_BR.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_pt_BR.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_pt_BR.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_pt_BR.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sk.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_sk.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sk.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_sk.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_tr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_tr.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_tr.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_tr.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_CN.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_CN.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_CN.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_CN.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_HK.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_HK.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_HK.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_HK.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_TW.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_TW.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_TW.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_TW.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLMessages.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLMessages.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLMessages.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLMessages.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/Catalog.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/Catalog.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/Catalog.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/Catalog.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogEntry.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/CatalogEntry.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogEntry.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/CatalogEntry.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/CatalogException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/CatalogException.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogManager.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/CatalogManager.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogManager.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/CatalogManager.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/Resolver.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/Resolver.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/Resolver.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/Resolver.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/Debug.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/Debug.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/Debug.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/Debug.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/FileURL.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/FileURL.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/FileURL.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/FileURL.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/Namespaces.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/Namespaces.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/Namespaces.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/Namespaces.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/PublicId.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/PublicId.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/PublicId.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/PublicId.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/CatalogReader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/CatalogReader.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/CatalogReader.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/CatalogReader.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogParser.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogParser.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogParser.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/ExtendedXMLCatalogReader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/ExtendedXMLCatalogReader.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/ExtendedXMLCatalogReader.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/ExtendedXMLCatalogReader.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/OASISXMLCatalogReader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/OASISXMLCatalogReader.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/OASISXMLCatalogReader.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/OASISXMLCatalogReader.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogParser.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogParser.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogParser.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXParserHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/SAXParserHandler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXParserHandler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/SAXParserHandler.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/TR9401CatalogReader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/TR9401CatalogReader.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/TR9401CatalogReader.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/TR9401CatalogReader.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/TextCatalogReader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/TextCatalogReader.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/TextCatalogReader.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/TextCatalogReader.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/XCatalogReader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/XCatalogReader.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/XCatalogReader.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/XCatalogReader.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/tools/CatalogResolver.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/tools/CatalogResolver.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/tools/CatalogResolver.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/tools/CatalogResolver.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/tools/ResolvingParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/tools/ResolvingParser.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/tools/ResolvingParser.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/tools/ResolvingParser.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLFilter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLFilter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLFilter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLFilter.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLReader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLReader.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLReader.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLReader.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/DOMSerializer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/DOMSerializer.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/DOMSerializer.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/DOMSerializer.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/ElementState.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/ElementState.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/ElementState.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/ElementState.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/EncodingInfo.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/EncodingInfo.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/EncodingInfo.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/EncodingInfo.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/Encodings.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Encodings.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/Encodings.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Encodings.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/HTMLSerializer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/HTMLSerializer.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/HTMLSerializer.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/HTMLSerializer.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/IndentPrinter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/IndentPrinter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/IndentPrinter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/IndentPrinter.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/LineSeparator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/LineSeparator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/LineSeparator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/LineSeparator.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/Method.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Method.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/Method.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Method.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/OutputFormat.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/OutputFormat.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/OutputFormat.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/OutputFormat.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/Printer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Printer.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/Printer.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Printer.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/SecuritySupport.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/SecuritySupport.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/SecuritySupport.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/SecuritySupport.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/Serializer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Serializer.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/Serializer.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Serializer.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/SerializerFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/SerializerFactory.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/SerializerFactory.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/SerializerFactory.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/SerializerFactoryImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/SerializerFactoryImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/SerializerFactoryImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/SerializerFactoryImpl.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/TextSerializer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/TextSerializer.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/TextSerializer.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/TextSerializer.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/XHTMLSerializer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XHTMLSerializer.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/XHTMLSerializer.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XHTMLSerializer.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/XML11Serializer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XML11Serializer.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/XML11Serializer.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XML11Serializer.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/XMLSerializer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XMLSerializer.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/XMLSerializer.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XMLSerializer.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/CharInfo.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/CharInfo.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/CharInfo.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/CharInfo.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/DOM3Serializer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/DOM3Serializer.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/DOM3Serializer.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/DOM3Serializer.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/DOMSerializer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/DOMSerializer.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/DOMSerializer.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/DOMSerializer.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/ElemContext.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ElemContext.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/ElemContext.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ElemContext.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/ElemDesc.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ElemDesc.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/ElemDesc.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ElemDesc.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/EmptySerializer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/EmptySerializer.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/EmptySerializer.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/EmptySerializer.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/EncodingInfo.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/EncodingInfo.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/EncodingInfo.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/EncodingInfo.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Encodings.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Encodings.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Encodings.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Encodings.properties diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/ExtendedContentHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ExtendedContentHandler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/ExtendedContentHandler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ExtendedContentHandler.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/ExtendedLexicalHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ExtendedLexicalHandler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/ExtendedLexicalHandler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ExtendedLexicalHandler.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/HTMLEntities.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/HTMLEntities.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/HTMLEntities.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/HTMLEntities.properties diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/Method.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Method.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/Method.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Method.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/NamespaceMappings.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/NamespaceMappings.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/NamespaceMappings.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/NamespaceMappings.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/OutputPropertyUtils.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/OutputPropertyUtils.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/OutputPropertyUtils.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/OutputPropertyUtils.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/SerializationHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializationHandler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/SerializationHandler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializationHandler.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/Serializer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Serializer.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/Serializer.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Serializer.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/SerializerBase.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerBase.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/SerializerBase.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerBase.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/SerializerConstants.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerConstants.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/SerializerConstants.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerConstants.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/SerializerFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerFactory.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/SerializerFactory.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerFactory.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/SerializerTrace.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerTrace.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/SerializerTrace.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerTrace.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/SerializerTraceWriter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerTraceWriter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/SerializerTraceWriter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerTraceWriter.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToHTMLSAXHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToHTMLSAXHandler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/ToHTMLSAXHandler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToHTMLSAXHandler.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToSAXHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToSAXHandler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/ToSAXHandler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToSAXHandler.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToStream.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToStream.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/ToStream.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToStream.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToTextSAXHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToTextSAXHandler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/ToTextSAXHandler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToTextSAXHandler.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToTextStream.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToTextStream.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/ToTextStream.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToTextStream.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToUnknownStream.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToUnknownStream.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/ToUnknownStream.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToUnknownStream.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToXMLSAXHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToXMLSAXHandler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/ToXMLSAXHandler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToXMLSAXHandler.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/TransformStateSetter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/TransformStateSetter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/TransformStateSetter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/TransformStateSetter.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/TreeWalker.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/TreeWalker.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/TreeWalker.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/TreeWalker.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/Utils.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Utils.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/Utils.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Utils.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/Version.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Version.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/Version.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Version.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/WriterChain.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/WriterChain.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/WriterChain.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/WriterChain.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/WriterToASCI.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/WriterToASCI.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/WriterToASCI.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/WriterToASCI.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/WriterToUTF8Buffered.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/WriterToUTF8Buffered.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/WriterToUTF8Buffered.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/WriterToUTF8Buffered.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/XMLEntities.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/XMLEntities.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/XMLEntities.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/XMLEntities.properties diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/XSLOutputAttributes.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/XSLOutputAttributes.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/XSLOutputAttributes.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/XSLOutputAttributes.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/DOM3SerializerImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOM3SerializerImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/DOM3SerializerImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOM3SerializerImpl.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/DOM3TreeWalker.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOM3TreeWalker.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/DOM3TreeWalker.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOM3TreeWalker.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/DOMConstants.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMConstants.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/DOMConstants.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMConstants.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/DOMErrorHandlerImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMErrorHandlerImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/DOMErrorHandlerImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMErrorHandlerImpl.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/DOMErrorImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMErrorImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/DOMErrorImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMErrorImpl.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/DOMLocatorImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMLocatorImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/DOMLocatorImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMLocatorImpl.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/DOMOutputImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMOutputImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/DOMOutputImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMOutputImpl.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/DOMStringListImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMStringListImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/DOMStringListImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMStringListImpl.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/LSSerializerImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/LSSerializerImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/LSSerializerImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/LSSerializerImpl.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/NamespaceSupport.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/NamespaceSupport.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/NamespaceSupport.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/NamespaceSupport.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/output_html.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_html.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/output_html.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_html.properties diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/output_text.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_text.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/output_text.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_text.properties diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/output_unknown.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_unknown.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/output_unknown.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_unknown.properties diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/output_xml.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_xml.properties similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/output_xml.properties rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_xml.properties diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/package.html similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/package.html rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/package.html diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/AttList.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/AttList.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/AttList.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/AttList.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/BoolStack.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/BoolStack.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/BoolStack.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/BoolStack.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/DOM2Helper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/DOM2Helper.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/DOM2Helper.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/DOM2Helper.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/Messages.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/Messages.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/Messages.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/Messages.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/MsgKey.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/MsgKey.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/MsgKey.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/MsgKey.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ca.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ca.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ca.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ca.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_cs.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_cs.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_cs.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_cs.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_en.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_en.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_en.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_en.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_es.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_es.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_es.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_es.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_fr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_fr.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_fr.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_fr.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_it.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_it.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_it.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_it.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ja.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ja.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ja.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ja.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ko.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ko.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ko.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ko.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_pt_BR.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_pt_BR.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_pt_BR.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_pt_BR.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_sv.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_sv.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_sv.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_sv.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_CN.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_CN.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_CN.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_CN.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_TW.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_TW.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_TW.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_TW.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/StringToIntTable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/StringToIntTable.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/StringToIntTable.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/StringToIntTable.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SystemIDResolver.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SystemIDResolver.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SystemIDResolver.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SystemIDResolver.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/URI.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/URI.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/URI.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/URI.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/Utils.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/Utils.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/Utils.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/Utils.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/WrappedRuntimeException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/WrappedRuntimeException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/WrappedRuntimeException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/WrappedRuntimeException.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/AttList.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/AttList.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/AttList.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/AttList.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/BoolStack.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/BoolStack.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/BoolStack.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/BoolStack.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/CharKey.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/CharKey.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/CharKey.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/CharKey.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/Constants.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/Constants.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/Constants.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/Constants.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/DOM2Helper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DOM2Helper.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/DOM2Helper.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DOM2Helper.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/DOMBuilder.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DOMBuilder.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/DOMBuilder.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DOMBuilder.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/DOMHelper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DOMHelper.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/DOMHelper.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DOMHelper.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/DOMOrder.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DOMOrder.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/DOMOrder.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DOMOrder.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/DefaultErrorHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DefaultErrorHandler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/DefaultErrorHandler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DefaultErrorHandler.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/ElemDesc.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ElemDesc.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/ElemDesc.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ElemDesc.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/FastStringBuffer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/FastStringBuffer.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/FastStringBuffer.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/FastStringBuffer.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/Hashtree2Node.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/Hashtree2Node.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/Hashtree2Node.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/Hashtree2Node.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/IntStack.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/IntStack.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/IntStack.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/IntStack.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/IntVector.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/IntVector.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/IntVector.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/IntVector.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/ListingErrorHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ListingErrorHandler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/ListingErrorHandler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ListingErrorHandler.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/LocaleUtility.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/LocaleUtility.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/LocaleUtility.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/LocaleUtility.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/MutableAttrListImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/MutableAttrListImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/MutableAttrListImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/MutableAttrListImpl.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/NSInfo.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NSInfo.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/NSInfo.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NSInfo.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/NameSpace.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NameSpace.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/NameSpace.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NameSpace.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/NamespaceSupport2.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NamespaceSupport2.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/NamespaceSupport2.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NamespaceSupport2.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/NodeConsumer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NodeConsumer.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/NodeConsumer.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NodeConsumer.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/NodeVector.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NodeVector.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/NodeVector.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NodeVector.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/ObjectPool.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ObjectPool.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/ObjectPool.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ObjectPool.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/ObjectStack.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ObjectStack.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/ObjectStack.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ObjectStack.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/ObjectVector.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ObjectVector.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/ObjectVector.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ObjectVector.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/PrefixResolver.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/PrefixResolver.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/PrefixResolver.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/PrefixResolver.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/PrefixResolverDefault.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/PrefixResolverDefault.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/PrefixResolverDefault.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/PrefixResolverDefault.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/QName.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/QName.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/QName.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/QName.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/RawCharacterHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/RawCharacterHandler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/RawCharacterHandler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/RawCharacterHandler.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/SAXSourceLocator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SAXSourceLocator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/SAXSourceLocator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SAXSourceLocator.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/SerializableLocatorImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SerializableLocatorImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/SerializableLocatorImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SerializableLocatorImpl.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/StopParseException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StopParseException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/StopParseException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StopParseException.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/StringBufferPool.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringBufferPool.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/StringBufferPool.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringBufferPool.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/StringComparable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringComparable.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/StringComparable.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringComparable.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/StringToIntTable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringToIntTable.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/StringToIntTable.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringToIntTable.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/StringToStringTable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringToStringTable.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/StringToStringTable.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringToStringTable.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/StringToStringTableVector.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringToStringTableVector.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/StringToStringTableVector.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringToStringTableVector.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/StringVector.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringVector.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/StringVector.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringVector.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/StylesheetPIHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StylesheetPIHandler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/StylesheetPIHandler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StylesheetPIHandler.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/SuballocatedByteVector.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SuballocatedByteVector.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/SuballocatedByteVector.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SuballocatedByteVector.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/SuballocatedIntVector.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SuballocatedIntVector.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/SuballocatedIntVector.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SuballocatedIntVector.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/SystemIDResolver.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SystemIDResolver.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/SystemIDResolver.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SystemIDResolver.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/ThreadControllerWrapper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ThreadControllerWrapper.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/ThreadControllerWrapper.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ThreadControllerWrapper.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/TreeWalker.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/TreeWalker.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/TreeWalker.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/TreeWalker.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/Trie.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/Trie.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/Trie.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/Trie.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/URI.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/URI.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/URI.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/URI.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/UnImplNode.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/UnImplNode.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/UnImplNode.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/UnImplNode.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/WrappedRuntimeException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/WrappedRuntimeException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/WrappedRuntimeException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/WrappedRuntimeException.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/WrongParserException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/WrongParserException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/WrongParserException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/WrongParserException.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/XML11Char.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XML11Char.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/XML11Char.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XML11Char.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/XMLChar.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLChar.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/XMLChar.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLChar.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/XMLCharacterRecognizer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLCharacterRecognizer.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/XMLCharacterRecognizer.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLCharacterRecognizer.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/XMLString.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLString.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/XMLString.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLString.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/XMLStringDefault.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLStringDefault.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/XMLStringDefault.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLStringDefault.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/XMLStringFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLStringFactory.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/XMLStringFactory.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLStringFactory.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/XMLStringFactoryDefault.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLStringFactoryDefault.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/XMLStringFactoryDefault.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLStringFactoryDefault.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/package.html similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/package.html rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/package.html diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/CharArrayWrapper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/CharArrayWrapper.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/CharArrayWrapper.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/CharArrayWrapper.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/IntArrayWrapper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/IntArrayWrapper.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/IntArrayWrapper.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/IntArrayWrapper.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/LongArrayWrapper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/LongArrayWrapper.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/LongArrayWrapper.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/LongArrayWrapper.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/StringArrayWrapper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/StringArrayWrapper.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/StringArrayWrapper.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/StringArrayWrapper.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResourceBundle.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResourceBundle.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResourceBundle.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResourceBundle.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResourceBundleBase.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResourceBundleBase.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResourceBundleBase.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResourceBundleBase.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_de.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_de.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_de.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_de.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_en.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_en.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_en.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_en.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_es.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_es.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_es.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_es.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_fr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_fr.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_fr.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_fr.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_it.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_it.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_it.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_it.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_A.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_A.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_A.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_A.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HA.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HA.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HA.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HA.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HI.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HI.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HI.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HI.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_I.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_I.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_I.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_I.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_ko.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ko.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_ko.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ko.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_sv.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_sv.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_sv.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_sv.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_zh_CN.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_zh_CN.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_zh_CN.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_zh_CN.java diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_zh_TW.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_zh_TW.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_zh_TW.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_zh_TW.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/Arg.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/Arg.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/Arg.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/Arg.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/CachedXPathAPI.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/CachedXPathAPI.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/CachedXPathAPI.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/CachedXPathAPI.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/Expression.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/Expression.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/Expression.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/Expression.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/ExpressionNode.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/ExpressionNode.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/ExpressionNode.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/ExpressionNode.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/ExpressionOwner.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/ExpressionOwner.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/ExpressionOwner.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/ExpressionOwner.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/ExtensionsProvider.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/ExtensionsProvider.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/ExtensionsProvider.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/ExtensionsProvider.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/FoundIndex.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/FoundIndex.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/FoundIndex.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/FoundIndex.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/NodeSet.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/NodeSet.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/NodeSet.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/NodeSet.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/NodeSetDTM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/NodeSetDTM.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/NodeSetDTM.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/NodeSetDTM.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/SourceTree.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/SourceTree.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/SourceTree.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/SourceTree.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/SourceTreeManager.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/SourceTreeManager.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/SourceTreeManager.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/SourceTreeManager.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/VariableStack.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/VariableStack.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/VariableStack.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/VariableStack.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/WhitespaceStrippingElementMatcher.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/WhitespaceStrippingElementMatcher.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/WhitespaceStrippingElementMatcher.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/WhitespaceStrippingElementMatcher.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/XPath.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPath.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/XPath.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPath.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/XPathAPI.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathAPI.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/XPathAPI.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathAPI.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/XPathContext.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathContext.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/XPathContext.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathContext.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/XPathException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/XPathException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathException.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/XPathFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathFactory.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/XPathFactory.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathFactory.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/XPathProcessorException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathProcessorException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/XPathProcessorException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathProcessorException.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/XPathVisitable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathVisitable.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/XPathVisitable.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathVisitable.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/XPathVisitor.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathVisitor.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/XPathVisitor.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathVisitor.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/AttributeIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/AttributeIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/AttributeIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/AttributeIterator.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/AxesWalker.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/AxesWalker.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/AxesWalker.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/AxesWalker.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/BasicTestIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/BasicTestIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/BasicTestIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/BasicTestIterator.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/ChildIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/ChildIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/ChildIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/ChildIterator.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/ChildTestIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/ChildTestIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/ChildTestIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/ChildTestIterator.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/ContextNodeList.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/ContextNodeList.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/ContextNodeList.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/ContextNodeList.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/DescendantIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/DescendantIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/DescendantIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/DescendantIterator.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/FilterExprIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/FilterExprIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprIterator.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/FilterExprIteratorSimple.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprIteratorSimple.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/FilterExprIteratorSimple.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprIteratorSimple.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/FilterExprWalker.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprWalker.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/FilterExprWalker.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprWalker.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/HasPositionalPredChecker.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/HasPositionalPredChecker.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/HasPositionalPredChecker.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/HasPositionalPredChecker.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/IteratorPool.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/IteratorPool.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/IteratorPool.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/IteratorPool.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/LocPathIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/LocPathIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/LocPathIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/LocPathIterator.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/MatchPatternIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/MatchPatternIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/MatchPatternIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/MatchPatternIterator.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/NodeSequence.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/NodeSequence.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/NodeSequence.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/NodeSequence.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/OneStepIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/OneStepIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/OneStepIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/OneStepIterator.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/OneStepIteratorForward.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/OneStepIteratorForward.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/OneStepIteratorForward.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/OneStepIteratorForward.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/PathComponent.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/PathComponent.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/PathComponent.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/PathComponent.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/RTFIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/RTFIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/RTFIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/RTFIterator.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/ReverseAxesWalker.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/ReverseAxesWalker.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/ReverseAxesWalker.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/ReverseAxesWalker.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/SelfIteratorNoPredicate.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/SelfIteratorNoPredicate.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/SelfIteratorNoPredicate.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/SelfIteratorNoPredicate.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/SubContextList.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/SubContextList.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/SubContextList.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/SubContextList.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/UnionChildIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/UnionChildIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/UnionChildIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/UnionChildIterator.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/UnionPathIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/UnionPathIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/UnionPathIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/UnionPathIterator.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/WalkerFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkerFactory.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/WalkerFactory.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkerFactory.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/WalkingIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkingIterator.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/WalkingIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkingIterator.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/WalkingIteratorSorted.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkingIteratorSorted.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/WalkingIteratorSorted.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkingIteratorSorted.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/package.html similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/package.html rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/package.html diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/compiler/Compiler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Compiler.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/compiler/Compiler.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Compiler.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/compiler/FuncLoader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/FuncLoader.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/compiler/FuncLoader.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/FuncLoader.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/compiler/FunctionTable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/FunctionTable.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/compiler/FunctionTable.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/FunctionTable.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/compiler/Keywords.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Keywords.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/compiler/Keywords.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Keywords.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/compiler/Lexer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Lexer.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/compiler/Lexer.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Lexer.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/compiler/OpCodes.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/OpCodes.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/compiler/OpCodes.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/OpCodes.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/compiler/OpMap.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/OpMap.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/compiler/OpMap.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/OpMap.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/compiler/OpMapVector.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/OpMapVector.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/compiler/OpMapVector.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/OpMapVector.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/compiler/PsuedoNames.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/PsuedoNames.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/compiler/PsuedoNames.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/PsuedoNames.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/compiler/XPathDumper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/XPathDumper.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/compiler/XPathDumper.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/XPathDumper.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/compiler/XPathParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/XPathParser.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/compiler/XPathParser.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/XPathParser.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/compiler/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/package.html similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/compiler/package.html rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/package.html diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/domapi/XPathEvaluatorImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathEvaluatorImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/domapi/XPathEvaluatorImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathEvaluatorImpl.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/domapi/XPathExpressionImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathExpressionImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/domapi/XPathExpressionImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathExpressionImpl.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/domapi/XPathNSResolverImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathNSResolverImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/domapi/XPathNSResolverImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathNSResolverImpl.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/domapi/XPathNamespaceImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathNamespaceImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/domapi/XPathNamespaceImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathNamespaceImpl.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/domapi/XPathResultImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathResultImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/domapi/XPathResultImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathResultImpl.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/domapi/XPathStylesheetDOM3Exception.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathStylesheetDOM3Exception.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/domapi/XPathStylesheetDOM3Exception.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathStylesheetDOM3Exception.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/domapi/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/domapi/package.html similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/domapi/package.html rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/domapi/package.html diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncBoolean.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncBoolean.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncBoolean.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncBoolean.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncCeiling.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncCeiling.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncCeiling.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncCeiling.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncConcat.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncConcat.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncConcat.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncConcat.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncContains.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncContains.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncContains.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncContains.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncCount.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncCount.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncCount.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncCount.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncCurrent.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncCurrent.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncCurrent.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncCurrent.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncDoclocation.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncDoclocation.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncDoclocation.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncDoclocation.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncExtElementAvailable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtElementAvailable.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncExtElementAvailable.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtElementAvailable.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncExtFunction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtFunction.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncExtFunction.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtFunction.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncExtFunctionAvailable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtFunctionAvailable.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncExtFunctionAvailable.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtFunctionAvailable.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncFalse.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncFalse.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncFalse.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncFalse.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncFloor.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncFloor.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncFloor.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncFloor.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncGenerateId.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncGenerateId.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncGenerateId.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncGenerateId.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncId.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncId.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncId.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncId.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncLang.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncLang.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncLang.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncLang.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncLast.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncLast.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncLast.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncLast.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncLocalPart.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncLocalPart.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncLocalPart.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncLocalPart.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncNamespace.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncNamespace.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncNamespace.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncNamespace.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncNormalizeSpace.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncNormalizeSpace.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncNormalizeSpace.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncNormalizeSpace.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncNot.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncNot.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncNot.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncNot.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncNumber.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncNumber.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncNumber.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncNumber.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncPosition.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncPosition.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncPosition.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncPosition.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncQname.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncQname.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncQname.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncQname.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncRound.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncRound.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncRound.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncRound.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncStartsWith.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncStartsWith.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncStartsWith.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncStartsWith.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncString.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncString.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncString.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncString.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncStringLength.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncStringLength.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncStringLength.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncStringLength.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncSubstring.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSubstring.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncSubstring.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSubstring.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncSubstringAfter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSubstringAfter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncSubstringAfter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSubstringAfter.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncSubstringBefore.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSubstringBefore.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncSubstringBefore.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSubstringBefore.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncSum.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSum.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncSum.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSum.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncTranslate.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncTranslate.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncTranslate.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncTranslate.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncTrue.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncTrue.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncTrue.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncTrue.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncUnparsedEntityURI.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncUnparsedEntityURI.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncUnparsedEntityURI.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncUnparsedEntityURI.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/Function.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/Function.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/Function2Args.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function2Args.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/Function2Args.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function2Args.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/Function3Args.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function3Args.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/Function3Args.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function3Args.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FunctionDef1Arg.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionDef1Arg.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FunctionDef1Arg.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionDef1Arg.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FunctionMultiArgs.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionMultiArgs.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FunctionMultiArgs.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionMultiArgs.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FunctionOneArg.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionOneArg.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FunctionOneArg.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionOneArg.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/WrongNumberArgsException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/WrongNumberArgsException.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/WrongNumberArgsException.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/WrongNumberArgsException.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/package.html similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/package.html rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/package.html diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/jaxp/JAXPPrefixResolver.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPPrefixResolver.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/jaxp/JAXPPrefixResolver.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPPrefixResolver.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/jaxp/JAXPVariableStack.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPVariableStack.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/jaxp/JAXPVariableStack.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPVariableStack.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathImpl.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/objects/DTMXRTreeFrag.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/DTMXRTreeFrag.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/objects/DTMXRTreeFrag.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/DTMXRTreeFrag.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/objects/XBoolean.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XBoolean.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/objects/XBoolean.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XBoolean.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/objects/XBooleanStatic.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XBooleanStatic.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/objects/XBooleanStatic.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XBooleanStatic.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/objects/XMLStringFactoryImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XMLStringFactoryImpl.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/objects/XMLStringFactoryImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XMLStringFactoryImpl.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/objects/XNodeSet.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNodeSet.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/objects/XNodeSet.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNodeSet.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/objects/XNodeSetForDOM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNodeSetForDOM.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/objects/XNodeSetForDOM.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNodeSetForDOM.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/objects/XNull.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNull.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/objects/XNull.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNull.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/objects/XNumber.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNumber.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/objects/XNumber.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNumber.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/objects/XObject.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XObject.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/objects/XObject.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XObject.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/objects/XObjectFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XObjectFactory.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/objects/XObjectFactory.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XObjectFactory.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/objects/XRTreeFrag.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XRTreeFrag.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/objects/XRTreeFrag.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XRTreeFrag.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/objects/XRTreeFragSelectWrapper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XRTreeFragSelectWrapper.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/objects/XRTreeFragSelectWrapper.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XRTreeFragSelectWrapper.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/objects/XString.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XString.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/objects/XString.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XString.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/objects/XStringForChars.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XStringForChars.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/objects/XStringForChars.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XStringForChars.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/objects/XStringForFSB.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XStringForFSB.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/objects/XStringForFSB.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XStringForFSB.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/objects/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/package.html similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/objects/package.html rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/package.html diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/And.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/And.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/And.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/And.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/Bool.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Bool.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/Bool.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Bool.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/Div.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Div.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/Div.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Div.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/Equals.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Equals.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/Equals.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Equals.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/Gt.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Gt.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/Gt.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Gt.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/Gte.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Gte.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/Gte.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Gte.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/Lt.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Lt.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/Lt.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Lt.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/Lte.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Lte.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/Lte.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Lte.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/Minus.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Minus.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/Minus.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Minus.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/Mod.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Mod.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/Mod.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Mod.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/Mult.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Mult.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/Mult.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Mult.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/Neg.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Neg.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/Neg.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Neg.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/NotEquals.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/NotEquals.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/NotEquals.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/NotEquals.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/Number.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Number.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/Number.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Number.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/Operation.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Operation.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/Operation.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Operation.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/Or.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Or.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/Or.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Or.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/Plus.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Plus.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/Plus.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Plus.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/Quo.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Quo.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/Quo.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Quo.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/String.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/String.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/String.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/String.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/UnaryOperation.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/UnaryOperation.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/UnaryOperation.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/UnaryOperation.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/Variable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Variable.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/Variable.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Variable.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/VariableSafeAbsRef.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/VariableSafeAbsRef.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/VariableSafeAbsRef.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/VariableSafeAbsRef.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/package.html similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/package.html rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/package.html diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/package.html similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/package.html rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/package.html diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/patterns/ContextMatchStepPattern.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/ContextMatchStepPattern.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/patterns/ContextMatchStepPattern.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/ContextMatchStepPattern.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/patterns/FunctionPattern.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/FunctionPattern.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/patterns/FunctionPattern.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/FunctionPattern.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/patterns/NodeTest.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/NodeTest.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/patterns/NodeTest.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/NodeTest.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/patterns/NodeTestFilter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/NodeTestFilter.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/patterns/NodeTestFilter.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/NodeTestFilter.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/patterns/StepPattern.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/StepPattern.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/patterns/StepPattern.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/StepPattern.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/patterns/UnionPattern.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/UnionPattern.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/patterns/UnionPattern.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/UnionPattern.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/patterns/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/package.html similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/patterns/package.html rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/package.html diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_en.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_en.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_en.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_en.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_es.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_es.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_es.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_es.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_fr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_fr.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_fr.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_fr.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_pt_BR.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_pt_BR.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_pt_BR.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_pt_BR.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHMessages.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHMessages.java similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHMessages.java rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHMessages.java diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/res/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/package.html similarity index 100% rename from jaxp/src/com/sun/org/apache/xpath/internal/res/package.html rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/package.html diff --git a/jaxp/src/com/sun/xml/internal/stream/Entity.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/Entity.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/Entity.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/Entity.java diff --git a/jaxp/src/com/sun/xml/internal/stream/EventFilterSupport.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/EventFilterSupport.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/EventFilterSupport.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/EventFilterSupport.java diff --git a/jaxp/src/com/sun/xml/internal/stream/StaxEntityResolverWrapper.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/StaxEntityResolverWrapper.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/StaxEntityResolverWrapper.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/StaxEntityResolverWrapper.java diff --git a/jaxp/src/com/sun/xml/internal/stream/StaxErrorReporter.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/StaxErrorReporter.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/StaxErrorReporter.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/StaxErrorReporter.java diff --git a/jaxp/src/com/sun/xml/internal/stream/StaxXMLInputSource.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/StaxXMLInputSource.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/StaxXMLInputSource.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/StaxXMLInputSource.java diff --git a/jaxp/src/com/sun/xml/internal/stream/XMLBufferListener.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLBufferListener.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/XMLBufferListener.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLBufferListener.java diff --git a/jaxp/src/com/sun/xml/internal/stream/XMLEntityReader.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLEntityReader.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/XMLEntityReader.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLEntityReader.java diff --git a/jaxp/src/com/sun/xml/internal/stream/XMLEntityStorage.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLEntityStorage.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/XMLEntityStorage.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLEntityStorage.java diff --git a/jaxp/src/com/sun/xml/internal/stream/XMLEventReaderImpl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLEventReaderImpl.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/XMLEventReaderImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLEventReaderImpl.java diff --git a/jaxp/src/com/sun/xml/internal/stream/XMLInputFactoryImpl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLInputFactoryImpl.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/XMLInputFactoryImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLInputFactoryImpl.java diff --git a/jaxp/src/com/sun/xml/internal/stream/XMLOutputFactoryImpl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLOutputFactoryImpl.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/XMLOutputFactoryImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLOutputFactoryImpl.java diff --git a/jaxp/src/com/sun/xml/internal/stream/dtd/DTDGrammarUtil.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/DTDGrammarUtil.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/dtd/DTDGrammarUtil.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/DTDGrammarUtil.java diff --git a/jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java diff --git a/jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLAttributeDecl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLAttributeDecl.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLAttributeDecl.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLAttributeDecl.java diff --git a/jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLElementDecl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLElementDecl.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLElementDecl.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLElementDecl.java diff --git a/jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLNotationDecl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLNotationDecl.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLNotationDecl.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLNotationDecl.java diff --git a/jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLSimpleType.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLSimpleType.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLSimpleType.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLSimpleType.java diff --git a/jaxp/src/com/sun/xml/internal/stream/events/AttributeImpl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/AttributeImpl.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/events/AttributeImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/AttributeImpl.java diff --git a/jaxp/src/com/sun/xml/internal/stream/events/CharacterEvent.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/CharacterEvent.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/events/CharacterEvent.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/CharacterEvent.java diff --git a/jaxp/src/com/sun/xml/internal/stream/events/CommentEvent.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/CommentEvent.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/events/CommentEvent.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/CommentEvent.java diff --git a/jaxp/src/com/sun/xml/internal/stream/events/DTDEvent.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/DTDEvent.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/events/DTDEvent.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/DTDEvent.java diff --git a/jaxp/src/com/sun/xml/internal/stream/events/DummyEvent.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/DummyEvent.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/events/DummyEvent.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/DummyEvent.java diff --git a/jaxp/src/com/sun/xml/internal/stream/events/EndDocumentEvent.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/EndDocumentEvent.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/events/EndDocumentEvent.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/EndDocumentEvent.java diff --git a/jaxp/src/com/sun/xml/internal/stream/events/EndElementEvent.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/EndElementEvent.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/events/EndElementEvent.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/EndElementEvent.java diff --git a/jaxp/src/com/sun/xml/internal/stream/events/EntityDeclarationImpl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/EntityDeclarationImpl.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/events/EntityDeclarationImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/EntityDeclarationImpl.java diff --git a/jaxp/src/com/sun/xml/internal/stream/events/EntityReferenceEvent.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/EntityReferenceEvent.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/events/EntityReferenceEvent.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/EntityReferenceEvent.java diff --git a/jaxp/src/com/sun/xml/internal/stream/events/LocationImpl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/LocationImpl.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/events/LocationImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/LocationImpl.java diff --git a/jaxp/src/com/sun/xml/internal/stream/events/NamedEvent.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/NamedEvent.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/events/NamedEvent.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/NamedEvent.java diff --git a/jaxp/src/com/sun/xml/internal/stream/events/NamespaceImpl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/NamespaceImpl.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/events/NamespaceImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/NamespaceImpl.java diff --git a/jaxp/src/com/sun/xml/internal/stream/events/NotationDeclarationImpl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/NotationDeclarationImpl.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/events/NotationDeclarationImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/NotationDeclarationImpl.java diff --git a/jaxp/src/com/sun/xml/internal/stream/events/ProcessingInstructionEvent.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/ProcessingInstructionEvent.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/events/ProcessingInstructionEvent.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/ProcessingInstructionEvent.java diff --git a/jaxp/src/com/sun/xml/internal/stream/events/StartDocumentEvent.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/StartDocumentEvent.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/events/StartDocumentEvent.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/StartDocumentEvent.java diff --git a/jaxp/src/com/sun/xml/internal/stream/events/StartElementEvent.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/StartElementEvent.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/events/StartElementEvent.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/StartElementEvent.java diff --git a/jaxp/src/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java diff --git a/jaxp/src/com/sun/xml/internal/stream/events/XMLEventFactoryImpl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/XMLEventFactoryImpl.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/events/XMLEventFactoryImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/XMLEventFactoryImpl.java diff --git a/jaxp/src/com/sun/xml/internal/stream/util/BufferAllocator.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/util/BufferAllocator.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/util/BufferAllocator.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/util/BufferAllocator.java diff --git a/jaxp/src/com/sun/xml/internal/stream/util/ReadOnlyIterator.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/util/ReadOnlyIterator.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/util/ReadOnlyIterator.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/util/ReadOnlyIterator.java diff --git a/jaxp/src/com/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java diff --git a/jaxp/src/com/sun/xml/internal/stream/writers/UTF8OutputStreamWriter.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/UTF8OutputStreamWriter.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/writers/UTF8OutputStreamWriter.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/UTF8OutputStreamWriter.java diff --git a/jaxp/src/com/sun/xml/internal/stream/writers/WriterUtility.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/WriterUtility.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/writers/WriterUtility.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/WriterUtility.java diff --git a/jaxp/src/com/sun/xml/internal/stream/writers/XMLDOMWriterImpl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLDOMWriterImpl.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/writers/XMLDOMWriterImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLDOMWriterImpl.java diff --git a/jaxp/src/com/sun/xml/internal/stream/writers/XMLEventWriterImpl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLEventWriterImpl.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/writers/XMLEventWriterImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLEventWriterImpl.java diff --git a/jaxp/src/com/sun/xml/internal/stream/writers/XMLOutputSource.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLOutputSource.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/writers/XMLOutputSource.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLOutputSource.java diff --git a/jaxp/src/com/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java diff --git a/jaxp/src/com/sun/xml/internal/stream/writers/XMLWriter.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLWriter.java similarity index 100% rename from jaxp/src/com/sun/xml/internal/stream/writers/XMLWriter.java rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLWriter.java diff --git a/jaxp/src/javax/xml/XMLConstants.java b/jaxp/src/java.xml/share/classes/javax/xml/XMLConstants.java similarity index 100% rename from jaxp/src/javax/xml/XMLConstants.java rename to jaxp/src/java.xml/share/classes/javax/xml/XMLConstants.java diff --git a/jaxp/src/javax/xml/datatype/DatatypeConfigurationException.java b/jaxp/src/java.xml/share/classes/javax/xml/datatype/DatatypeConfigurationException.java similarity index 100% rename from jaxp/src/javax/xml/datatype/DatatypeConfigurationException.java rename to jaxp/src/java.xml/share/classes/javax/xml/datatype/DatatypeConfigurationException.java diff --git a/jaxp/src/javax/xml/datatype/DatatypeConstants.java b/jaxp/src/java.xml/share/classes/javax/xml/datatype/DatatypeConstants.java similarity index 100% rename from jaxp/src/javax/xml/datatype/DatatypeConstants.java rename to jaxp/src/java.xml/share/classes/javax/xml/datatype/DatatypeConstants.java diff --git a/jaxp/src/javax/xml/datatype/DatatypeFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java similarity index 100% rename from jaxp/src/javax/xml/datatype/DatatypeFactory.java rename to jaxp/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java diff --git a/jaxp/src/javax/xml/datatype/Duration.java b/jaxp/src/java.xml/share/classes/javax/xml/datatype/Duration.java similarity index 100% rename from jaxp/src/javax/xml/datatype/Duration.java rename to jaxp/src/java.xml/share/classes/javax/xml/datatype/Duration.java diff --git a/jaxp/src/javax/xml/datatype/FactoryFinder.java b/jaxp/src/java.xml/share/classes/javax/xml/datatype/FactoryFinder.java similarity index 100% rename from jaxp/src/javax/xml/datatype/FactoryFinder.java rename to jaxp/src/java.xml/share/classes/javax/xml/datatype/FactoryFinder.java diff --git a/jaxp/src/javax/xml/datatype/SecuritySupport.java b/jaxp/src/java.xml/share/classes/javax/xml/datatype/SecuritySupport.java similarity index 100% rename from jaxp/src/javax/xml/datatype/SecuritySupport.java rename to jaxp/src/java.xml/share/classes/javax/xml/datatype/SecuritySupport.java diff --git a/jaxp/src/javax/xml/datatype/XMLGregorianCalendar.java b/jaxp/src/java.xml/share/classes/javax/xml/datatype/XMLGregorianCalendar.java similarity index 100% rename from jaxp/src/javax/xml/datatype/XMLGregorianCalendar.java rename to jaxp/src/java.xml/share/classes/javax/xml/datatype/XMLGregorianCalendar.java diff --git a/jaxp/src/javax/xml/datatype/package.html b/jaxp/src/java.xml/share/classes/javax/xml/datatype/package.html similarity index 100% rename from jaxp/src/javax/xml/datatype/package.html rename to jaxp/src/java.xml/share/classes/javax/xml/datatype/package.html diff --git a/jaxp/src/javax/xml/namespace/NamespaceContext.java b/jaxp/src/java.xml/share/classes/javax/xml/namespace/NamespaceContext.java similarity index 100% rename from jaxp/src/javax/xml/namespace/NamespaceContext.java rename to jaxp/src/java.xml/share/classes/javax/xml/namespace/NamespaceContext.java diff --git a/jaxp/src/javax/xml/namespace/QName.java b/jaxp/src/java.xml/share/classes/javax/xml/namespace/QName.java similarity index 100% rename from jaxp/src/javax/xml/namespace/QName.java rename to jaxp/src/java.xml/share/classes/javax/xml/namespace/QName.java diff --git a/jaxp/src/javax/xml/namespace/package.html b/jaxp/src/java.xml/share/classes/javax/xml/namespace/package.html similarity index 100% rename from jaxp/src/javax/xml/namespace/package.html rename to jaxp/src/java.xml/share/classes/javax/xml/namespace/package.html diff --git a/jaxp/src/javax/xml/parsers/DocumentBuilder.java b/jaxp/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilder.java similarity index 100% rename from jaxp/src/javax/xml/parsers/DocumentBuilder.java rename to jaxp/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilder.java diff --git a/jaxp/src/javax/xml/parsers/DocumentBuilderFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilderFactory.java similarity index 100% rename from jaxp/src/javax/xml/parsers/DocumentBuilderFactory.java rename to jaxp/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilderFactory.java diff --git a/jaxp/src/javax/xml/parsers/FactoryConfigurationError.java b/jaxp/src/java.xml/share/classes/javax/xml/parsers/FactoryConfigurationError.java similarity index 100% rename from jaxp/src/javax/xml/parsers/FactoryConfigurationError.java rename to jaxp/src/java.xml/share/classes/javax/xml/parsers/FactoryConfigurationError.java diff --git a/jaxp/src/javax/xml/parsers/FactoryFinder.java b/jaxp/src/java.xml/share/classes/javax/xml/parsers/FactoryFinder.java similarity index 100% rename from jaxp/src/javax/xml/parsers/FactoryFinder.java rename to jaxp/src/java.xml/share/classes/javax/xml/parsers/FactoryFinder.java diff --git a/jaxp/src/javax/xml/parsers/ParserConfigurationException.java b/jaxp/src/java.xml/share/classes/javax/xml/parsers/ParserConfigurationException.java similarity index 100% rename from jaxp/src/javax/xml/parsers/ParserConfigurationException.java rename to jaxp/src/java.xml/share/classes/javax/xml/parsers/ParserConfigurationException.java diff --git a/jaxp/src/javax/xml/parsers/SAXParser.java b/jaxp/src/java.xml/share/classes/javax/xml/parsers/SAXParser.java similarity index 100% rename from jaxp/src/javax/xml/parsers/SAXParser.java rename to jaxp/src/java.xml/share/classes/javax/xml/parsers/SAXParser.java diff --git a/jaxp/src/javax/xml/parsers/SAXParserFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/parsers/SAXParserFactory.java similarity index 100% rename from jaxp/src/javax/xml/parsers/SAXParserFactory.java rename to jaxp/src/java.xml/share/classes/javax/xml/parsers/SAXParserFactory.java diff --git a/jaxp/src/javax/xml/parsers/SecuritySupport.java b/jaxp/src/java.xml/share/classes/javax/xml/parsers/SecuritySupport.java similarity index 100% rename from jaxp/src/javax/xml/parsers/SecuritySupport.java rename to jaxp/src/java.xml/share/classes/javax/xml/parsers/SecuritySupport.java diff --git a/jaxp/src/javax/xml/parsers/package.html b/jaxp/src/java.xml/share/classes/javax/xml/parsers/package.html similarity index 100% rename from jaxp/src/javax/xml/parsers/package.html rename to jaxp/src/java.xml/share/classes/javax/xml/parsers/package.html diff --git a/jaxp/src/javax/xml/stream/EventFilter.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/EventFilter.java similarity index 100% rename from jaxp/src/javax/xml/stream/EventFilter.java rename to jaxp/src/java.xml/share/classes/javax/xml/stream/EventFilter.java diff --git a/jaxp/src/javax/xml/stream/FactoryConfigurationError.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/FactoryConfigurationError.java similarity index 100% rename from jaxp/src/javax/xml/stream/FactoryConfigurationError.java rename to jaxp/src/java.xml/share/classes/javax/xml/stream/FactoryConfigurationError.java diff --git a/jaxp/src/javax/xml/stream/FactoryFinder.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/FactoryFinder.java similarity index 100% rename from jaxp/src/javax/xml/stream/FactoryFinder.java rename to jaxp/src/java.xml/share/classes/javax/xml/stream/FactoryFinder.java diff --git a/jaxp/src/javax/xml/stream/Location.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/Location.java similarity index 100% rename from jaxp/src/javax/xml/stream/Location.java rename to jaxp/src/java.xml/share/classes/javax/xml/stream/Location.java diff --git a/jaxp/src/javax/xml/stream/SecuritySupport.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/SecuritySupport.java similarity index 100% rename from jaxp/src/javax/xml/stream/SecuritySupport.java rename to jaxp/src/java.xml/share/classes/javax/xml/stream/SecuritySupport.java diff --git a/jaxp/src/javax/xml/stream/StreamFilter.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/StreamFilter.java similarity index 100% rename from jaxp/src/javax/xml/stream/StreamFilter.java rename to jaxp/src/java.xml/share/classes/javax/xml/stream/StreamFilter.java diff --git a/jaxp/src/javax/xml/stream/XMLEventFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventFactory.java similarity index 100% rename from jaxp/src/javax/xml/stream/XMLEventFactory.java rename to jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventFactory.java diff --git a/jaxp/src/javax/xml/stream/XMLEventReader.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventReader.java similarity index 100% rename from jaxp/src/javax/xml/stream/XMLEventReader.java rename to jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventReader.java diff --git a/jaxp/src/javax/xml/stream/XMLEventWriter.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventWriter.java similarity index 100% rename from jaxp/src/javax/xml/stream/XMLEventWriter.java rename to jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventWriter.java diff --git a/jaxp/src/javax/xml/stream/XMLInputFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLInputFactory.java similarity index 100% rename from jaxp/src/javax/xml/stream/XMLInputFactory.java rename to jaxp/src/java.xml/share/classes/javax/xml/stream/XMLInputFactory.java diff --git a/jaxp/src/javax/xml/stream/XMLOutputFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLOutputFactory.java similarity index 100% rename from jaxp/src/javax/xml/stream/XMLOutputFactory.java rename to jaxp/src/java.xml/share/classes/javax/xml/stream/XMLOutputFactory.java diff --git a/jaxp/src/javax/xml/stream/XMLReporter.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLReporter.java similarity index 100% rename from jaxp/src/javax/xml/stream/XMLReporter.java rename to jaxp/src/java.xml/share/classes/javax/xml/stream/XMLReporter.java diff --git a/jaxp/src/javax/xml/stream/XMLResolver.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLResolver.java similarity index 100% rename from jaxp/src/javax/xml/stream/XMLResolver.java rename to jaxp/src/java.xml/share/classes/javax/xml/stream/XMLResolver.java diff --git a/jaxp/src/javax/xml/stream/XMLStreamConstants.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamConstants.java similarity index 100% rename from jaxp/src/javax/xml/stream/XMLStreamConstants.java rename to jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamConstants.java diff --git a/jaxp/src/javax/xml/stream/XMLStreamException.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamException.java similarity index 100% rename from jaxp/src/javax/xml/stream/XMLStreamException.java rename to jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamException.java diff --git a/jaxp/src/javax/xml/stream/XMLStreamReader.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamReader.java similarity index 100% rename from jaxp/src/javax/xml/stream/XMLStreamReader.java rename to jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamReader.java diff --git a/jaxp/src/javax/xml/stream/XMLStreamWriter.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamWriter.java similarity index 100% rename from jaxp/src/javax/xml/stream/XMLStreamWriter.java rename to jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamWriter.java diff --git a/jaxp/src/javax/xml/stream/events/Attribute.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/Attribute.java similarity index 100% rename from jaxp/src/javax/xml/stream/events/Attribute.java rename to jaxp/src/java.xml/share/classes/javax/xml/stream/events/Attribute.java diff --git a/jaxp/src/javax/xml/stream/events/Characters.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/Characters.java similarity index 100% rename from jaxp/src/javax/xml/stream/events/Characters.java rename to jaxp/src/java.xml/share/classes/javax/xml/stream/events/Characters.java diff --git a/jaxp/src/javax/xml/stream/events/Comment.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/Comment.java similarity index 100% rename from jaxp/src/javax/xml/stream/events/Comment.java rename to jaxp/src/java.xml/share/classes/javax/xml/stream/events/Comment.java diff --git a/jaxp/src/javax/xml/stream/events/DTD.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/DTD.java similarity index 100% rename from jaxp/src/javax/xml/stream/events/DTD.java rename to jaxp/src/java.xml/share/classes/javax/xml/stream/events/DTD.java diff --git a/jaxp/src/javax/xml/stream/events/EndDocument.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/EndDocument.java similarity index 100% rename from jaxp/src/javax/xml/stream/events/EndDocument.java rename to jaxp/src/java.xml/share/classes/javax/xml/stream/events/EndDocument.java diff --git a/jaxp/src/javax/xml/stream/events/EndElement.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/EndElement.java similarity index 100% rename from jaxp/src/javax/xml/stream/events/EndElement.java rename to jaxp/src/java.xml/share/classes/javax/xml/stream/events/EndElement.java diff --git a/jaxp/src/javax/xml/stream/events/EntityDeclaration.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/EntityDeclaration.java similarity index 100% rename from jaxp/src/javax/xml/stream/events/EntityDeclaration.java rename to jaxp/src/java.xml/share/classes/javax/xml/stream/events/EntityDeclaration.java diff --git a/jaxp/src/javax/xml/stream/events/EntityReference.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/EntityReference.java similarity index 100% rename from jaxp/src/javax/xml/stream/events/EntityReference.java rename to jaxp/src/java.xml/share/classes/javax/xml/stream/events/EntityReference.java diff --git a/jaxp/src/javax/xml/stream/events/Namespace.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/Namespace.java similarity index 100% rename from jaxp/src/javax/xml/stream/events/Namespace.java rename to jaxp/src/java.xml/share/classes/javax/xml/stream/events/Namespace.java diff --git a/jaxp/src/javax/xml/stream/events/NotationDeclaration.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/NotationDeclaration.java similarity index 100% rename from jaxp/src/javax/xml/stream/events/NotationDeclaration.java rename to jaxp/src/java.xml/share/classes/javax/xml/stream/events/NotationDeclaration.java diff --git a/jaxp/src/javax/xml/stream/events/ProcessingInstruction.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/ProcessingInstruction.java similarity index 100% rename from jaxp/src/javax/xml/stream/events/ProcessingInstruction.java rename to jaxp/src/java.xml/share/classes/javax/xml/stream/events/ProcessingInstruction.java diff --git a/jaxp/src/javax/xml/stream/events/StartDocument.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/StartDocument.java similarity index 100% rename from jaxp/src/javax/xml/stream/events/StartDocument.java rename to jaxp/src/java.xml/share/classes/javax/xml/stream/events/StartDocument.java diff --git a/jaxp/src/javax/xml/stream/events/StartElement.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/StartElement.java similarity index 100% rename from jaxp/src/javax/xml/stream/events/StartElement.java rename to jaxp/src/java.xml/share/classes/javax/xml/stream/events/StartElement.java diff --git a/jaxp/src/javax/xml/stream/events/XMLEvent.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/XMLEvent.java similarity index 100% rename from jaxp/src/javax/xml/stream/events/XMLEvent.java rename to jaxp/src/java.xml/share/classes/javax/xml/stream/events/XMLEvent.java diff --git a/jaxp/src/javax/xml/stream/util/EventReaderDelegate.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/util/EventReaderDelegate.java similarity index 100% rename from jaxp/src/javax/xml/stream/util/EventReaderDelegate.java rename to jaxp/src/java.xml/share/classes/javax/xml/stream/util/EventReaderDelegate.java diff --git a/jaxp/src/javax/xml/stream/util/StreamReaderDelegate.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/util/StreamReaderDelegate.java similarity index 100% rename from jaxp/src/javax/xml/stream/util/StreamReaderDelegate.java rename to jaxp/src/java.xml/share/classes/javax/xml/stream/util/StreamReaderDelegate.java diff --git a/jaxp/src/javax/xml/stream/util/XMLEventAllocator.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/util/XMLEventAllocator.java similarity index 100% rename from jaxp/src/javax/xml/stream/util/XMLEventAllocator.java rename to jaxp/src/java.xml/share/classes/javax/xml/stream/util/XMLEventAllocator.java diff --git a/jaxp/src/javax/xml/stream/util/XMLEventConsumer.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/util/XMLEventConsumer.java similarity index 100% rename from jaxp/src/javax/xml/stream/util/XMLEventConsumer.java rename to jaxp/src/java.xml/share/classes/javax/xml/stream/util/XMLEventConsumer.java diff --git a/jaxp/src/javax/xml/transform/ErrorListener.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/ErrorListener.java similarity index 100% rename from jaxp/src/javax/xml/transform/ErrorListener.java rename to jaxp/src/java.xml/share/classes/javax/xml/transform/ErrorListener.java diff --git a/jaxp/src/javax/xml/transform/FactoryFinder.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/FactoryFinder.java similarity index 100% rename from jaxp/src/javax/xml/transform/FactoryFinder.java rename to jaxp/src/java.xml/share/classes/javax/xml/transform/FactoryFinder.java diff --git a/jaxp/src/javax/xml/transform/OutputKeys.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/OutputKeys.java similarity index 100% rename from jaxp/src/javax/xml/transform/OutputKeys.java rename to jaxp/src/java.xml/share/classes/javax/xml/transform/OutputKeys.java diff --git a/jaxp/src/javax/xml/transform/Result.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/Result.java similarity index 100% rename from jaxp/src/javax/xml/transform/Result.java rename to jaxp/src/java.xml/share/classes/javax/xml/transform/Result.java diff --git a/jaxp/src/javax/xml/transform/SecuritySupport.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/SecuritySupport.java similarity index 100% rename from jaxp/src/javax/xml/transform/SecuritySupport.java rename to jaxp/src/java.xml/share/classes/javax/xml/transform/SecuritySupport.java diff --git a/jaxp/src/javax/xml/transform/Source.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/Source.java similarity index 100% rename from jaxp/src/javax/xml/transform/Source.java rename to jaxp/src/java.xml/share/classes/javax/xml/transform/Source.java diff --git a/jaxp/src/javax/xml/transform/SourceLocator.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/SourceLocator.java similarity index 100% rename from jaxp/src/javax/xml/transform/SourceLocator.java rename to jaxp/src/java.xml/share/classes/javax/xml/transform/SourceLocator.java diff --git a/jaxp/src/javax/xml/transform/Templates.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/Templates.java similarity index 100% rename from jaxp/src/javax/xml/transform/Templates.java rename to jaxp/src/java.xml/share/classes/javax/xml/transform/Templates.java diff --git a/jaxp/src/javax/xml/transform/Transformer.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/Transformer.java similarity index 100% rename from jaxp/src/javax/xml/transform/Transformer.java rename to jaxp/src/java.xml/share/classes/javax/xml/transform/Transformer.java diff --git a/jaxp/src/javax/xml/transform/TransformerConfigurationException.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/TransformerConfigurationException.java similarity index 100% rename from jaxp/src/javax/xml/transform/TransformerConfigurationException.java rename to jaxp/src/java.xml/share/classes/javax/xml/transform/TransformerConfigurationException.java diff --git a/jaxp/src/javax/xml/transform/TransformerException.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/TransformerException.java similarity index 100% rename from jaxp/src/javax/xml/transform/TransformerException.java rename to jaxp/src/java.xml/share/classes/javax/xml/transform/TransformerException.java diff --git a/jaxp/src/javax/xml/transform/TransformerFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/TransformerFactory.java similarity index 100% rename from jaxp/src/javax/xml/transform/TransformerFactory.java rename to jaxp/src/java.xml/share/classes/javax/xml/transform/TransformerFactory.java diff --git a/jaxp/src/javax/xml/transform/TransformerFactoryConfigurationError.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/TransformerFactoryConfigurationError.java similarity index 100% rename from jaxp/src/javax/xml/transform/TransformerFactoryConfigurationError.java rename to jaxp/src/java.xml/share/classes/javax/xml/transform/TransformerFactoryConfigurationError.java diff --git a/jaxp/src/javax/xml/transform/URIResolver.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/URIResolver.java similarity index 100% rename from jaxp/src/javax/xml/transform/URIResolver.java rename to jaxp/src/java.xml/share/classes/javax/xml/transform/URIResolver.java diff --git a/jaxp/src/javax/xml/transform/dom/DOMLocator.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/dom/DOMLocator.java similarity index 100% rename from jaxp/src/javax/xml/transform/dom/DOMLocator.java rename to jaxp/src/java.xml/share/classes/javax/xml/transform/dom/DOMLocator.java diff --git a/jaxp/src/javax/xml/transform/dom/DOMResult.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/dom/DOMResult.java similarity index 100% rename from jaxp/src/javax/xml/transform/dom/DOMResult.java rename to jaxp/src/java.xml/share/classes/javax/xml/transform/dom/DOMResult.java diff --git a/jaxp/src/javax/xml/transform/dom/DOMSource.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/dom/DOMSource.java similarity index 100% rename from jaxp/src/javax/xml/transform/dom/DOMSource.java rename to jaxp/src/java.xml/share/classes/javax/xml/transform/dom/DOMSource.java diff --git a/jaxp/src/javax/xml/transform/dom/package.html b/jaxp/src/java.xml/share/classes/javax/xml/transform/dom/package.html similarity index 100% rename from jaxp/src/javax/xml/transform/dom/package.html rename to jaxp/src/java.xml/share/classes/javax/xml/transform/dom/package.html diff --git a/jaxp/src/javax/xml/transform/overview.html b/jaxp/src/java.xml/share/classes/javax/xml/transform/overview.html similarity index 100% rename from jaxp/src/javax/xml/transform/overview.html rename to jaxp/src/java.xml/share/classes/javax/xml/transform/overview.html diff --git a/jaxp/src/javax/xml/transform/package.html b/jaxp/src/java.xml/share/classes/javax/xml/transform/package.html similarity index 100% rename from jaxp/src/javax/xml/transform/package.html rename to jaxp/src/java.xml/share/classes/javax/xml/transform/package.html diff --git a/jaxp/src/javax/xml/transform/sax/SAXResult.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/sax/SAXResult.java similarity index 100% rename from jaxp/src/javax/xml/transform/sax/SAXResult.java rename to jaxp/src/java.xml/share/classes/javax/xml/transform/sax/SAXResult.java diff --git a/jaxp/src/javax/xml/transform/sax/SAXSource.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/sax/SAXSource.java similarity index 100% rename from jaxp/src/javax/xml/transform/sax/SAXSource.java rename to jaxp/src/java.xml/share/classes/javax/xml/transform/sax/SAXSource.java diff --git a/jaxp/src/javax/xml/transform/sax/SAXTransformerFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/sax/SAXTransformerFactory.java similarity index 100% rename from jaxp/src/javax/xml/transform/sax/SAXTransformerFactory.java rename to jaxp/src/java.xml/share/classes/javax/xml/transform/sax/SAXTransformerFactory.java diff --git a/jaxp/src/javax/xml/transform/sax/TemplatesHandler.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/sax/TemplatesHandler.java similarity index 100% rename from jaxp/src/javax/xml/transform/sax/TemplatesHandler.java rename to jaxp/src/java.xml/share/classes/javax/xml/transform/sax/TemplatesHandler.java diff --git a/jaxp/src/javax/xml/transform/sax/TransformerHandler.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/sax/TransformerHandler.java similarity index 100% rename from jaxp/src/javax/xml/transform/sax/TransformerHandler.java rename to jaxp/src/java.xml/share/classes/javax/xml/transform/sax/TransformerHandler.java diff --git a/jaxp/src/javax/xml/transform/sax/package.html b/jaxp/src/java.xml/share/classes/javax/xml/transform/sax/package.html similarity index 100% rename from jaxp/src/javax/xml/transform/sax/package.html rename to jaxp/src/java.xml/share/classes/javax/xml/transform/sax/package.html diff --git a/jaxp/src/javax/xml/transform/stax/StAXResult.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/stax/StAXResult.java similarity index 100% rename from jaxp/src/javax/xml/transform/stax/StAXResult.java rename to jaxp/src/java.xml/share/classes/javax/xml/transform/stax/StAXResult.java diff --git a/jaxp/src/javax/xml/transform/stax/StAXSource.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/stax/StAXSource.java similarity index 100% rename from jaxp/src/javax/xml/transform/stax/StAXSource.java rename to jaxp/src/java.xml/share/classes/javax/xml/transform/stax/StAXSource.java diff --git a/jaxp/src/javax/xml/transform/stax/package.html b/jaxp/src/java.xml/share/classes/javax/xml/transform/stax/package.html similarity index 100% rename from jaxp/src/javax/xml/transform/stax/package.html rename to jaxp/src/java.xml/share/classes/javax/xml/transform/stax/package.html diff --git a/jaxp/src/javax/xml/transform/stream/StreamResult.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/stream/StreamResult.java similarity index 100% rename from jaxp/src/javax/xml/transform/stream/StreamResult.java rename to jaxp/src/java.xml/share/classes/javax/xml/transform/stream/StreamResult.java diff --git a/jaxp/src/javax/xml/transform/stream/StreamSource.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/stream/StreamSource.java similarity index 100% rename from jaxp/src/javax/xml/transform/stream/StreamSource.java rename to jaxp/src/java.xml/share/classes/javax/xml/transform/stream/StreamSource.java diff --git a/jaxp/src/javax/xml/transform/stream/package.html b/jaxp/src/java.xml/share/classes/javax/xml/transform/stream/package.html similarity index 100% rename from jaxp/src/javax/xml/transform/stream/package.html rename to jaxp/src/java.xml/share/classes/javax/xml/transform/stream/package.html diff --git a/jaxp/src/javax/xml/validation/Schema.java b/jaxp/src/java.xml/share/classes/javax/xml/validation/Schema.java similarity index 100% rename from jaxp/src/javax/xml/validation/Schema.java rename to jaxp/src/java.xml/share/classes/javax/xml/validation/Schema.java diff --git a/jaxp/src/javax/xml/validation/SchemaFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java similarity index 100% rename from jaxp/src/javax/xml/validation/SchemaFactory.java rename to jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java diff --git a/jaxp/src/javax/xml/validation/SchemaFactoryConfigurationError.java b/jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryConfigurationError.java similarity index 100% rename from jaxp/src/javax/xml/validation/SchemaFactoryConfigurationError.java rename to jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryConfigurationError.java diff --git a/jaxp/src/javax/xml/validation/SchemaFactoryFinder.java b/jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryFinder.java similarity index 100% rename from jaxp/src/javax/xml/validation/SchemaFactoryFinder.java rename to jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryFinder.java diff --git a/jaxp/src/javax/xml/validation/SchemaFactoryLoader.java b/jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryLoader.java similarity index 100% rename from jaxp/src/javax/xml/validation/SchemaFactoryLoader.java rename to jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryLoader.java diff --git a/jaxp/src/javax/xml/validation/SecuritySupport.java b/jaxp/src/java.xml/share/classes/javax/xml/validation/SecuritySupport.java similarity index 100% rename from jaxp/src/javax/xml/validation/SecuritySupport.java rename to jaxp/src/java.xml/share/classes/javax/xml/validation/SecuritySupport.java diff --git a/jaxp/src/javax/xml/validation/TypeInfoProvider.java b/jaxp/src/java.xml/share/classes/javax/xml/validation/TypeInfoProvider.java similarity index 100% rename from jaxp/src/javax/xml/validation/TypeInfoProvider.java rename to jaxp/src/java.xml/share/classes/javax/xml/validation/TypeInfoProvider.java diff --git a/jaxp/src/javax/xml/validation/Validator.java b/jaxp/src/java.xml/share/classes/javax/xml/validation/Validator.java similarity index 100% rename from jaxp/src/javax/xml/validation/Validator.java rename to jaxp/src/java.xml/share/classes/javax/xml/validation/Validator.java diff --git a/jaxp/src/javax/xml/validation/ValidatorHandler.java b/jaxp/src/java.xml/share/classes/javax/xml/validation/ValidatorHandler.java similarity index 100% rename from jaxp/src/javax/xml/validation/ValidatorHandler.java rename to jaxp/src/java.xml/share/classes/javax/xml/validation/ValidatorHandler.java diff --git a/jaxp/src/javax/xml/validation/package.html b/jaxp/src/java.xml/share/classes/javax/xml/validation/package.html similarity index 100% rename from jaxp/src/javax/xml/validation/package.html rename to jaxp/src/java.xml/share/classes/javax/xml/validation/package.html diff --git a/jaxp/src/javax/xml/xpath/SecuritySupport.java b/jaxp/src/java.xml/share/classes/javax/xml/xpath/SecuritySupport.java similarity index 100% rename from jaxp/src/javax/xml/xpath/SecuritySupport.java rename to jaxp/src/java.xml/share/classes/javax/xml/xpath/SecuritySupport.java diff --git a/jaxp/src/javax/xml/xpath/XPath.java b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPath.java similarity index 100% rename from jaxp/src/javax/xml/xpath/XPath.java rename to jaxp/src/java.xml/share/classes/javax/xml/xpath/XPath.java diff --git a/jaxp/src/javax/xml/xpath/XPathConstants.java b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathConstants.java similarity index 100% rename from jaxp/src/javax/xml/xpath/XPathConstants.java rename to jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathConstants.java diff --git a/jaxp/src/javax/xml/xpath/XPathException.java b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathException.java similarity index 100% rename from jaxp/src/javax/xml/xpath/XPathException.java rename to jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathException.java diff --git a/jaxp/src/javax/xml/xpath/XPathExpression.java b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathExpression.java similarity index 100% rename from jaxp/src/javax/xml/xpath/XPathExpression.java rename to jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathExpression.java diff --git a/jaxp/src/javax/xml/xpath/XPathExpressionException.java b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathExpressionException.java similarity index 100% rename from jaxp/src/javax/xml/xpath/XPathExpressionException.java rename to jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathExpressionException.java diff --git a/jaxp/src/javax/xml/xpath/XPathFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFactory.java similarity index 100% rename from jaxp/src/javax/xml/xpath/XPathFactory.java rename to jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFactory.java diff --git a/jaxp/src/javax/xml/xpath/XPathFactoryConfigurationException.java b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryConfigurationException.java similarity index 100% rename from jaxp/src/javax/xml/xpath/XPathFactoryConfigurationException.java rename to jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryConfigurationException.java diff --git a/jaxp/src/javax/xml/xpath/XPathFactoryFinder.java b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryFinder.java similarity index 100% rename from jaxp/src/javax/xml/xpath/XPathFactoryFinder.java rename to jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryFinder.java diff --git a/jaxp/src/javax/xml/xpath/XPathFunction.java b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFunction.java similarity index 100% rename from jaxp/src/javax/xml/xpath/XPathFunction.java rename to jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFunction.java diff --git a/jaxp/src/javax/xml/xpath/XPathFunctionException.java b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFunctionException.java similarity index 100% rename from jaxp/src/javax/xml/xpath/XPathFunctionException.java rename to jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFunctionException.java diff --git a/jaxp/src/javax/xml/xpath/XPathFunctionResolver.java b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFunctionResolver.java similarity index 100% rename from jaxp/src/javax/xml/xpath/XPathFunctionResolver.java rename to jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFunctionResolver.java diff --git a/jaxp/src/javax/xml/xpath/XPathVariableResolver.java b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathVariableResolver.java similarity index 100% rename from jaxp/src/javax/xml/xpath/XPathVariableResolver.java rename to jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathVariableResolver.java diff --git a/jaxp/src/javax/xml/xpath/package.html b/jaxp/src/java.xml/share/classes/javax/xml/xpath/package.html similarity index 100% rename from jaxp/src/javax/xml/xpath/package.html rename to jaxp/src/java.xml/share/classes/javax/xml/xpath/package.html diff --git a/jaxp/src/org/w3c/dom/Attr.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/Attr.java similarity index 100% rename from jaxp/src/org/w3c/dom/Attr.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/Attr.java diff --git a/jaxp/src/org/w3c/dom/CDATASection.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/CDATASection.java similarity index 100% rename from jaxp/src/org/w3c/dom/CDATASection.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/CDATASection.java diff --git a/jaxp/src/org/w3c/dom/CharacterData.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/CharacterData.java similarity index 100% rename from jaxp/src/org/w3c/dom/CharacterData.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/CharacterData.java diff --git a/jaxp/src/org/w3c/dom/Comment.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/Comment.java similarity index 100% rename from jaxp/src/org/w3c/dom/Comment.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/Comment.java diff --git a/jaxp/src/org/w3c/dom/DOMConfiguration.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/DOMConfiguration.java similarity index 100% rename from jaxp/src/org/w3c/dom/DOMConfiguration.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/DOMConfiguration.java diff --git a/jaxp/src/org/w3c/dom/DOMError.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/DOMError.java similarity index 100% rename from jaxp/src/org/w3c/dom/DOMError.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/DOMError.java diff --git a/jaxp/src/org/w3c/dom/DOMErrorHandler.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/DOMErrorHandler.java similarity index 100% rename from jaxp/src/org/w3c/dom/DOMErrorHandler.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/DOMErrorHandler.java diff --git a/jaxp/src/org/w3c/dom/DOMException.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/DOMException.java similarity index 100% rename from jaxp/src/org/w3c/dom/DOMException.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/DOMException.java diff --git a/jaxp/src/org/w3c/dom/DOMImplementation.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/DOMImplementation.java similarity index 100% rename from jaxp/src/org/w3c/dom/DOMImplementation.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/DOMImplementation.java diff --git a/jaxp/src/org/w3c/dom/DOMImplementationList.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/DOMImplementationList.java similarity index 100% rename from jaxp/src/org/w3c/dom/DOMImplementationList.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/DOMImplementationList.java diff --git a/jaxp/src/org/w3c/dom/DOMImplementationSource.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/DOMImplementationSource.java similarity index 100% rename from jaxp/src/org/w3c/dom/DOMImplementationSource.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/DOMImplementationSource.java diff --git a/jaxp/src/org/w3c/dom/DOMLocator.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/DOMLocator.java similarity index 100% rename from jaxp/src/org/w3c/dom/DOMLocator.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/DOMLocator.java diff --git a/jaxp/src/org/w3c/dom/DOMStringList.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/DOMStringList.java similarity index 100% rename from jaxp/src/org/w3c/dom/DOMStringList.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/DOMStringList.java diff --git a/jaxp/src/org/w3c/dom/Document.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/Document.java similarity index 100% rename from jaxp/src/org/w3c/dom/Document.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/Document.java diff --git a/jaxp/src/org/w3c/dom/DocumentFragment.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/DocumentFragment.java similarity index 100% rename from jaxp/src/org/w3c/dom/DocumentFragment.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/DocumentFragment.java diff --git a/jaxp/src/org/w3c/dom/DocumentType.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/DocumentType.java similarity index 100% rename from jaxp/src/org/w3c/dom/DocumentType.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/DocumentType.java diff --git a/jaxp/src/org/w3c/dom/Element.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/Element.java similarity index 100% rename from jaxp/src/org/w3c/dom/Element.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/Element.java diff --git a/jaxp/src/org/w3c/dom/Entity.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/Entity.java similarity index 100% rename from jaxp/src/org/w3c/dom/Entity.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/Entity.java diff --git a/jaxp/src/org/w3c/dom/EntityReference.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/EntityReference.java similarity index 100% rename from jaxp/src/org/w3c/dom/EntityReference.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/EntityReference.java diff --git a/jaxp/src/org/w3c/dom/NameList.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/NameList.java similarity index 100% rename from jaxp/src/org/w3c/dom/NameList.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/NameList.java diff --git a/jaxp/src/org/w3c/dom/NamedNodeMap.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/NamedNodeMap.java similarity index 100% rename from jaxp/src/org/w3c/dom/NamedNodeMap.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/NamedNodeMap.java diff --git a/jaxp/src/org/w3c/dom/Node.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/Node.java similarity index 100% rename from jaxp/src/org/w3c/dom/Node.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/Node.java diff --git a/jaxp/src/org/w3c/dom/NodeList.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/NodeList.java similarity index 100% rename from jaxp/src/org/w3c/dom/NodeList.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/NodeList.java diff --git a/jaxp/src/org/w3c/dom/Notation.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/Notation.java similarity index 100% rename from jaxp/src/org/w3c/dom/Notation.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/Notation.java diff --git a/jaxp/src/org/w3c/dom/ProcessingInstruction.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/ProcessingInstruction.java similarity index 100% rename from jaxp/src/org/w3c/dom/ProcessingInstruction.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/ProcessingInstruction.java diff --git a/jaxp/src/org/w3c/dom/Text.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/Text.java similarity index 100% rename from jaxp/src/org/w3c/dom/Text.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/Text.java diff --git a/jaxp/src/org/w3c/dom/TypeInfo.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/TypeInfo.java similarity index 100% rename from jaxp/src/org/w3c/dom/TypeInfo.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/TypeInfo.java diff --git a/jaxp/src/org/w3c/dom/UserDataHandler.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/UserDataHandler.java similarity index 100% rename from jaxp/src/org/w3c/dom/UserDataHandler.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/UserDataHandler.java diff --git a/jaxp/src/org/w3c/dom/bootstrap/DOMImplementationRegistry.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/bootstrap/DOMImplementationRegistry.java similarity index 100% rename from jaxp/src/org/w3c/dom/bootstrap/DOMImplementationRegistry.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/bootstrap/DOMImplementationRegistry.java diff --git a/jaxp/src/org/w3c/dom/css/CSS2Properties.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSS2Properties.java similarity index 100% rename from jaxp/src/org/w3c/dom/css/CSS2Properties.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSS2Properties.java diff --git a/jaxp/src/org/w3c/dom/css/CSSCharsetRule.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSCharsetRule.java similarity index 100% rename from jaxp/src/org/w3c/dom/css/CSSCharsetRule.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSCharsetRule.java diff --git a/jaxp/src/org/w3c/dom/css/CSSFontFaceRule.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSFontFaceRule.java similarity index 100% rename from jaxp/src/org/w3c/dom/css/CSSFontFaceRule.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSFontFaceRule.java diff --git a/jaxp/src/org/w3c/dom/css/CSSImportRule.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSImportRule.java similarity index 100% rename from jaxp/src/org/w3c/dom/css/CSSImportRule.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSImportRule.java diff --git a/jaxp/src/org/w3c/dom/css/CSSMediaRule.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSMediaRule.java similarity index 100% rename from jaxp/src/org/w3c/dom/css/CSSMediaRule.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSMediaRule.java diff --git a/jaxp/src/org/w3c/dom/css/CSSPageRule.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSPageRule.java similarity index 100% rename from jaxp/src/org/w3c/dom/css/CSSPageRule.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSPageRule.java diff --git a/jaxp/src/org/w3c/dom/css/CSSPrimitiveValue.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSPrimitiveValue.java similarity index 100% rename from jaxp/src/org/w3c/dom/css/CSSPrimitiveValue.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSPrimitiveValue.java diff --git a/jaxp/src/org/w3c/dom/css/CSSRule.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSRule.java similarity index 100% rename from jaxp/src/org/w3c/dom/css/CSSRule.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSRule.java diff --git a/jaxp/src/org/w3c/dom/css/CSSRuleList.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSRuleList.java similarity index 100% rename from jaxp/src/org/w3c/dom/css/CSSRuleList.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSRuleList.java diff --git a/jaxp/src/org/w3c/dom/css/CSSStyleDeclaration.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSStyleDeclaration.java similarity index 100% rename from jaxp/src/org/w3c/dom/css/CSSStyleDeclaration.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSStyleDeclaration.java diff --git a/jaxp/src/org/w3c/dom/css/CSSStyleRule.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSStyleRule.java similarity index 100% rename from jaxp/src/org/w3c/dom/css/CSSStyleRule.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSStyleRule.java diff --git a/jaxp/src/org/w3c/dom/css/CSSStyleSheet.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSStyleSheet.java similarity index 100% rename from jaxp/src/org/w3c/dom/css/CSSStyleSheet.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSStyleSheet.java diff --git a/jaxp/src/org/w3c/dom/css/CSSUnknownRule.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSUnknownRule.java similarity index 100% rename from jaxp/src/org/w3c/dom/css/CSSUnknownRule.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSUnknownRule.java diff --git a/jaxp/src/org/w3c/dom/css/CSSValue.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSValue.java similarity index 100% rename from jaxp/src/org/w3c/dom/css/CSSValue.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSValue.java diff --git a/jaxp/src/org/w3c/dom/css/CSSValueList.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSValueList.java similarity index 100% rename from jaxp/src/org/w3c/dom/css/CSSValueList.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSValueList.java diff --git a/jaxp/src/org/w3c/dom/css/Counter.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/Counter.java similarity index 100% rename from jaxp/src/org/w3c/dom/css/Counter.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/Counter.java diff --git a/jaxp/src/org/w3c/dom/css/DOMImplementationCSS.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/DOMImplementationCSS.java similarity index 100% rename from jaxp/src/org/w3c/dom/css/DOMImplementationCSS.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/DOMImplementationCSS.java diff --git a/jaxp/src/org/w3c/dom/css/DocumentCSS.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/DocumentCSS.java similarity index 100% rename from jaxp/src/org/w3c/dom/css/DocumentCSS.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/DocumentCSS.java diff --git a/jaxp/src/org/w3c/dom/css/ElementCSSInlineStyle.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/ElementCSSInlineStyle.java similarity index 100% rename from jaxp/src/org/w3c/dom/css/ElementCSSInlineStyle.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/ElementCSSInlineStyle.java diff --git a/jaxp/src/org/w3c/dom/css/RGBColor.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/RGBColor.java similarity index 100% rename from jaxp/src/org/w3c/dom/css/RGBColor.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/RGBColor.java diff --git a/jaxp/src/org/w3c/dom/css/Rect.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/Rect.java similarity index 100% rename from jaxp/src/org/w3c/dom/css/Rect.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/Rect.java diff --git a/jaxp/src/org/w3c/dom/css/ViewCSS.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/ViewCSS.java similarity index 100% rename from jaxp/src/org/w3c/dom/css/ViewCSS.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/ViewCSS.java diff --git a/jaxp/src/org/w3c/dom/events/DocumentEvent.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/events/DocumentEvent.java similarity index 100% rename from jaxp/src/org/w3c/dom/events/DocumentEvent.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/events/DocumentEvent.java diff --git a/jaxp/src/org/w3c/dom/events/Event.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/events/Event.java similarity index 100% rename from jaxp/src/org/w3c/dom/events/Event.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/events/Event.java diff --git a/jaxp/src/org/w3c/dom/events/EventException.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/events/EventException.java similarity index 100% rename from jaxp/src/org/w3c/dom/events/EventException.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/events/EventException.java diff --git a/jaxp/src/org/w3c/dom/events/EventListener.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/events/EventListener.java similarity index 100% rename from jaxp/src/org/w3c/dom/events/EventListener.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/events/EventListener.java diff --git a/jaxp/src/org/w3c/dom/events/EventTarget.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/events/EventTarget.java similarity index 100% rename from jaxp/src/org/w3c/dom/events/EventTarget.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/events/EventTarget.java diff --git a/jaxp/src/org/w3c/dom/events/MouseEvent.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/events/MouseEvent.java similarity index 100% rename from jaxp/src/org/w3c/dom/events/MouseEvent.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/events/MouseEvent.java diff --git a/jaxp/src/org/w3c/dom/events/MutationEvent.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/events/MutationEvent.java similarity index 100% rename from jaxp/src/org/w3c/dom/events/MutationEvent.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/events/MutationEvent.java diff --git a/jaxp/src/org/w3c/dom/events/UIEvent.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/events/UIEvent.java similarity index 100% rename from jaxp/src/org/w3c/dom/events/UIEvent.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/events/UIEvent.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLAnchorElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLAnchorElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLAnchorElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLAnchorElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLAppletElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLAppletElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLAppletElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLAppletElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLAreaElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLAreaElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLAreaElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLAreaElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLBRElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLBRElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLBRElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLBRElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLBaseElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLBaseElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLBaseElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLBaseElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLBaseFontElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLBaseFontElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLBaseFontElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLBaseFontElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLBodyElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLBodyElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLBodyElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLBodyElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLButtonElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLButtonElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLButtonElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLButtonElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLCollection.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLCollection.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLCollection.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLCollection.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLDListElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLDListElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLDListElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLDListElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLDOMImplementation.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLDOMImplementation.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLDOMImplementation.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLDOMImplementation.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLDirectoryElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLDirectoryElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLDirectoryElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLDirectoryElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLDivElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLDivElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLDivElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLDivElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLDocument.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLDocument.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLDocument.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLDocument.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLFieldSetElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLFieldSetElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLFieldSetElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLFieldSetElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLFontElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLFontElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLFontElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLFontElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLFormElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLFormElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLFormElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLFormElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLFrameElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLFrameElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLFrameElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLFrameElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLFrameSetElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLFrameSetElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLFrameSetElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLFrameSetElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLHRElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLHRElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLHRElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLHRElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLHeadElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLHeadElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLHeadElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLHeadElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLHeadingElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLHeadingElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLHeadingElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLHeadingElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLHtmlElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLHtmlElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLHtmlElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLHtmlElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLIFrameElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLIFrameElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLIFrameElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLIFrameElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLImageElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLImageElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLImageElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLImageElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLInputElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLInputElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLInputElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLInputElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLIsIndexElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLIsIndexElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLIsIndexElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLIsIndexElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLLIElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLLIElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLLIElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLLIElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLLabelElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLLabelElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLLabelElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLLabelElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLLegendElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLLegendElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLLegendElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLLegendElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLLinkElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLLinkElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLLinkElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLLinkElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLMapElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLMapElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLMapElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLMapElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLMenuElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLMenuElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLMenuElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLMenuElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLMetaElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLMetaElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLMetaElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLMetaElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLModElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLModElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLModElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLModElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLOListElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLOListElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLOListElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLOListElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLObjectElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLObjectElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLObjectElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLObjectElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLOptGroupElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLOptGroupElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLOptGroupElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLOptGroupElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLOptionElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLOptionElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLOptionElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLOptionElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLParagraphElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLParagraphElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLParagraphElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLParagraphElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLParamElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLParamElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLParamElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLParamElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLPreElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLPreElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLPreElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLPreElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLQuoteElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLQuoteElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLQuoteElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLQuoteElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLScriptElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLScriptElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLScriptElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLScriptElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLSelectElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLSelectElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLSelectElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLSelectElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLStyleElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLStyleElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLStyleElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLStyleElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLTableCaptionElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTableCaptionElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLTableCaptionElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTableCaptionElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLTableCellElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTableCellElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLTableCellElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTableCellElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLTableColElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTableColElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLTableColElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTableColElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLTableElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTableElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLTableElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTableElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLTableRowElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTableRowElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLTableRowElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTableRowElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLTableSectionElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTableSectionElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLTableSectionElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTableSectionElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLTextAreaElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTextAreaElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLTextAreaElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTextAreaElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLTitleElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTitleElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLTitleElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTitleElement.java diff --git a/jaxp/src/org/w3c/dom/html/HTMLUListElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLUListElement.java similarity index 100% rename from jaxp/src/org/w3c/dom/html/HTMLUListElement.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLUListElement.java diff --git a/jaxp/src/org/w3c/dom/ls/DOMImplementationLS.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/DOMImplementationLS.java similarity index 100% rename from jaxp/src/org/w3c/dom/ls/DOMImplementationLS.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/ls/DOMImplementationLS.java diff --git a/jaxp/src/org/w3c/dom/ls/LSException.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSException.java similarity index 100% rename from jaxp/src/org/w3c/dom/ls/LSException.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSException.java diff --git a/jaxp/src/org/w3c/dom/ls/LSInput.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSInput.java similarity index 100% rename from jaxp/src/org/w3c/dom/ls/LSInput.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSInput.java diff --git a/jaxp/src/org/w3c/dom/ls/LSLoadEvent.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSLoadEvent.java similarity index 100% rename from jaxp/src/org/w3c/dom/ls/LSLoadEvent.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSLoadEvent.java diff --git a/jaxp/src/org/w3c/dom/ls/LSOutput.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSOutput.java similarity index 100% rename from jaxp/src/org/w3c/dom/ls/LSOutput.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSOutput.java diff --git a/jaxp/src/org/w3c/dom/ls/LSParser.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSParser.java similarity index 100% rename from jaxp/src/org/w3c/dom/ls/LSParser.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSParser.java diff --git a/jaxp/src/org/w3c/dom/ls/LSParserFilter.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSParserFilter.java similarity index 100% rename from jaxp/src/org/w3c/dom/ls/LSParserFilter.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSParserFilter.java diff --git a/jaxp/src/org/w3c/dom/ls/LSProgressEvent.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSProgressEvent.java similarity index 100% rename from jaxp/src/org/w3c/dom/ls/LSProgressEvent.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSProgressEvent.java diff --git a/jaxp/src/org/w3c/dom/ls/LSResourceResolver.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSResourceResolver.java similarity index 100% rename from jaxp/src/org/w3c/dom/ls/LSResourceResolver.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSResourceResolver.java diff --git a/jaxp/src/org/w3c/dom/ls/LSSerializer.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSSerializer.java similarity index 100% rename from jaxp/src/org/w3c/dom/ls/LSSerializer.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSSerializer.java diff --git a/jaxp/src/org/w3c/dom/ls/LSSerializerFilter.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSSerializerFilter.java similarity index 100% rename from jaxp/src/org/w3c/dom/ls/LSSerializerFilter.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSSerializerFilter.java diff --git a/jaxp/src/org/w3c/dom/package.html b/jaxp/src/java.xml/share/classes/org/w3c/dom/package.html similarity index 100% rename from jaxp/src/org/w3c/dom/package.html rename to jaxp/src/java.xml/share/classes/org/w3c/dom/package.html diff --git a/jaxp/src/org/w3c/dom/ranges/DocumentRange.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/ranges/DocumentRange.java similarity index 100% rename from jaxp/src/org/w3c/dom/ranges/DocumentRange.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/ranges/DocumentRange.java diff --git a/jaxp/src/org/w3c/dom/ranges/Range.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/ranges/Range.java similarity index 100% rename from jaxp/src/org/w3c/dom/ranges/Range.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/ranges/Range.java diff --git a/jaxp/src/org/w3c/dom/ranges/RangeException.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/ranges/RangeException.java similarity index 100% rename from jaxp/src/org/w3c/dom/ranges/RangeException.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/ranges/RangeException.java diff --git a/jaxp/src/org/w3c/dom/ranges/package.html b/jaxp/src/java.xml/share/classes/org/w3c/dom/ranges/package.html similarity index 100% rename from jaxp/src/org/w3c/dom/ranges/package.html rename to jaxp/src/java.xml/share/classes/org/w3c/dom/ranges/package.html diff --git a/jaxp/src/org/w3c/dom/stylesheets/DocumentStyle.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/stylesheets/DocumentStyle.java similarity index 100% rename from jaxp/src/org/w3c/dom/stylesheets/DocumentStyle.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/stylesheets/DocumentStyle.java diff --git a/jaxp/src/org/w3c/dom/stylesheets/LinkStyle.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/stylesheets/LinkStyle.java similarity index 100% rename from jaxp/src/org/w3c/dom/stylesheets/LinkStyle.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/stylesheets/LinkStyle.java diff --git a/jaxp/src/org/w3c/dom/stylesheets/MediaList.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/stylesheets/MediaList.java similarity index 100% rename from jaxp/src/org/w3c/dom/stylesheets/MediaList.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/stylesheets/MediaList.java diff --git a/jaxp/src/org/w3c/dom/stylesheets/StyleSheet.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/stylesheets/StyleSheet.java similarity index 100% rename from jaxp/src/org/w3c/dom/stylesheets/StyleSheet.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/stylesheets/StyleSheet.java diff --git a/jaxp/src/org/w3c/dom/stylesheets/StyleSheetList.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/stylesheets/StyleSheetList.java similarity index 100% rename from jaxp/src/org/w3c/dom/stylesheets/StyleSheetList.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/stylesheets/StyleSheetList.java diff --git a/jaxp/src/org/w3c/dom/traversal/DocumentTraversal.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/traversal/DocumentTraversal.java similarity index 100% rename from jaxp/src/org/w3c/dom/traversal/DocumentTraversal.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/traversal/DocumentTraversal.java diff --git a/jaxp/src/org/w3c/dom/traversal/NodeFilter.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/traversal/NodeFilter.java similarity index 100% rename from jaxp/src/org/w3c/dom/traversal/NodeFilter.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/traversal/NodeFilter.java diff --git a/jaxp/src/org/w3c/dom/traversal/NodeIterator.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/traversal/NodeIterator.java similarity index 100% rename from jaxp/src/org/w3c/dom/traversal/NodeIterator.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/traversal/NodeIterator.java diff --git a/jaxp/src/org/w3c/dom/traversal/TreeWalker.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/traversal/TreeWalker.java similarity index 100% rename from jaxp/src/org/w3c/dom/traversal/TreeWalker.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/traversal/TreeWalker.java diff --git a/jaxp/src/org/w3c/dom/views/AbstractView.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/views/AbstractView.java similarity index 100% rename from jaxp/src/org/w3c/dom/views/AbstractView.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/views/AbstractView.java diff --git a/jaxp/src/org/w3c/dom/views/DocumentView.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/views/DocumentView.java similarity index 100% rename from jaxp/src/org/w3c/dom/views/DocumentView.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/views/DocumentView.java diff --git a/jaxp/src/org/w3c/dom/xpath/COPYRIGHT.html b/jaxp/src/java.xml/share/classes/org/w3c/dom/xpath/COPYRIGHT.html similarity index 100% rename from jaxp/src/org/w3c/dom/xpath/COPYRIGHT.html rename to jaxp/src/java.xml/share/classes/org/w3c/dom/xpath/COPYRIGHT.html diff --git a/jaxp/src/org/w3c/dom/xpath/XPathEvaluator.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/xpath/XPathEvaluator.java similarity index 100% rename from jaxp/src/org/w3c/dom/xpath/XPathEvaluator.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/xpath/XPathEvaluator.java diff --git a/jaxp/src/org/w3c/dom/xpath/XPathException.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/xpath/XPathException.java similarity index 100% rename from jaxp/src/org/w3c/dom/xpath/XPathException.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/xpath/XPathException.java diff --git a/jaxp/src/org/w3c/dom/xpath/XPathExpression.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/xpath/XPathExpression.java similarity index 100% rename from jaxp/src/org/w3c/dom/xpath/XPathExpression.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/xpath/XPathExpression.java diff --git a/jaxp/src/org/w3c/dom/xpath/XPathNSResolver.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/xpath/XPathNSResolver.java similarity index 100% rename from jaxp/src/org/w3c/dom/xpath/XPathNSResolver.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/xpath/XPathNSResolver.java diff --git a/jaxp/src/org/w3c/dom/xpath/XPathNamespace.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/xpath/XPathNamespace.java similarity index 100% rename from jaxp/src/org/w3c/dom/xpath/XPathNamespace.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/xpath/XPathNamespace.java diff --git a/jaxp/src/org/w3c/dom/xpath/XPathResult.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/xpath/XPathResult.java similarity index 100% rename from jaxp/src/org/w3c/dom/xpath/XPathResult.java rename to jaxp/src/java.xml/share/classes/org/w3c/dom/xpath/XPathResult.java diff --git a/jaxp/src/org/xml/sax/AttributeList.java b/jaxp/src/java.xml/share/classes/org/xml/sax/AttributeList.java similarity index 100% rename from jaxp/src/org/xml/sax/AttributeList.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/AttributeList.java diff --git a/jaxp/src/org/xml/sax/Attributes.java b/jaxp/src/java.xml/share/classes/org/xml/sax/Attributes.java similarity index 100% rename from jaxp/src/org/xml/sax/Attributes.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/Attributes.java diff --git a/jaxp/src/org/xml/sax/ContentHandler.java b/jaxp/src/java.xml/share/classes/org/xml/sax/ContentHandler.java similarity index 100% rename from jaxp/src/org/xml/sax/ContentHandler.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/ContentHandler.java diff --git a/jaxp/src/org/xml/sax/DTDHandler.java b/jaxp/src/java.xml/share/classes/org/xml/sax/DTDHandler.java similarity index 100% rename from jaxp/src/org/xml/sax/DTDHandler.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/DTDHandler.java diff --git a/jaxp/src/org/xml/sax/DocumentHandler.java b/jaxp/src/java.xml/share/classes/org/xml/sax/DocumentHandler.java similarity index 100% rename from jaxp/src/org/xml/sax/DocumentHandler.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/DocumentHandler.java diff --git a/jaxp/src/org/xml/sax/EntityResolver.java b/jaxp/src/java.xml/share/classes/org/xml/sax/EntityResolver.java similarity index 100% rename from jaxp/src/org/xml/sax/EntityResolver.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/EntityResolver.java diff --git a/jaxp/src/org/xml/sax/ErrorHandler.java b/jaxp/src/java.xml/share/classes/org/xml/sax/ErrorHandler.java similarity index 100% rename from jaxp/src/org/xml/sax/ErrorHandler.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/ErrorHandler.java diff --git a/jaxp/src/org/xml/sax/HandlerBase.java b/jaxp/src/java.xml/share/classes/org/xml/sax/HandlerBase.java similarity index 100% rename from jaxp/src/org/xml/sax/HandlerBase.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/HandlerBase.java diff --git a/jaxp/src/org/xml/sax/InputSource.java b/jaxp/src/java.xml/share/classes/org/xml/sax/InputSource.java similarity index 100% rename from jaxp/src/org/xml/sax/InputSource.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/InputSource.java diff --git a/jaxp/src/org/xml/sax/Locator.java b/jaxp/src/java.xml/share/classes/org/xml/sax/Locator.java similarity index 100% rename from jaxp/src/org/xml/sax/Locator.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/Locator.java diff --git a/jaxp/src/org/xml/sax/Parser.java b/jaxp/src/java.xml/share/classes/org/xml/sax/Parser.java similarity index 100% rename from jaxp/src/org/xml/sax/Parser.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/Parser.java diff --git a/jaxp/src/org/xml/sax/SAXException.java b/jaxp/src/java.xml/share/classes/org/xml/sax/SAXException.java similarity index 100% rename from jaxp/src/org/xml/sax/SAXException.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/SAXException.java diff --git a/jaxp/src/org/xml/sax/SAXNotRecognizedException.java b/jaxp/src/java.xml/share/classes/org/xml/sax/SAXNotRecognizedException.java similarity index 100% rename from jaxp/src/org/xml/sax/SAXNotRecognizedException.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/SAXNotRecognizedException.java diff --git a/jaxp/src/org/xml/sax/SAXNotSupportedException.java b/jaxp/src/java.xml/share/classes/org/xml/sax/SAXNotSupportedException.java similarity index 100% rename from jaxp/src/org/xml/sax/SAXNotSupportedException.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/SAXNotSupportedException.java diff --git a/jaxp/src/org/xml/sax/SAXParseException.java b/jaxp/src/java.xml/share/classes/org/xml/sax/SAXParseException.java similarity index 100% rename from jaxp/src/org/xml/sax/SAXParseException.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/SAXParseException.java diff --git a/jaxp/src/org/xml/sax/XMLFilter.java b/jaxp/src/java.xml/share/classes/org/xml/sax/XMLFilter.java similarity index 100% rename from jaxp/src/org/xml/sax/XMLFilter.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/XMLFilter.java diff --git a/jaxp/src/org/xml/sax/XMLReader.java b/jaxp/src/java.xml/share/classes/org/xml/sax/XMLReader.java similarity index 100% rename from jaxp/src/org/xml/sax/XMLReader.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/XMLReader.java diff --git a/jaxp/src/org/xml/sax/ext/Attributes2.java b/jaxp/src/java.xml/share/classes/org/xml/sax/ext/Attributes2.java similarity index 100% rename from jaxp/src/org/xml/sax/ext/Attributes2.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/ext/Attributes2.java diff --git a/jaxp/src/org/xml/sax/ext/Attributes2Impl.java b/jaxp/src/java.xml/share/classes/org/xml/sax/ext/Attributes2Impl.java similarity index 100% rename from jaxp/src/org/xml/sax/ext/Attributes2Impl.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/ext/Attributes2Impl.java diff --git a/jaxp/src/org/xml/sax/ext/DeclHandler.java b/jaxp/src/java.xml/share/classes/org/xml/sax/ext/DeclHandler.java similarity index 100% rename from jaxp/src/org/xml/sax/ext/DeclHandler.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/ext/DeclHandler.java diff --git a/jaxp/src/org/xml/sax/ext/DefaultHandler2.java b/jaxp/src/java.xml/share/classes/org/xml/sax/ext/DefaultHandler2.java similarity index 100% rename from jaxp/src/org/xml/sax/ext/DefaultHandler2.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/ext/DefaultHandler2.java diff --git a/jaxp/src/org/xml/sax/ext/EntityResolver2.java b/jaxp/src/java.xml/share/classes/org/xml/sax/ext/EntityResolver2.java similarity index 100% rename from jaxp/src/org/xml/sax/ext/EntityResolver2.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/ext/EntityResolver2.java diff --git a/jaxp/src/org/xml/sax/ext/LexicalHandler.java b/jaxp/src/java.xml/share/classes/org/xml/sax/ext/LexicalHandler.java similarity index 100% rename from jaxp/src/org/xml/sax/ext/LexicalHandler.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/ext/LexicalHandler.java diff --git a/jaxp/src/org/xml/sax/ext/Locator2.java b/jaxp/src/java.xml/share/classes/org/xml/sax/ext/Locator2.java similarity index 100% rename from jaxp/src/org/xml/sax/ext/Locator2.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/ext/Locator2.java diff --git a/jaxp/src/org/xml/sax/ext/Locator2Impl.java b/jaxp/src/java.xml/share/classes/org/xml/sax/ext/Locator2Impl.java similarity index 100% rename from jaxp/src/org/xml/sax/ext/Locator2Impl.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/ext/Locator2Impl.java diff --git a/jaxp/src/org/xml/sax/ext/package.html b/jaxp/src/java.xml/share/classes/org/xml/sax/ext/package.html similarity index 100% rename from jaxp/src/org/xml/sax/ext/package.html rename to jaxp/src/java.xml/share/classes/org/xml/sax/ext/package.html diff --git a/jaxp/src/org/xml/sax/helpers/AttributeListImpl.java b/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/AttributeListImpl.java similarity index 100% rename from jaxp/src/org/xml/sax/helpers/AttributeListImpl.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/helpers/AttributeListImpl.java diff --git a/jaxp/src/org/xml/sax/helpers/AttributesImpl.java b/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/AttributesImpl.java similarity index 100% rename from jaxp/src/org/xml/sax/helpers/AttributesImpl.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/helpers/AttributesImpl.java diff --git a/jaxp/src/org/xml/sax/helpers/DefaultHandler.java b/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/DefaultHandler.java similarity index 100% rename from jaxp/src/org/xml/sax/helpers/DefaultHandler.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/helpers/DefaultHandler.java diff --git a/jaxp/src/org/xml/sax/helpers/LocatorImpl.java b/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/LocatorImpl.java similarity index 100% rename from jaxp/src/org/xml/sax/helpers/LocatorImpl.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/helpers/LocatorImpl.java diff --git a/jaxp/src/org/xml/sax/helpers/NamespaceSupport.java b/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/NamespaceSupport.java similarity index 100% rename from jaxp/src/org/xml/sax/helpers/NamespaceSupport.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/helpers/NamespaceSupport.java diff --git a/jaxp/src/org/xml/sax/helpers/NewInstance.java b/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/NewInstance.java similarity index 100% rename from jaxp/src/org/xml/sax/helpers/NewInstance.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/helpers/NewInstance.java diff --git a/jaxp/src/org/xml/sax/helpers/ParserAdapter.java b/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/ParserAdapter.java similarity index 100% rename from jaxp/src/org/xml/sax/helpers/ParserAdapter.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/helpers/ParserAdapter.java diff --git a/jaxp/src/org/xml/sax/helpers/ParserFactory.java b/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/ParserFactory.java similarity index 100% rename from jaxp/src/org/xml/sax/helpers/ParserFactory.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/helpers/ParserFactory.java diff --git a/jaxp/src/org/xml/sax/helpers/SecuritySupport.java b/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/SecuritySupport.java similarity index 100% rename from jaxp/src/org/xml/sax/helpers/SecuritySupport.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/helpers/SecuritySupport.java diff --git a/jaxp/src/org/xml/sax/helpers/XMLFilterImpl.java b/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/XMLFilterImpl.java similarity index 100% rename from jaxp/src/org/xml/sax/helpers/XMLFilterImpl.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/helpers/XMLFilterImpl.java diff --git a/jaxp/src/org/xml/sax/helpers/XMLReaderAdapter.java b/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/XMLReaderAdapter.java similarity index 100% rename from jaxp/src/org/xml/sax/helpers/XMLReaderAdapter.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/helpers/XMLReaderAdapter.java diff --git a/jaxp/src/org/xml/sax/helpers/XMLReaderFactory.java b/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/XMLReaderFactory.java similarity index 100% rename from jaxp/src/org/xml/sax/helpers/XMLReaderFactory.java rename to jaxp/src/java.xml/share/classes/org/xml/sax/helpers/XMLReaderFactory.java diff --git a/jaxp/src/org/xml/sax/helpers/package.html b/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/package.html similarity index 100% rename from jaxp/src/org/xml/sax/helpers/package.html rename to jaxp/src/java.xml/share/classes/org/xml/sax/helpers/package.html diff --git a/jaxp/src/org/xml/sax/package.html b/jaxp/src/java.xml/share/classes/org/xml/sax/package.html similarity index 100% rename from jaxp/src/org/xml/sax/package.html rename to jaxp/src/java.xml/share/classes/org/xml/sax/package.html diff --git a/jaxws/.hgtags b/jaxws/.hgtags index 26347e69cbf..121910c3483 100644 --- a/jaxws/.hgtags +++ b/jaxws/.hgtags @@ -271,3 +271,4 @@ e9780330017a6b464a385356d77e5136f9de8d09 jdk9-b15 ce19e0403ec8a80223cc47320c905b2a4d45881d jdk9-b23 0b35542d6bf32af23a9fc59a37c52aa091fee388 jdk9-b24 ab8726a0fcde897e4cfd1ea581ed90b0d8a7cbb7 jdk9-b25 +9b43f3993b96c2213428e95127a2d3fd0e709d3a jdk9-b26 diff --git a/jaxws/make/BuildJaxws.gmk b/jaxws/make/BuildJaxws.gmk deleted file mode 100644 index 5994543f39f..00000000000 --- a/jaxws/make/BuildJaxws.gmk +++ /dev/null @@ -1,89 +0,0 @@ -# -# Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# This must be the first rule -default: all - -include $(SPEC) -include MakeBase.gmk -include JavaCompilation.gmk - -DISABLE_JAXWS_WARNINGS := -Xlint:all,-varargs,-rawtypes,-deprecation,-unchecked,-serial,-dep-ann,-cast,-fallthrough,-static - -# The generate new bytecode uses the new compiler for to generate bytecode -# for the new jdk that is being built. The code compiled by this setup -# cannot necessarily be run with the boot jdk. -$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE, \ - JVM := $(JAVA), \ - JAVAC := $(NEW_JAVAC), \ - FLAGS := -XDignore.symbol.file=true $(DISABLE_JAXWS_WARNINGS), \ - SERVER_DIR := $(SJAVAC_SERVER_DIR), \ - SERVER_JVM := $(SJAVAC_SERVER_JAVA))) - -$(eval $(call SetupJavaCompilation,BUILD_JAF, \ - SETUP := GENERATE_NEWBYTECODE, \ - SRC := $(JAXWS_TOPDIR)/src/share/jaf_classes, \ - CLEAN := .properties, \ - BIN := $(JAXWS_OUTPUTDIR)/jaf_classes)) - -$(eval $(call SetupJavaCompilation,BUILD_JAXWS, \ - SETUP := GENERATE_NEWBYTECODE, \ - SRC := $(JAXWS_TOPDIR)/src/share/jaxws_classes, \ - BIN := $(JAXWS_OUTPUTDIR)/jaxws_classes, \ - COPY := .xsd, \ - COPY_FILES := $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java \ - $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java \ - $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws-tubes-default.xml, \ - CLEAN := .properties, \ - ADD_JAVAC_FLAGS = -Xbootclasspath/p:$(OUTPUT_ROOT)/jaxp/dist/lib/classes.jar)) - -$(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin: \ - $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin - mkdir -p $(@D) - cp $< $@ - -$(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.xjc.Plugin: \ - $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin - mkdir -p $(@D) - cp $< $@ - -# There are two META-INF services files that are needed, add these to the list of goals -BUILD_JAXWS += $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \ - $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.xjc.Plugin - -$(eval $(call SetupArchive,ARCHIVE_JAXWS, $(BUILD_JAXWS) $(BUILD_JAF) $(TARGET_PROP_FILES), \ - SRCS := $(JAXWS_OUTPUTDIR)/jaxws_classes $(JAXWS_OUTPUTDIR)/jaf_classes, \ - SUFFIXES := .class .properties .xsd .xml .java \ - com.sun.mirror.apt.AnnotationProcessorFactory \ - com.sun.tools.internal.xjc.Plugin, \ - JAR := $(JAXWS_OUTPUTDIR)/dist/lib/classes.jar)) - -$(eval $(call SetupZipArchive,ZIP_JAXWS_SOURCES, \ - SRC := $(JAXWS_TOPDIR)/src/share/jaf_classes $(JAXWS_TOPDIR)/src/share/jaxws_classes, \ - ZIP := $(JAXWS_OUTPUTDIR)/dist/lib/src.zip)) - -all: $(JAXWS_OUTPUTDIR)/dist/lib/classes.jar $(JAXWS_OUTPUTDIR)/dist/lib/src.zip - -.PHONY: default all diff --git a/jaxws/src/share/jaf_classes/META-INF/mailcap.default b/jaxws/src/java.activation/share/classes/META-INF/mailcap.default similarity index 100% rename from jaxws/src/share/jaf_classes/META-INF/mailcap.default rename to jaxws/src/java.activation/share/classes/META-INF/mailcap.default diff --git a/jaxws/src/share/jaf_classes/META-INF/mimetypes.default b/jaxws/src/java.activation/share/classes/META-INF/mimetypes.default similarity index 100% rename from jaxws/src/share/jaf_classes/META-INF/mimetypes.default rename to jaxws/src/java.activation/share/classes/META-INF/mimetypes.default diff --git a/jaxws/src/share/jaf_classes/com/sun/activation/registries/LogSupport.java b/jaxws/src/java.activation/share/classes/com/sun/activation/registries/LogSupport.java similarity index 100% rename from jaxws/src/share/jaf_classes/com/sun/activation/registries/LogSupport.java rename to jaxws/src/java.activation/share/classes/com/sun/activation/registries/LogSupport.java diff --git a/jaxws/src/share/jaf_classes/com/sun/activation/registries/MailcapFile.java b/jaxws/src/java.activation/share/classes/com/sun/activation/registries/MailcapFile.java similarity index 100% rename from jaxws/src/share/jaf_classes/com/sun/activation/registries/MailcapFile.java rename to jaxws/src/java.activation/share/classes/com/sun/activation/registries/MailcapFile.java diff --git a/jaxws/src/share/jaf_classes/com/sun/activation/registries/MailcapParseException.java b/jaxws/src/java.activation/share/classes/com/sun/activation/registries/MailcapParseException.java similarity index 100% rename from jaxws/src/share/jaf_classes/com/sun/activation/registries/MailcapParseException.java rename to jaxws/src/java.activation/share/classes/com/sun/activation/registries/MailcapParseException.java diff --git a/jaxws/src/share/jaf_classes/com/sun/activation/registries/MailcapTokenizer.java b/jaxws/src/java.activation/share/classes/com/sun/activation/registries/MailcapTokenizer.java similarity index 100% rename from jaxws/src/share/jaf_classes/com/sun/activation/registries/MailcapTokenizer.java rename to jaxws/src/java.activation/share/classes/com/sun/activation/registries/MailcapTokenizer.java diff --git a/jaxws/src/share/jaf_classes/com/sun/activation/registries/MimeTypeEntry.java b/jaxws/src/java.activation/share/classes/com/sun/activation/registries/MimeTypeEntry.java similarity index 100% rename from jaxws/src/share/jaf_classes/com/sun/activation/registries/MimeTypeEntry.java rename to jaxws/src/java.activation/share/classes/com/sun/activation/registries/MimeTypeEntry.java diff --git a/jaxws/src/share/jaf_classes/com/sun/activation/registries/MimeTypeFile.java b/jaxws/src/java.activation/share/classes/com/sun/activation/registries/MimeTypeFile.java similarity index 100% rename from jaxws/src/share/jaf_classes/com/sun/activation/registries/MimeTypeFile.java rename to jaxws/src/java.activation/share/classes/com/sun/activation/registries/MimeTypeFile.java diff --git a/jaxws/src/share/jaf_classes/javax/activation/ActivationDataFlavor.java b/jaxws/src/java.activation/share/classes/javax/activation/ActivationDataFlavor.java similarity index 100% rename from jaxws/src/share/jaf_classes/javax/activation/ActivationDataFlavor.java rename to jaxws/src/java.activation/share/classes/javax/activation/ActivationDataFlavor.java diff --git a/jaxws/src/share/jaf_classes/javax/activation/CommandInfo.java b/jaxws/src/java.activation/share/classes/javax/activation/CommandInfo.java similarity index 100% rename from jaxws/src/share/jaf_classes/javax/activation/CommandInfo.java rename to jaxws/src/java.activation/share/classes/javax/activation/CommandInfo.java diff --git a/jaxws/src/share/jaf_classes/javax/activation/CommandMap.java b/jaxws/src/java.activation/share/classes/javax/activation/CommandMap.java similarity index 100% rename from jaxws/src/share/jaf_classes/javax/activation/CommandMap.java rename to jaxws/src/java.activation/share/classes/javax/activation/CommandMap.java diff --git a/jaxws/src/share/jaf_classes/javax/activation/CommandObject.java b/jaxws/src/java.activation/share/classes/javax/activation/CommandObject.java similarity index 100% rename from jaxws/src/share/jaf_classes/javax/activation/CommandObject.java rename to jaxws/src/java.activation/share/classes/javax/activation/CommandObject.java diff --git a/jaxws/src/share/jaf_classes/javax/activation/DataContentHandler.java b/jaxws/src/java.activation/share/classes/javax/activation/DataContentHandler.java similarity index 100% rename from jaxws/src/share/jaf_classes/javax/activation/DataContentHandler.java rename to jaxws/src/java.activation/share/classes/javax/activation/DataContentHandler.java diff --git a/jaxws/src/share/jaf_classes/javax/activation/DataContentHandlerFactory.java b/jaxws/src/java.activation/share/classes/javax/activation/DataContentHandlerFactory.java similarity index 100% rename from jaxws/src/share/jaf_classes/javax/activation/DataContentHandlerFactory.java rename to jaxws/src/java.activation/share/classes/javax/activation/DataContentHandlerFactory.java diff --git a/jaxws/src/share/jaf_classes/javax/activation/DataHandler.java b/jaxws/src/java.activation/share/classes/javax/activation/DataHandler.java similarity index 100% rename from jaxws/src/share/jaf_classes/javax/activation/DataHandler.java rename to jaxws/src/java.activation/share/classes/javax/activation/DataHandler.java diff --git a/jaxws/src/share/jaf_classes/javax/activation/DataSource.java b/jaxws/src/java.activation/share/classes/javax/activation/DataSource.java similarity index 100% rename from jaxws/src/share/jaf_classes/javax/activation/DataSource.java rename to jaxws/src/java.activation/share/classes/javax/activation/DataSource.java diff --git a/jaxws/src/share/jaf_classes/javax/activation/FileDataSource.java b/jaxws/src/java.activation/share/classes/javax/activation/FileDataSource.java similarity index 100% rename from jaxws/src/share/jaf_classes/javax/activation/FileDataSource.java rename to jaxws/src/java.activation/share/classes/javax/activation/FileDataSource.java diff --git a/jaxws/src/share/jaf_classes/javax/activation/FileTypeMap.java b/jaxws/src/java.activation/share/classes/javax/activation/FileTypeMap.java similarity index 100% rename from jaxws/src/share/jaf_classes/javax/activation/FileTypeMap.java rename to jaxws/src/java.activation/share/classes/javax/activation/FileTypeMap.java diff --git a/jaxws/src/share/jaf_classes/javax/activation/MailcapCommandMap.java b/jaxws/src/java.activation/share/classes/javax/activation/MailcapCommandMap.java similarity index 100% rename from jaxws/src/share/jaf_classes/javax/activation/MailcapCommandMap.java rename to jaxws/src/java.activation/share/classes/javax/activation/MailcapCommandMap.java diff --git a/jaxws/src/share/jaf_classes/javax/activation/MimeType.java b/jaxws/src/java.activation/share/classes/javax/activation/MimeType.java similarity index 100% rename from jaxws/src/share/jaf_classes/javax/activation/MimeType.java rename to jaxws/src/java.activation/share/classes/javax/activation/MimeType.java diff --git a/jaxws/src/share/jaf_classes/javax/activation/MimeTypeParameterList.java b/jaxws/src/java.activation/share/classes/javax/activation/MimeTypeParameterList.java similarity index 100% rename from jaxws/src/share/jaf_classes/javax/activation/MimeTypeParameterList.java rename to jaxws/src/java.activation/share/classes/javax/activation/MimeTypeParameterList.java diff --git a/jaxws/src/share/jaf_classes/javax/activation/MimeTypeParseException.java b/jaxws/src/java.activation/share/classes/javax/activation/MimeTypeParseException.java similarity index 100% rename from jaxws/src/share/jaf_classes/javax/activation/MimeTypeParseException.java rename to jaxws/src/java.activation/share/classes/javax/activation/MimeTypeParseException.java diff --git a/jaxws/src/share/jaf_classes/javax/activation/MimetypesFileTypeMap.java b/jaxws/src/java.activation/share/classes/javax/activation/MimetypesFileTypeMap.java similarity index 100% rename from jaxws/src/share/jaf_classes/javax/activation/MimetypesFileTypeMap.java rename to jaxws/src/java.activation/share/classes/javax/activation/MimetypesFileTypeMap.java diff --git a/jaxws/src/share/jaf_classes/javax/activation/SecuritySupport.java b/jaxws/src/java.activation/share/classes/javax/activation/SecuritySupport.java similarity index 100% rename from jaxws/src/share/jaf_classes/javax/activation/SecuritySupport.java rename to jaxws/src/java.activation/share/classes/javax/activation/SecuritySupport.java diff --git a/jaxws/src/share/jaf_classes/javax/activation/URLDataSource.java b/jaxws/src/java.activation/share/classes/javax/activation/URLDataSource.java similarity index 100% rename from jaxws/src/share/jaf_classes/javax/activation/URLDataSource.java rename to jaxws/src/java.activation/share/classes/javax/activation/URLDataSource.java diff --git a/jaxws/src/share/jaf_classes/javax/activation/UnsupportedDataTypeException.java b/jaxws/src/java.activation/share/classes/javax/activation/UnsupportedDataTypeException.java similarity index 100% rename from jaxws/src/share/jaf_classes/javax/activation/UnsupportedDataTypeException.java rename to jaxws/src/java.activation/share/classes/javax/activation/UnsupportedDataTypeException.java diff --git a/jaxws/src/share/jaxws_classes/javax/annotation/Generated.java b/jaxws/src/java.annotations.common/share/classes/javax/annotation/Generated.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/annotation/Generated.java rename to jaxws/src/java.annotations.common/share/classes/javax/annotation/Generated.java diff --git a/jaxws/src/share/jaxws_classes/javax/annotation/PostConstruct.java b/jaxws/src/java.annotations.common/share/classes/javax/annotation/PostConstruct.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/annotation/PostConstruct.java rename to jaxws/src/java.annotations.common/share/classes/javax/annotation/PostConstruct.java diff --git a/jaxws/src/share/jaxws_classes/javax/annotation/PreDestroy.java b/jaxws/src/java.annotations.common/share/classes/javax/annotation/PreDestroy.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/annotation/PreDestroy.java rename to jaxws/src/java.annotations.common/share/classes/javax/annotation/PreDestroy.java diff --git a/jaxws/src/share/jaxws_classes/javax/annotation/Resource.java b/jaxws/src/java.annotations.common/share/classes/javax/annotation/Resource.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/annotation/Resource.java rename to jaxws/src/java.annotations.common/share/classes/javax/annotation/Resource.java diff --git a/jaxws/src/share/jaxws_classes/javax/annotation/Resources.java b/jaxws/src/java.annotations.common/share/classes/javax/annotation/Resources.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/annotation/Resources.java rename to jaxws/src/java.annotations.common/share/classes/javax/annotation/Resources.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/istack/internal/Builder.java b/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/Builder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/istack/internal/Builder.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/Builder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/istack/internal/ByteArrayDataSource.java b/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/ByteArrayDataSource.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/istack/internal/ByteArrayDataSource.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/ByteArrayDataSource.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/istack/internal/FinalArrayList.java b/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/FinalArrayList.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/istack/internal/FinalArrayList.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/FinalArrayList.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/istack/internal/FragmentContentHandler.java b/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/FragmentContentHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/istack/internal/FragmentContentHandler.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/FragmentContentHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/istack/internal/Interned.java b/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/Interned.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/istack/internal/Interned.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/Interned.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/istack/internal/NotNull.java b/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/NotNull.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/istack/internal/NotNull.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/NotNull.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/istack/internal/Nullable.java b/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/Nullable.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/istack/internal/Nullable.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/Nullable.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/istack/internal/Pool.java b/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/Pool.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/istack/internal/Pool.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/Pool.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/istack/internal/SAXException2.java b/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/SAXException2.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/istack/internal/SAXException2.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/SAXException2.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/istack/internal/SAXParseException2.java b/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/SAXParseException2.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/istack/internal/SAXParseException2.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/SAXParseException2.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/istack/internal/XMLStreamException2.java b/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/XMLStreamException2.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/istack/internal/XMLStreamException2.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/XMLStreamException2.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/istack/internal/XMLStreamReaderToContentHandler.java b/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/XMLStreamReaderToContentHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/istack/internal/XMLStreamReaderToContentHandler.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/XMLStreamReaderToContentHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/istack/internal/localization/Localizable.java b/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/localization/Localizable.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/istack/internal/localization/Localizable.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/localization/Localizable.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/istack/internal/localization/LocalizableMessage.java b/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/localization/LocalizableMessage.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/istack/internal/localization/LocalizableMessage.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/localization/LocalizableMessage.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/istack/internal/localization/LocalizableMessageFactory.java b/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/localization/LocalizableMessageFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/istack/internal/localization/LocalizableMessageFactory.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/localization/LocalizableMessageFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/istack/internal/localization/Localizer.java b/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/localization/Localizer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/istack/internal/localization/Localizer.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/localization/Localizer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/istack/internal/localization/NullLocalizable.java b/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/localization/NullLocalizable.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/istack/internal/localization/NullLocalizable.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/localization/NullLocalizable.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/istack/internal/logging/Logger.java b/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/logging/Logger.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/istack/internal/logging/Logger.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/logging/Logger.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/istack/internal/package-info.java b/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/istack/internal/package-info.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/AccessorFactory.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/AccessorFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/AccessorFactory.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/AccessorFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/AccessorFactoryImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/AccessorFactoryImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/AccessorFactoryImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/AccessorFactoryImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/AnyTypeAdapter.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/AnyTypeAdapter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/AnyTypeAdapter.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/AnyTypeAdapter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/CycleRecoverable.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/CycleRecoverable.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/CycleRecoverable.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/CycleRecoverable.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/IDResolver.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/IDResolver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/IDResolver.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/IDResolver.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/InternalAccessorFactory.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/InternalAccessorFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/InternalAccessorFactory.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/InternalAccessorFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Locatable.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Locatable.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Locatable.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Locatable.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Messages.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Messages.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Messages.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Messages.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Messages_de.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Messages_de.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Messages_es.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Messages_es.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Messages_fr.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Messages_fr.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Messages_it.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Messages_it.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Messages_ja.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Messages_ja.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Messages_ko.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Messages_ko.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Messages_pt_BR.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Messages_pt_BR.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Messages_zh_CN.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Messages_zh_CN.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Messages_zh_TW.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Messages_zh_TW.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Util.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Util.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Util.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Util.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/ValidationEventLocatorEx.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/ValidationEventLocatorEx.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/ValidationEventLocatorEx.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/ValidationEventLocatorEx.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/WhiteSpaceProcessor.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/WhiteSpaceProcessor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/WhiteSpaceProcessor.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/WhiteSpaceProcessor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/XmlAccessorFactory.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/XmlAccessorFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/XmlAccessorFactory.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/XmlAccessorFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/annotation/OverrideAnnotationOf.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/annotation/OverrideAnnotationOf.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/annotation/OverrideAnnotationOf.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/annotation/OverrideAnnotationOf.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/annotation/XmlIsSet.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/annotation/XmlIsSet.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/annotation/XmlIsSet.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/annotation/XmlIsSet.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/annotation/XmlLocation.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/annotation/XmlLocation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/annotation/XmlLocation.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/annotation/XmlLocation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/AccessorException.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/AccessorException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/AccessorException.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/AccessorException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Bridge.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Bridge.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Bridge.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Bridge.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/BridgeContext.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/BridgeContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/BridgeContext.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/BridgeContext.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/ClassResolver.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/ClassResolver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/ClassResolver.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/ClassResolver.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/CompositeStructure.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/CompositeStructure.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/CompositeStructure.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/CompositeStructure.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/ErrorListener.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/ErrorListener.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/ErrorListener.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/ErrorListener.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/JAXBRIContext.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/JAXBRIContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/JAXBRIContext.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/JAXBRIContext.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Messages.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Messages.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Messages.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Messages.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Messages_de.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Messages_de.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Messages_es.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Messages_es.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Messages_fr.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Messages_fr.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Messages_it.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Messages_it.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Messages_ja.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Messages_ja.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Messages_ko.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Messages_ko.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Messages_pt_BR.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Messages_pt_BR.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Messages_zh_CN.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Messages_zh_CN.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Messages_zh_TW.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Messages_zh_TW.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/RawAccessor.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/RawAccessor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/RawAccessor.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/RawAccessor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/TypeReference.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/TypeReference.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/TypeReference.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/TypeReference.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Utils.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Utils.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Utils.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Utils.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/impl/NameConverter.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/impl/NameConverter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/impl/NameConverter.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/impl/NameConverter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/impl/NameUtil.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/impl/NameUtil.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/impl/NameUtil.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/impl/NameUtil.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/package-info.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/package-info.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/CharacterEscapeHandler.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/CharacterEscapeHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/CharacterEscapeHandler.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/CharacterEscapeHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/DataWriter.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/DataWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/DataWriter.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/DataWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/DumbEscapeHandler.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/DumbEscapeHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/DumbEscapeHandler.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/DumbEscapeHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/Messages.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/Messages.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/Messages.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/Messages.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/Messages_de.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/Messages_de.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/Messages_es.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/Messages_es.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/Messages_fr.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/Messages_fr.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/Messages_it.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/Messages_it.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/Messages_ja.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/Messages_ja.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/Messages_ko.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/Messages_ko.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/Messages_pt_BR.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/Messages_pt_BR.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/Messages_zh_CN.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/Messages_zh_CN.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/Messages_zh_TW.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/Messages_zh_TW.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/MinimumEscapeHandler.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/MinimumEscapeHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/MinimumEscapeHandler.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/MinimumEscapeHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/NioEscapeHandler.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/NioEscapeHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/NioEscapeHandler.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/NioEscapeHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/SAX2DOMEx.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/SAX2DOMEx.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/SAX2DOMEx.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/SAX2DOMEx.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/XMLWriter.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/XMLWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/XMLWriter.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/XMLWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/DOMScanner.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/DOMScanner.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/DOMScanner.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/DOMScanner.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/InfosetScanner.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/InfosetScanner.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/InfosetScanner.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/InfosetScanner.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/Messages.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/Messages.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/Messages.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/Messages.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/Messages_de.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/Messages_de.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/Messages_es.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/Messages_es.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/Messages_fr.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/Messages_fr.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/Messages_it.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/Messages_it.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/Messages_ja.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/Messages_ja.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/Messages_ko.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/Messages_ko.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/Messages_pt_BR.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/Messages_pt_BR.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/Messages_zh_CN.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/Messages_zh_CN.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/Messages_zh_TW.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/Messages_zh_TW.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/Patcher.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Patcher.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/Patcher.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Patcher.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/util/AttributesImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/util/AttributesImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/util/AttributesImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/util/AttributesImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/util/SecureLoader.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/util/SecureLoader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/util/SecureLoader.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/util/SecureLoader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/util/ValidationEventLocatorExImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/util/ValidationEventLocatorExImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/util/ValidationEventLocatorExImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/util/ValidationEventLocatorExImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/util/Which.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/util/Which.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/util/Which.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/util/Which.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/ClassFactory.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/ClassFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/ClassFactory.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/ClassFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/ContextFactory.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/ContextFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/ContextFactory.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/ContextFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages_de.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages_de.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages_es.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages_es.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages_fr.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages_fr.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages_it.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages_it.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages_ja.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages_ja.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages_ko.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages_ko.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages_pt_BR.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages_pt_BR.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages_zh_CN.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages_zh_CN.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages_zh_TW.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages_zh_TW.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/TODO.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/TODO.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/TODO.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/TODO.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/WellKnownNamespace.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/WellKnownNamespace.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/WellKnownNamespace.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/WellKnownNamespace.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/bytecode/ClassTailor.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/bytecode/ClassTailor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/bytecode/ClassTailor.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/bytecode/ClassTailor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/bytecode/SecureLoader.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/bytecode/SecureLoader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/bytecode/SecureLoader.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/bytecode/SecureLoader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/bytecode/package.html b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/bytecode/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/bytecode/package.html rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/bytecode/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/AbstractInlineAnnotationReaderImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AbstractInlineAnnotationReaderImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/AbstractInlineAnnotationReaderImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AbstractInlineAnnotationReaderImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationReader.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationReader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationReader.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationReader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationSource.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationSource.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationSource.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationSource.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/ClassLocatable.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/ClassLocatable.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/ClassLocatable.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/ClassLocatable.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/FieldLocatable.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/FieldLocatable.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/FieldLocatable.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/FieldLocatable.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Init.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Init.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Init.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Init.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Locatable.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Locatable.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Locatable.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Locatable.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/LocatableAnnotation.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/LocatableAnnotation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/LocatableAnnotation.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/LocatableAnnotation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_de.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_de.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_es.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_es.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_fr.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_fr.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_it.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_it.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_ja.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_ja.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_ko.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_ko.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_pt_BR.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_pt_BR.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_zh_CN.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_zh_CN.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_zh_TW.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_zh_TW.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/MethodLocatable.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/MethodLocatable.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/MethodLocatable.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/MethodLocatable.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Quick.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Quick.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Quick.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Quick.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeAnnotationReader.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeAnnotationReader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeAnnotationReader.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeAnnotationReader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeInlineAnnotationReader.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeInlineAnnotationReader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeInlineAnnotationReader.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeInlineAnnotationReader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/SecureLoader.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/SecureLoader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/SecureLoader.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/SecureLoader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlAttributeQuick.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlAttributeQuick.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlAttributeQuick.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlAttributeQuick.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementDeclQuick.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementDeclQuick.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementDeclQuick.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementDeclQuick.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementQuick.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementQuick.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementQuick.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementQuick.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefQuick.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefQuick.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefQuick.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefQuick.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefsQuick.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefsQuick.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefsQuick.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefsQuick.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlEnumQuick.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlEnumQuick.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlEnumQuick.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlEnumQuick.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlRootElementQuick.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlRootElementQuick.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlRootElementQuick.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlRootElementQuick.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaQuick.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaQuick.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaQuick.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaQuick.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaTypeQuick.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaTypeQuick.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaTypeQuick.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaTypeQuick.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTransientQuick.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTransientQuick.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTransientQuick.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTransientQuick.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTypeQuick.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTypeQuick.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTypeQuick.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTypeQuick.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlValueQuick.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlValueQuick.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlValueQuick.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlValueQuick.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/package.html b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/package.html rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/Adapter.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/Adapter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/Adapter.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/Adapter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/ArrayInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ArrayInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/ArrayInfo.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ArrayInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/AttributePropertyInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/AttributePropertyInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/AttributePropertyInfo.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/AttributePropertyInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/BuiltinLeafInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/BuiltinLeafInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/BuiltinLeafInfo.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/BuiltinLeafInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/ClassInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ClassInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/ClassInfo.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ClassInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/Element.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/Element.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/Element.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/Element.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/ElementInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/ElementInfo.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/EnumConstant.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumConstant.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/EnumConstant.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumConstant.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/EnumLeafInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumLeafInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/EnumLeafInfo.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumLeafInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/ErrorHandler.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ErrorHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/ErrorHandler.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ErrorHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/ID.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ID.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/ID.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ID.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/LeafInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/LeafInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/LeafInfo.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/LeafInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/MapPropertyInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/MapPropertyInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/MapPropertyInfo.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/MapPropertyInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/MaybeElement.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/MaybeElement.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/MaybeElement.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/MaybeElement.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/NonElement.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElement.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/NonElement.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElement.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/NonElementRef.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElementRef.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/NonElementRef.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElementRef.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/PropertyInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/PropertyInfo.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/PropertyKind.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyKind.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/PropertyKind.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyKind.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/Ref.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/Ref.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/Ref.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/Ref.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/ReferencePropertyInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ReferencePropertyInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/ReferencePropertyInfo.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ReferencePropertyInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/RegistryInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/RegistryInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/RegistryInfo.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/RegistryInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/TypeInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/TypeInfo.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/TypeInfoSet.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfoSet.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/TypeInfoSet.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfoSet.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/TypeRef.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeRef.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/TypeRef.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeRef.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/ValuePropertyInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ValuePropertyInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/ValuePropertyInfo.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ValuePropertyInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/WildcardMode.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardMode.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/WildcardMode.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardMode.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/WildcardTypeInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardTypeInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/WildcardTypeInfo.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardTypeInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/package-info.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/package-info.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/AnyTypeImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/AnyTypeImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/AnyTypeImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/AnyTypeImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ArrayInfoImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ArrayInfoImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ArrayInfoImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ArrayInfoImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/AttributePropertyInfoImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/AttributePropertyInfoImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/AttributePropertyInfoImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/AttributePropertyInfoImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/BuiltinLeafInfoImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/BuiltinLeafInfoImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/BuiltinLeafInfoImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/BuiltinLeafInfoImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ClassInfoImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ClassInfoImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ClassInfoImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ClassInfoImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/DummyPropertyInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/DummyPropertyInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/DummyPropertyInfo.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/DummyPropertyInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ERPropertyInfoImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ERPropertyInfoImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ERPropertyInfoImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ERPropertyInfoImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ElementInfoImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementInfoImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ElementInfoImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementInfoImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ElementPropertyInfoImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementPropertyInfoImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ElementPropertyInfoImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementPropertyInfoImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/EnumConstantImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumConstantImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/EnumConstantImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumConstantImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/EnumLeafInfoImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumLeafInfoImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/EnumLeafInfoImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumLeafInfoImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/FieldPropertySeed.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/FieldPropertySeed.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/FieldPropertySeed.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/FieldPropertySeed.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/GetterSetterPropertySeed.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/GetterSetterPropertySeed.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/GetterSetterPropertySeed.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/GetterSetterPropertySeed.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/LeafInfoImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/LeafInfoImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/LeafInfoImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/LeafInfoImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/MapPropertyInfoImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/MapPropertyInfoImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/MapPropertyInfoImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/MapPropertyInfoImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages_de.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages_de.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages_es.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages_es.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages_fr.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages_fr.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages_it.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages_it.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages_ja.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages_ja.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages_ko.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages_ko.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages_pt_BR.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages_pt_BR.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages_zh_CN.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages_zh_CN.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages_zh_TW.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages_zh_TW.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilderI.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilderI.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilderI.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilderI.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/PropertyInfoImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertyInfoImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/PropertyInfoImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertyInfoImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/PropertySeed.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertySeed.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/PropertySeed.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertySeed.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ReferencePropertyInfoImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ReferencePropertyInfoImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ReferencePropertyInfoImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ReferencePropertyInfoImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RegistryInfoImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RegistryInfoImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RegistryInfoImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RegistryInfoImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeArrayInfoImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeArrayInfoImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeArrayInfoImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeArrayInfoImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAttributePropertyInfoImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAttributePropertyInfoImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAttributePropertyInfoImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAttributePropertyInfoImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeClassInfoImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeClassInfoImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeClassInfoImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeClassInfoImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementPropertyInfoImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementPropertyInfoImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementPropertyInfoImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementPropertyInfoImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumConstantImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumConstantImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumConstantImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumConstantImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumLeafInfoImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumLeafInfoImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumLeafInfoImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumLeafInfoImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeMapPropertyInfoImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeMapPropertyInfoImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeMapPropertyInfoImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeMapPropertyInfoImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeReferencePropertyInfoImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeReferencePropertyInfoImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeReferencePropertyInfoImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeReferencePropertyInfoImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeRefImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeRefImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeRefImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeRefImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeValuePropertyInfoImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeValuePropertyInfoImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeValuePropertyInfoImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeValuePropertyInfoImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/SecureLoader.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/SecureLoader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/SecureLoader.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/SecureLoader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/SingleTypePropertyInfoImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/SingleTypePropertyInfoImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/SingleTypePropertyInfoImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/SingleTypePropertyInfoImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoSetImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoSetImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoSetImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoSetImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/TypeRefImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeRefImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/TypeRefImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeRefImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Util.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Util.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Util.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Util.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Utils.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Utils.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Utils.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Utils.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ValuePropertyInfoImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ValuePropertyInfoImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ValuePropertyInfoImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ValuePropertyInfoImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/package.html b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/package.html rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/GenericArrayTypeImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/GenericArrayTypeImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/GenericArrayTypeImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/GenericArrayTypeImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/ParameterizedTypeImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/ParameterizedTypeImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/ParameterizedTypeImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/ParameterizedTypeImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/SecureLoader.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/SecureLoader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/SecureLoader.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/SecureLoader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/TypeVisitor.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/TypeVisitor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/TypeVisitor.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/TypeVisitor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/WildcardTypeImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/WildcardTypeImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/WildcardTypeImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/WildcardTypeImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/package.html b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/package.html rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeArrayInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeArrayInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeArrayInfo.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeArrayInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeAttributePropertyInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeAttributePropertyInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeAttributePropertyInfo.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeAttributePropertyInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeBuiltinLeafInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeBuiltinLeafInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeBuiltinLeafInfo.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeBuiltinLeafInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeClassInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeClassInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeClassInfo.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeClassInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElement.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElement.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElement.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElement.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementInfo.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementPropertyInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementPropertyInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementPropertyInfo.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementPropertyInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeEnumLeafInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeEnumLeafInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeEnumLeafInfo.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeEnumLeafInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeLeafInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeLeafInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeLeafInfo.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeLeafInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeMapPropertyInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeMapPropertyInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeMapPropertyInfo.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeMapPropertyInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElement.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElement.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElement.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElement.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElementRef.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElementRef.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElementRef.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElementRef.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimePropertyInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimePropertyInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimePropertyInfo.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimePropertyInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeReferencePropertyInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeReferencePropertyInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeReferencePropertyInfo.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeReferencePropertyInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfo.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeRef.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeRef.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeRef.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeRef.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeValuePropertyInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeValuePropertyInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeValuePropertyInfo.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeValuePropertyInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/package-info.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/package-info.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/util/ArrayInfoUtil.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/util/ArrayInfoUtil.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/util/ArrayInfoUtil.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/util/ArrayInfoUtil.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/package-info.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/package-info.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/AnyTypeBeanInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/AnyTypeBeanInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/AnyTypeBeanInfo.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/AnyTypeBeanInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ArrayBeanInfoImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/ArrayBeanInfoImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ArrayBeanInfoImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/ArrayBeanInfoImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/AssociationMap.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/AssociationMap.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/AssociationMap.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/AssociationMap.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/AttributeAccessor.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/AttributeAccessor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/AttributeAccessor.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/AttributeAccessor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/BinderImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/BinderImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/BinderImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/BinderImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/BridgeContextImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeContextImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/BridgeContextImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeContextImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ClassBeanInfoImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/ClassBeanInfoImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ClassBeanInfoImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/ClassBeanInfoImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/CompositeStructureBeanInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/CompositeStructureBeanInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/CompositeStructureBeanInfo.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/CompositeStructureBeanInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ContentHandlerAdaptor.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/ContentHandlerAdaptor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ContentHandlerAdaptor.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/ContentHandlerAdaptor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Coordinator.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Coordinator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Coordinator.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Coordinator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/DomPostInitAction.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/DomPostInitAction.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/DomPostInitAction.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/DomPostInitAction.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/FilterTransducer.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/FilterTransducer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/FilterTransducer.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/FilterTransducer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationException.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationException.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationsException.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationsException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationsException.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationsException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/InlineBinaryTransducer.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/InlineBinaryTransducer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/InlineBinaryTransducer.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/InlineBinaryTransducer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/InternalBridge.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/InternalBridge.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/InternalBridge.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/InternalBridge.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/JaxBeanInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/JaxBeanInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/JaxBeanInfo.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/JaxBeanInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/LeafBeanInfoImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/LeafBeanInfoImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/LeafBeanInfoImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/LeafBeanInfoImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/LifecycleMethods.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/LifecycleMethods.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/LifecycleMethods.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/LifecycleMethods.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Location.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Location.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Location.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Location.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Messages.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Messages.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Messages.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Messages.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Messages_de.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Messages_de.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Messages_es.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Messages_es.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Messages_fr.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Messages_fr.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Messages_it.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Messages_it.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Messages_ja.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Messages_ja.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Messages_ko.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Messages_ko.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Messages_pt_BR.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Messages_pt_BR.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Messages_zh_CN.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Messages_zh_CN.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Messages_zh_TW.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Messages_zh_TW.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/MimeTypedTransducer.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/MimeTypedTransducer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/MimeTypedTransducer.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/MimeTypedTransducer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Name.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Name.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Name.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Name.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/NameBuilder.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/NameBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/NameBuilder.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/NameBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/NameList.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/NameList.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/NameList.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/NameList.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/NamespaceContext2.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/NamespaceContext2.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/NamespaceContext2.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/NamespaceContext2.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/RuntimeUtil.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/RuntimeUtil.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/RuntimeUtil.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/RuntimeUtil.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/SchemaTypeTransducer.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/SchemaTypeTransducer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/SchemaTypeTransducer.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/SchemaTypeTransducer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/StAXPostInitAction.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/StAXPostInitAction.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/StAXPostInitAction.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/StAXPostInitAction.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapter.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapter.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapterMarker.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapterMarker.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapterMarker.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapterMarker.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Transducer.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Transducer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Transducer.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Transducer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Utils.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Utils.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Utils.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Utils.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ValueListBeanInfoImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/ValueListBeanInfoImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ValueListBeanInfoImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/ValueListBeanInfoImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/C14nXmlOutput.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/C14nXmlOutput.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/C14nXmlOutput.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/C14nXmlOutput.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/DOMOutput.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/DOMOutput.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/DOMOutput.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/DOMOutput.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/Encoded.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Encoded.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/Encoded.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Encoded.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/ForkXmlOutput.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/ForkXmlOutput.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/ForkXmlOutput.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/ForkXmlOutput.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/IndentingUTF8XmlOutput.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/IndentingUTF8XmlOutput.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/IndentingUTF8XmlOutput.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/IndentingUTF8XmlOutput.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/MTOMXmlOutput.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/MTOMXmlOutput.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/MTOMXmlOutput.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/MTOMXmlOutput.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/NamespaceContextImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/NamespaceContextImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/NamespaceContextImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/NamespaceContextImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/Pcdata.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Pcdata.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/Pcdata.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Pcdata.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/SAXOutput.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/SAXOutput.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/SAXOutput.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/SAXOutput.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/SecureLoader.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/SecureLoader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/SecureLoader.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/SecureLoader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/StAXExStreamWriterOutput.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/StAXExStreamWriterOutput.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/StAXExStreamWriterOutput.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/StAXExStreamWriterOutput.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/XMLEventWriterOutput.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLEventWriterOutput.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/XMLEventWriterOutput.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLEventWriterOutput.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutput.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutput.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutput.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutput.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutputAbstractImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutputAbstractImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutputAbstractImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutputAbstractImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/package-info.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/package-info.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/package.html b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/package.html rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayERProperty.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayERProperty.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayERProperty.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayERProperty.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementLeafProperty.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementLeafProperty.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementLeafProperty.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementLeafProperty.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementNodeProperty.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementNodeProperty.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementNodeProperty.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementNodeProperty.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementProperty.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementProperty.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementProperty.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementProperty.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayProperty.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayProperty.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayProperty.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayProperty.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayReferenceNodeProperty.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayReferenceNodeProperty.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayReferenceNodeProperty.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayReferenceNodeProperty.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/AttributeProperty.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/AttributeProperty.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/AttributeProperty.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/AttributeProperty.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ListElementProperty.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ListElementProperty.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ListElementProperty.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ListElementProperty.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_de.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_de.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_es.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_es.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_fr.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_fr.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_it.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_it.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_ja.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_ja.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_ko.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_ko.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_pt_BR.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_pt_BR.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_zh_CN.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_zh_CN.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_zh_TW.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_zh_TW.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Property.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Property.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Property.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Property.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyFactory.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyFactory.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementLeafProperty.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementLeafProperty.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementLeafProperty.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementLeafProperty.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementNodeProperty.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementNodeProperty.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementNodeProperty.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementNodeProperty.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/SingleReferenceNodeProperty.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleReferenceNodeProperty.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/SingleReferenceNodeProperty.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleReferenceNodeProperty.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/StructureLoaderBuilder.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/StructureLoaderBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/StructureLoaderBuilder.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/StructureLoaderBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/TagAndType.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/TagAndType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/TagAndType.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/TagAndType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/UnmarshallerChain.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/UnmarshallerChain.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/UnmarshallerChain.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/UnmarshallerChain.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Utils.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Utils.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Utils.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Utils.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ValueProperty.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ValueProperty.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ValueProperty.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ValueProperty.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedAccessor.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedAccessor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedAccessor.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedAccessor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedLister.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedLister.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedLister.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedLister.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/DefaultTransducedAccessor.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/DefaultTransducedAccessor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/DefaultTransducedAccessor.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/DefaultTransducedAccessor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListIterator.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListIterator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListIterator.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListIterator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListTransducedAccessorImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListTransducedAccessorImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListTransducedAccessorImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListTransducedAccessorImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Lister.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Lister.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Lister.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Lister.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_de.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_de.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_es.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_es.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_fr.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_fr.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_it.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_it.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_ja.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_ja.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_ko.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_ko.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_pt_BR.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_pt_BR.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_zh_CN.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_zh_CN.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_zh_TW.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_zh_TW.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/NullSafeAccessor.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/NullSafeAccessor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/NullSafeAccessor.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/NullSafeAccessor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerByte.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerByte.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerByte.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerByte.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Utils.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Utils.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Utils.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Utils.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/AccessorInjector.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/AccessorInjector.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/AccessorInjector.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/AccessorInjector.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Bean.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Bean.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Bean.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Bean.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Const.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Const.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Const.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Const.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Byte.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Byte.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Byte.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Byte.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Ref.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Ref.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Ref.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Ref.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Injector.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Injector.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Injector.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Injector.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Byte.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Byte.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Byte.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Byte.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Ref.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Ref.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Ref.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Ref.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedAccessorFactory.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedAccessorFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedAccessorFactory.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedAccessorFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Ref.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Ref.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Ref.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Ref.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/SecureLoader.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/SecureLoader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/SecureLoader.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/SecureLoader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Boolean.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Boolean.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Boolean.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Boolean.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Byte.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Byte.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Byte.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Byte.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Integer.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Integer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Integer.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Integer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Byte.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Byte.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Byte.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Byte.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Integer.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Integer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Integer.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Integer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/package.html b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/package.html rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/package.html b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/package.html rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesEx.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesEx.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesEx.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesEx.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesExImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesExImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesExImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesExImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Base64Data.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Base64Data.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Base64Data.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Base64Data.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ChildLoader.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ChildLoader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ChildLoader.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ChildLoader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultIDResolver.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultIDResolver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultIDResolver.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultIDResolver.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Discarder.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Discarder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Discarder.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Discarder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DomLoader.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DomLoader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DomLoader.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DomLoader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/FastInfosetConnector.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/FastInfosetConnector.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/FastInfosetConnector.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/FastInfosetConnector.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntArrayData.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntArrayData.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntArrayData.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntArrayData.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntData.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntData.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntData.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntData.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Intercepter.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Intercepter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Intercepter.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Intercepter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/InterningXmlVisitor.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/InterningXmlVisitor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/InterningXmlVisitor.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/InterningXmlVisitor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyLoader.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyLoader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyLoader.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyLoader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyXsiLoader.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyXsiLoader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyXsiLoader.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyXsiLoader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorEx.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorEx.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorEx.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorEx.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorExWrapper.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorExWrapper.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorExWrapper.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorExWrapper.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/MTOMDecorator.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/MTOMDecorator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/MTOMDecorator.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/MTOMDecorator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_de.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_de.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_es.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_es.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_fr.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_fr.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_it.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_it.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_ja.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_ja.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_ko.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_ko.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_pt_BR.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_pt_BR.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_zh_CN.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_zh_CN.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_zh_TW.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_zh_TW.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Patcher.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Patcher.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Patcher.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Patcher.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ProxyLoader.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ProxyLoader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ProxyLoader.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ProxyLoader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Receiver.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Receiver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Receiver.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Receiver.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Scope.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Scope.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Scope.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Scope.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SecureLoader.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SecureLoader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SecureLoader.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SecureLoader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXConnector.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXConnector.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXConnector.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXConnector.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXExConnector.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXExConnector.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXExConnector.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXExConnector.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TagName.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TagName.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TagName.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TagName.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TextLoader.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TextLoader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TextLoader.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TextLoader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallerImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallerImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallerImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallerImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValidatingUnmarshaller.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValidatingUnmarshaller.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValidatingUnmarshaller.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValidatingUnmarshaller.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValuePropertyLoader.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValuePropertyLoader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValuePropertyLoader.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValuePropertyLoader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/WildcardLoader.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/WildcardLoader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/WildcardLoader.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/WildcardLoader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XmlVisitor.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XmlVisitor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XmlVisitor.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XmlVisitor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiNilLoader.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiNilLoader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiNilLoader.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiNilLoader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/FoolProofResolver.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/FoolProofResolver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/FoolProofResolver.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/FoolProofResolver.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Form.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Form.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Form.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Form.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/GroupKind.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/GroupKind.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/GroupKind.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/GroupKind.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Messages.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Messages.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Messages.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Messages.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Messages_de.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Messages_de.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Messages_es.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Messages_es.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Messages_fr.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Messages_fr.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Messages_it.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Messages_it.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Messages_ja.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Messages_ja.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Messages_ko.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Messages_ko.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Messages_pt_BR.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Messages_pt_BR.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Messages_zh_CN.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Messages_zh_CN.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Messages_zh_TW.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Messages_zh_TW.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/MultiMap.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/MultiMap.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/MultiMap.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/MultiMap.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Tree.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Tree.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Tree.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Tree.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Util.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Util.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Util.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Util.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/episode/Bindings.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Bindings.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/episode/Bindings.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Bindings.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/episode/Klass.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Klass.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/episode/Klass.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Klass.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/episode/Package.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Package.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/episode/Package.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Package.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/episode/SchemaBindings.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/SchemaBindings.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/episode/SchemaBindings.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/SchemaBindings.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/episode/package-info.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/episode/package-info.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/package-info.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/package-info.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotated.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotated.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotated.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotated.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotation.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotation.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Any.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Any.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Any.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Any.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Appinfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Appinfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Appinfo.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Appinfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttrDecls.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttrDecls.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttrDecls.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttrDecls.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttributeType.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttributeType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttributeType.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttributeType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexContent.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexContent.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexContent.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexContent.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexExtension.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexExtension.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexExtension.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexExtension.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexRestriction.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexRestriction.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexRestriction.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexRestriction.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexType.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexType.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeHost.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeHost.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeHost.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeHost.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeModel.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeModel.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeModel.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeModel.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ContentModelContainer.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ContentModelContainer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ContentModelContainer.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ContentModelContainer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Documentation.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Documentation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Documentation.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Documentation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExplicitGroup.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExplicitGroup.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExplicitGroup.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExplicitGroup.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExtensionType.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExtensionType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExtensionType.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExtensionType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/FixedOrDefault.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/FixedOrDefault.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/FixedOrDefault.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/FixedOrDefault.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Import.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Import.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Import.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Import.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/List.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/List.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/List.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/List.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalAttribute.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalAttribute.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalAttribute.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalAttribute.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalElement.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalElement.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalElement.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalElement.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NestedParticle.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NestedParticle.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NestedParticle.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NestedParticle.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NoFixedFacet.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NoFixedFacet.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NoFixedFacet.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NoFixedFacet.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Particle.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Particle.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Particle.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Particle.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Redefinable.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Redefinable.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Redefinable.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Redefinable.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SchemaTop.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SchemaTop.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SchemaTop.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SchemaTop.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleContent.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleContent.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleContent.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleContent.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleDerivation.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleDerivation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleDerivation.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleDerivation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleExtension.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleExtension.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleExtension.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleExtension.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestriction.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestriction.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestriction.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestriction.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestrictionModel.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestrictionModel.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestrictionModel.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestrictionModel.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleTypeHost.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleTypeHost.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleTypeHost.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleTypeHost.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelAttribute.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelAttribute.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelAttribute.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelAttribute.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelElement.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelElement.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelElement.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelElement.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeDefParticle.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeDefParticle.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeDefParticle.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeDefParticle.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeHost.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeHost.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeHost.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeHost.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Union.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Union.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Union.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Union.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package-info.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package-info.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package.html b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package.html rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/ByteArrayOutputStreamEx.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/ByteArrayOutputStreamEx.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/ByteArrayOutputStreamEx.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/ByteArrayOutputStreamEx.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/CollisionCheckStack.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/CollisionCheckStack.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/CollisionCheckStack.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/CollisionCheckStack.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/DataSourceSource.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/DataSourceSource.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/DataSourceSource.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/DataSourceSource.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/EditDistance.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/EditDistance.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/EditDistance.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/EditDistance.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/FatalAdapter.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/FatalAdapter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/FatalAdapter.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/FatalAdapter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/FlattenIterator.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/FlattenIterator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/FlattenIterator.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/FlattenIterator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/QNameMap.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/QNameMap.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/QNameMap.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/QNameMap.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/StackRecorder.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/StackRecorder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/StackRecorder.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/StackRecorder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/TypeCast.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/TypeCast.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/TypeCast.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/TypeCast.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/XmlFactory.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/XmlFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/XmlFactory.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/XmlFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/AbstractResourceBundle.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/AbstractResourceBundle.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/AbstractResourceBundle.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/AbstractResourceBundle.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/CommonResourceBundle.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/CommonResourceBundle.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/CommonResourceBundle.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/CommonResourceBundle.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/Decoder.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/Decoder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/Decoder.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/Decoder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/DecoderStateTables.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/DecoderStateTables.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/DecoderStateTables.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/DecoderStateTables.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/Encoder.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/Encoder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/Encoder.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/Encoder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/EncodingConstants.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/EncodingConstants.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/EncodingConstants.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/EncodingConstants.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/Notation.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/Notation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/Notation.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/Notation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/OctetBufferListener.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/OctetBufferListener.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/OctetBufferListener.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/OctetBufferListener.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/QualifiedName.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/QualifiedName.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/QualifiedName.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/QualifiedName.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/UnparsedEntity.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/UnparsedEntity.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/UnparsedEntity.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/UnparsedEntity.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/BASE64EncodingAlgorithm.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BASE64EncodingAlgorithm.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/BASE64EncodingAlgorithm.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BASE64EncodingAlgorithm.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/BooleanEncodingAlgorithm.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BooleanEncodingAlgorithm.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/BooleanEncodingAlgorithm.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BooleanEncodingAlgorithm.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithm.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithm.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithm.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithm.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmFactory.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmFactory.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmState.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmState.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmState.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmState.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/DoubleEncodingAlgorithm.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/DoubleEncodingAlgorithm.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/DoubleEncodingAlgorithm.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/DoubleEncodingAlgorithm.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/FloatEncodingAlgorithm.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/FloatEncodingAlgorithm.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/FloatEncodingAlgorithm.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/FloatEncodingAlgorithm.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/HexadecimalEncodingAlgorithm.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/HexadecimalEncodingAlgorithm.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/HexadecimalEncodingAlgorithm.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/HexadecimalEncodingAlgorithm.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/IEEE754FloatingPointEncodingAlgorithm.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IEEE754FloatingPointEncodingAlgorithm.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/IEEE754FloatingPointEncodingAlgorithm.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IEEE754FloatingPointEncodingAlgorithm.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/IntEncodingAlgorithm.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IntEncodingAlgorithm.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/IntEncodingAlgorithm.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IntEncodingAlgorithm.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/IntegerEncodingAlgorithm.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IntegerEncodingAlgorithm.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/IntegerEncodingAlgorithm.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IntegerEncodingAlgorithm.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/LongEncodingAlgorithm.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/LongEncodingAlgorithm.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/LongEncodingAlgorithm.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/LongEncodingAlgorithm.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/ShortEncodingAlgorithm.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/ShortEncodingAlgorithm.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/ShortEncodingAlgorithm.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/ShortEncodingAlgorithm.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/UUIDEncodingAlgorithm.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/UUIDEncodingAlgorithm.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/UUIDEncodingAlgorithm.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/UUIDEncodingAlgorithm.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/alphabet/BuiltInRestrictedAlphabets.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/alphabet/BuiltInRestrictedAlphabets.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/alphabet/BuiltInRestrictedAlphabets.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/alphabet/BuiltInRestrictedAlphabets.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentParser.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentParser.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentParser.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentParser.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentSerializer.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentSerializer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentSerializer.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentSerializer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/org/apache/xerces/util/XMLChar.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/org/apache/xerces/util/XMLChar.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/org/apache/xerces/util/XMLChar.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/org/apache/xerces/util/XMLChar.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/resources/ResourceBundle.properties b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/resources/ResourceBundle.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/resources/ResourceBundle.properties rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/resources/ResourceBundle.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/sax/AttributesHolder.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/AttributesHolder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/sax/AttributesHolder.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/AttributesHolder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/sax/Features.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/Features.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/sax/Features.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/Features.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/sax/Properties.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/Properties.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/sax/Properties.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/Properties.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentParser.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentParser.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentParser.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentParser.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializer.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializer.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializerWithPrefixMapping.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializerWithPrefixMapping.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializerWithPrefixMapping.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializerWithPrefixMapping.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/sax/SystemIdResolver.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/SystemIdResolver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/sax/SystemIdResolver.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/SystemIdResolver.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/EventLocation.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/EventLocation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/EventLocation.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/EventLocation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentParser.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentParser.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentParser.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentParser.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentSerializer.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentSerializer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentSerializer.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentSerializer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/StAXManager.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXManager.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/StAXManager.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXManager.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/CharactersEvent.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/CharactersEvent.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/CharactersEvent.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/CharactersEvent.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/CommentEvent.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/CommentEvent.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/CommentEvent.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/CommentEvent.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/DTDEvent.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/DTDEvent.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/DTDEvent.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/DTDEvent.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/EmptyIterator.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EmptyIterator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/EmptyIterator.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EmptyIterator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/EndDocumentEvent.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EndDocumentEvent.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/EndDocumentEvent.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EndDocumentEvent.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/EndElementEvent.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EndElementEvent.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/EndElementEvent.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EndElementEvent.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/EntityDeclarationImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EntityDeclarationImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/EntityDeclarationImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EntityDeclarationImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/EntityReferenceEvent.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EntityReferenceEvent.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/EntityReferenceEvent.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EntityReferenceEvent.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/EventBase.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EventBase.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/EventBase.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EventBase.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/NamespaceBase.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/NamespaceBase.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/NamespaceBase.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/NamespaceBase.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/ProcessingInstructionEvent.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/ProcessingInstructionEvent.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/ProcessingInstructionEvent.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/ProcessingInstructionEvent.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/ReadIterator.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/ReadIterator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/ReadIterator.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/ReadIterator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocatorBase.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocatorBase.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocatorBase.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocatorBase.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventReader.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventReader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventReader.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventReader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventWriter.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventWriter.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/StAXFilteredEvent.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXFilteredEvent.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/StAXFilteredEvent.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXFilteredEvent.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/StartDocumentEvent.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StartDocumentEvent.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/StartDocumentEvent.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StartDocumentEvent.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/StartElementEvent.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StartElementEvent.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/StartElementEvent.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StartElementEvent.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/Util.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/Util.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/Util.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/Util.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/XMLConstants.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/XMLConstants.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/XMLConstants.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/XMLConstants.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXEventFactory.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXEventFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXEventFactory.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXEventFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXInputFactory.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXInputFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXInputFactory.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXInputFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXOutputFactory.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXOutputFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXOutputFactory.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXOutputFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/util/StAXFilteredParser.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/util/StAXFilteredParser.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/util/StAXFilteredParser.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/util/StAXFilteredParser.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/util/StAXParserWrapper.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/util/StAXParserWrapper.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/util/StAXParserWrapper.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/util/StAXParserWrapper.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/FI_DOM_Or_XML_DOM_SAX_SAXEvent.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_DOM_Or_XML_DOM_SAX_SAXEvent.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/FI_DOM_Or_XML_DOM_SAX_SAXEvent.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_DOM_Or_XML_DOM_SAX_SAXEvent.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_DOM_SAX_SAXEvent.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_DOM_SAX_SAXEvent.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_DOM_SAX_SAXEvent.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_DOM_SAX_SAXEvent.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_SAXEvent.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_SAXEvent.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_SAXEvent.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_SAXEvent.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_XML.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_XML.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_XML.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_XML.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/FI_StAX_SAX_Or_XML_SAX_SAXEvent.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_StAX_SAX_Or_XML_SAX_SAXEvent.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/FI_StAX_SAX_Or_XML_SAX_SAXEvent.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_StAX_SAX_Or_XML_SAX_SAXEvent.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/PrintTable.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/PrintTable.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/PrintTable.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/PrintTable.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/SAX2StAXWriter.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/SAX2StAXWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/SAX2StAXWriter.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/SAX2StAXWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/SAXEventSerializer.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/SAXEventSerializer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/SAXEventSerializer.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/SAXEventSerializer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/StAX2SAXReader.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/StAX2SAXReader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/StAX2SAXReader.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/StAX2SAXReader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/TransformInputOutput.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/TransformInputOutput.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/TransformInputOutput.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/TransformInputOutput.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/VocabularyGenerator.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/VocabularyGenerator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/VocabularyGenerator.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/VocabularyGenerator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_FI.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_FI.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_FI.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_FI.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_SAX_FI.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_SAX_FI.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_SAX_FI.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_SAX_FI.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_FI.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_FI.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_FI.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_FI.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_StAX_FI.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_StAX_FI.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_StAX_FI.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_StAX_FI.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/CharArray.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/CharArray.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/CharArray.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/CharArray.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/CharArrayArray.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayArray.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/CharArrayArray.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayArray.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/CharArrayIntMap.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayIntMap.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/CharArrayIntMap.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayIntMap.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/CharArrayString.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayString.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/CharArrayString.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayString.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/ContiguousCharArrayArray.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/ContiguousCharArrayArray.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/ContiguousCharArrayArray.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/ContiguousCharArrayArray.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/DuplicateAttributeVerifier.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/DuplicateAttributeVerifier.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/DuplicateAttributeVerifier.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/DuplicateAttributeVerifier.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/FixedEntryStringIntMap.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/FixedEntryStringIntMap.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/FixedEntryStringIntMap.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/FixedEntryStringIntMap.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/KeyIntMap.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/KeyIntMap.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/KeyIntMap.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/KeyIntMap.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/LocalNameQualifiedNamesMap.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/LocalNameQualifiedNamesMap.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/LocalNameQualifiedNamesMap.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/LocalNameQualifiedNamesMap.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/NamespaceContextImplementation.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/NamespaceContextImplementation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/NamespaceContextImplementation.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/NamespaceContextImplementation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/PrefixArray.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/PrefixArray.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/PrefixArray.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/PrefixArray.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/QualifiedNameArray.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/QualifiedNameArray.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/QualifiedNameArray.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/QualifiedNameArray.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/StringArray.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/StringArray.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/StringArray.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/StringArray.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/StringIntMap.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/StringIntMap.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/StringIntMap.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/StringIntMap.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/ValueArray.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/ValueArray.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/ValueArray.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/ValueArray.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/ValueArrayResourceException.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/ValueArrayResourceException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/ValueArrayResourceException.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/ValueArrayResourceException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/vocab/ParserVocabulary.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/vocab/ParserVocabulary.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/vocab/ParserVocabulary.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/vocab/ParserVocabulary.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/vocab/SerializerVocabulary.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/vocab/SerializerVocabulary.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/vocab/SerializerVocabulary.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/vocab/SerializerVocabulary.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/vocab/Vocabulary.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/vocab/Vocabulary.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/vocab/Vocabulary.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/vocab/Vocabulary.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithm.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithm.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithm.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithm.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmException.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmException.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmIndexes.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmIndexes.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmIndexes.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmIndexes.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/ExternalVocabulary.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/ExternalVocabulary.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/ExternalVocabulary.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/ExternalVocabulary.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetException.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetException.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetParser.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetParser.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetParser.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetParser.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetResult.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetResult.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetResult.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetResult.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSerializer.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSerializer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSerializer.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSerializer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSource.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSource.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSource.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSource.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/RestrictedAlphabet.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/RestrictedAlphabet.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/RestrictedAlphabet.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/RestrictedAlphabet.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/Vocabulary.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/Vocabulary.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/Vocabulary.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/Vocabulary.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/VocabularyApplicationData.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/VocabularyApplicationData.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/VocabularyApplicationData.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/VocabularyApplicationData.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmAttributes.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmAttributes.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmAttributes.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmAttributes.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmContentHandler.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmContentHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmContentHandler.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmContentHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/ExtendedContentHandler.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/ExtendedContentHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/ExtendedContentHandler.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/ExtendedContentHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetReader.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetReader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetReader.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetReader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetWriter.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetWriter.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/PrimitiveTypeContentHandler.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/PrimitiveTypeContentHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/PrimitiveTypeContentHandler.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/PrimitiveTypeContentHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/RestrictedAlphabetContentHandler.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/RestrictedAlphabetContentHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/RestrictedAlphabetContentHandler.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/RestrictedAlphabetContentHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/EncodingAlgorithmAttributesImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/EncodingAlgorithmAttributesImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/EncodingAlgorithmAttributesImpl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/EncodingAlgorithmAttributesImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/FastInfosetDefaultHandler.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/FastInfosetDefaultHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/FastInfosetDefaultHandler.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/FastInfosetDefaultHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/FastInfosetStreamReader.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/FastInfosetStreamReader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/FastInfosetStreamReader.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/FastInfosetStreamReader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/LowLevelFastInfosetStreamWriter.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/LowLevelFastInfosetStreamWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/LowLevelFastInfosetStreamWriter.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/LowLevelFastInfosetStreamWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/ASCIIUtility.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/ASCIIUtility.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/ASCIIUtility.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/ASCIIUtility.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/BASE64DecoderStream.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/BASE64DecoderStream.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/BASE64DecoderStream.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/BASE64DecoderStream.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/Chunk.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Chunk.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/Chunk.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Chunk.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/ChunkInputStream.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/ChunkInputStream.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/ChunkInputStream.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/ChunkInputStream.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/CleanUpExecutorFactory.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/CleanUpExecutorFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/CleanUpExecutorFactory.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/CleanUpExecutorFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/Data.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Data.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/Data.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Data.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/DataFile.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/DataFile.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/DataFile.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/DataFile.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/DataHead.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/DataHead.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/DataHead.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/DataHead.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/DecodingException.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/DecodingException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/DecodingException.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/DecodingException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/FactoryFinder.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FactoryFinder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/FactoryFinder.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FactoryFinder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/FileData.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FileData.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/FileData.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FileData.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/FinalArrayList.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FinalArrayList.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/FinalArrayList.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FinalArrayList.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/Header.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Header.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/Header.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Header.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/InternetHeaders.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/InternetHeaders.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/InternetHeaders.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/InternetHeaders.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/LineInputStream.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/LineInputStream.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/LineInputStream.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/LineInputStream.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEConfig.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEConfig.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEConfig.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEConfig.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEEvent.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEEvent.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEEvent.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEEvent.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEMessage.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEMessage.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEMessage.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEMessage.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParser.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParser.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParser.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParser.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParsingException.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParsingException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParsingException.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParsingException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEPart.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEPart.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEPart.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEPart.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MimeUtility.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MimeUtility.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MimeUtility.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MimeUtility.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/PropUtil.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/PropUtil.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/PropUtil.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/PropUtil.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/QPDecoderStream.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/QPDecoderStream.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/QPDecoderStream.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/QPDecoderStream.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/TempFiles.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/TempFiles.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/TempFiles.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/TempFiles.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/UUDecoderStream.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/UUDecoderStream.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/UUDecoderStream.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/UUDecoderStream.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/WeakDataFile.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/WeakDataFile.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/WeakDataFile.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/WeakDataFile.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/Base64Data.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64Data.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/Base64Data.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64Data.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/Base64Encoder.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64Encoder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/Base64Encoder.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64Encoder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/Base64EncoderStream.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64EncoderStream.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/Base64EncoderStream.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64EncoderStream.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/BinaryText.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/BinaryText.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/BinaryText.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/BinaryText.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/ByteArrayOutputStreamEx.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/ByteArrayOutputStreamEx.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/ByteArrayOutputStreamEx.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/ByteArrayOutputStreamEx.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/MtomEnabled.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/MtomEnabled.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/MtomEnabled.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/MtomEnabled.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/NamespaceContextEx.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/NamespaceContextEx.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/NamespaceContextEx.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/NamespaceContextEx.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/StAxSOAPBody.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/StAxSOAPBody.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/StAxSOAPBody.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/StAxSOAPBody.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/StreamingDataHandler.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/StreamingDataHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/StreamingDataHandler.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/StreamingDataHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamReaderEx.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamReaderEx.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamReaderEx.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamReaderEx.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamWriterEx.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamWriterEx.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamWriterEx.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamWriterEx.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/util/DOMStreamReader.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/util/DOMStreamReader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/util/DOMStreamReader.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/util/DOMStreamReader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/util/DummyLocation.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/util/DummyLocation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/util/DummyLocation.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/util/DummyLocation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/util/FinalArrayList.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/util/FinalArrayList.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/util/FinalArrayList.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/util/FinalArrayList.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/util/MtomStreamWriter.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/util/MtomStreamWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/util/MtomStreamWriter.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/util/MtomStreamWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/util/XMLStreamReaderToXMLStreamWriter.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/util/XMLStreamReaderToXMLStreamWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/util/XMLStreamReaderToXMLStreamWriter.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/util/XMLStreamReaderToXMLStreamWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/Attribute.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Attribute.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/Attribute.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Attribute.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/Cdata.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Cdata.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/Cdata.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Cdata.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/Comment.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Comment.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/Comment.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Comment.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/ContainerElement.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/ContainerElement.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/ContainerElement.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/ContainerElement.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/Content.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Content.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/Content.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Content.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/ContentVisitor.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/ContentVisitor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/ContentVisitor.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/ContentVisitor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/DatatypeWriter.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/DatatypeWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/DatatypeWriter.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/DatatypeWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/Document.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Document.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/Document.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Document.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/EndDocument.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/EndDocument.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/EndDocument.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/EndDocument.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/EndTag.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/EndTag.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/EndTag.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/EndTag.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/IllegalAnnotationException.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/IllegalAnnotationException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/IllegalAnnotationException.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/IllegalAnnotationException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/IllegalSignatureException.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/IllegalSignatureException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/IllegalSignatureException.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/IllegalSignatureException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/NamespaceDecl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/NamespaceDecl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/NamespaceDecl.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/NamespaceDecl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/NamespaceResolver.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/NamespaceResolver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/NamespaceResolver.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/NamespaceResolver.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/NamespaceSupport.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/NamespaceSupport.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/NamespaceSupport.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/NamespaceSupport.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/Pcdata.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Pcdata.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/Pcdata.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Pcdata.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/StartDocument.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/StartDocument.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/StartDocument.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/StartDocument.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/StartTag.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/StartTag.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/StartTag.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/StartTag.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/TXW.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/TXW.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/TXW.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/TXW.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/Text.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Text.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/Text.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Text.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/TxwException.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/TxwException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/TxwException.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/TxwException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/TypedXmlWriter.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/TypedXmlWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/TypedXmlWriter.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/TypedXmlWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/annotation/XmlAttribute.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlAttribute.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/annotation/XmlAttribute.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlAttribute.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/annotation/XmlCDATA.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlCDATA.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/annotation/XmlCDATA.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlCDATA.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/annotation/XmlElement.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlElement.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/annotation/XmlElement.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlElement.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/annotation/XmlNamespace.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlNamespace.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/annotation/XmlNamespace.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlNamespace.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/annotation/XmlValue.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlValue.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/annotation/XmlValue.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlValue.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/annotation/package.html b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/annotation/package.html rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/CharacterEscapeHandler.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/CharacterEscapeHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/CharacterEscapeHandler.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/CharacterEscapeHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/DataWriter.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DataWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/DataWriter.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DataWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/DelegatingXMLStreamWriter.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DelegatingXMLStreamWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/DelegatingXMLStreamWriter.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DelegatingXMLStreamWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/DomSerializer.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DomSerializer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/DomSerializer.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DomSerializer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/DumbEscapeHandler.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DumbEscapeHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/DumbEscapeHandler.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DumbEscapeHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/DumpSerializer.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DumpSerializer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/DumpSerializer.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DumpSerializer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/IndentingXMLFilter.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/IndentingXMLFilter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/IndentingXMLFilter.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/IndentingXMLFilter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/IndentingXMLStreamWriter.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/IndentingXMLStreamWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/IndentingXMLStreamWriter.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/IndentingXMLStreamWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/ResultFactory.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/ResultFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/ResultFactory.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/ResultFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/SaxSerializer.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/SaxSerializer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/SaxSerializer.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/SaxSerializer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/StaxSerializer.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/StaxSerializer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/StaxSerializer.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/StaxSerializer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/StreamSerializer.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/StreamSerializer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/StreamSerializer.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/StreamSerializer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/TXWResult.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/TXWResult.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/TXWResult.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/TXWResult.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/TXWSerializer.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/TXWSerializer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/TXWSerializer.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/TXWSerializer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/XMLWriter.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/XMLWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/XMLWriter.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/XMLWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/XmlSerializer.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/XmlSerializer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/XmlSerializer.java rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/XmlSerializer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/package.html b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/package.html rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/package.html b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/package.html rename to jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/package.html diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/Binder.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Binder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/Binder.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Binder.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/ContextFinder.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ContextFinder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/ContextFinder.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ContextFinder.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/DataBindingException.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/DataBindingException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/DataBindingException.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/DataBindingException.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/DatatypeConverter.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/DatatypeConverter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/DatatypeConverter.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/DatatypeConverter.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/DatatypeConverterImpl.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/DatatypeConverterImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/DatatypeConverterImpl.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/DatatypeConverterImpl.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/DatatypeConverterInterface.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/DatatypeConverterInterface.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/DatatypeConverterInterface.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/DatatypeConverterInterface.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/Element.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Element.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/Element.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Element.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/GetPropertyAction.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/GetPropertyAction.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/GetPropertyAction.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/GetPropertyAction.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXB.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXB.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/JAXB.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXB.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBContext.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBContext.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBContext.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBElement.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBElement.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBElement.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBElement.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBException.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBException.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBException.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBIntrospector.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBIntrospector.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBIntrospector.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBIntrospector.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBPermission.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBPermission.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBPermission.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBPermission.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/MarshalException.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/MarshalException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/MarshalException.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/MarshalException.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/Marshaller.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Marshaller.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/Marshaller.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Marshaller.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/Messages.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Messages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/Messages.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Messages.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/Messages.properties b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Messages.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/Messages.properties rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Messages.properties diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/NotIdentifiableEvent.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/NotIdentifiableEvent.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/NotIdentifiableEvent.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/NotIdentifiableEvent.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/ParseConversionEvent.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ParseConversionEvent.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/ParseConversionEvent.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ParseConversionEvent.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/PrintConversionEvent.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/PrintConversionEvent.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/PrintConversionEvent.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/PrintConversionEvent.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/PropertyException.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/PropertyException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/PropertyException.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/PropertyException.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/SchemaOutputResolver.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/SchemaOutputResolver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/SchemaOutputResolver.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/SchemaOutputResolver.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/TypeConstraintException.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/TypeConstraintException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/TypeConstraintException.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/TypeConstraintException.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/UnmarshalException.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/UnmarshalException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/UnmarshalException.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/UnmarshalException.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/Unmarshaller.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Unmarshaller.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/Unmarshaller.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Unmarshaller.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/UnmarshallerHandler.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/UnmarshallerHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/UnmarshallerHandler.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/UnmarshallerHandler.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationEvent.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEvent.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationEvent.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEvent.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationEventHandler.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEventHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationEventHandler.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEventHandler.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationEventLocator.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEventLocator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationEventLocator.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEventLocator.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationException.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationException.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationException.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/Validator.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Validator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/Validator.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Validator.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/WhiteSpaceProcessor.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/WhiteSpaceProcessor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/WhiteSpaceProcessor.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/WhiteSpaceProcessor.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/DomHandler.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/DomHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/DomHandler.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/DomHandler.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/W3CDomHandler.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/W3CDomHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/W3CDomHandler.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/W3CDomHandler.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessOrder.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessOrder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessOrder.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessOrder.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessType.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessType.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessType.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessorOrder.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessorOrder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessorOrder.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessorOrder.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessorType.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessorType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessorType.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessorType.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAnyAttribute.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAnyAttribute.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAnyAttribute.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAnyAttribute.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAnyElement.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAnyElement.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAnyElement.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAnyElement.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAttachmentRef.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAttachmentRef.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAttachmentRef.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAttachmentRef.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAttribute.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAttribute.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAttribute.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAttribute.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElement.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElement.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElement.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElement.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementDecl.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementDecl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementDecl.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementDecl.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementRef.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementRef.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementRef.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementRef.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementRefs.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementRefs.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementRefs.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementRefs.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementWrapper.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementWrapper.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementWrapper.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementWrapper.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElements.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElements.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElements.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElements.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlEnum.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlEnum.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlEnum.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlEnum.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlEnumValue.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlEnumValue.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlEnumValue.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlEnumValue.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlID.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlID.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlID.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlID.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlIDREF.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlIDREF.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlIDREF.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlIDREF.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlInlineBinaryData.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlInlineBinaryData.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlInlineBinaryData.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlInlineBinaryData.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlList.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlList.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlList.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlList.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlMimeType.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlMimeType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlMimeType.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlMimeType.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlMixed.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlMixed.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlMixed.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlMixed.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlNs.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlNs.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlNs.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlNs.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlNsForm.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlNsForm.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlNsForm.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlNsForm.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlRegistry.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlRegistry.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlRegistry.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlRegistry.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlRootElement.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlRootElement.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlRootElement.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlRootElement.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchema.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSchema.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchema.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSchema.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchemaType.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSchemaType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchemaType.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSchemaType.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchemaTypes.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSchemaTypes.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchemaTypes.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSchemaTypes.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSeeAlso.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSeeAlso.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSeeAlso.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSeeAlso.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlTransient.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlTransient.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlTransient.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlTransient.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlType.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlType.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlType.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlValue.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlValue.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlValue.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlValue.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlAdapter.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlAdapter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlAdapter.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlAdapter.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/package.html b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/package.html rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/package.html diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/package.html b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/package.html rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/package.html diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/attachment/AttachmentMarshaller.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/attachment/AttachmentMarshaller.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/attachment/AttachmentMarshaller.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/attachment/AttachmentMarshaller.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/attachment/AttachmentUnmarshaller.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/attachment/AttachmentUnmarshaller.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/attachment/AttachmentUnmarshaller.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/attachment/AttachmentUnmarshaller.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/attachment/package.html b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/attachment/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/attachment/package.html rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/attachment/package.html diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/DefaultValidationEventHandler.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/DefaultValidationEventHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/DefaultValidationEventHandler.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/DefaultValidationEventHandler.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/Messages.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/Messages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/Messages.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/Messages.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/Messages.properties b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/Messages.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/Messages.properties rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/Messages.properties diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/NotIdentifiableEventImpl.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/NotIdentifiableEventImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/NotIdentifiableEventImpl.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/NotIdentifiableEventImpl.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/ParseConversionEventImpl.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/ParseConversionEventImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/ParseConversionEventImpl.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/ParseConversionEventImpl.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/PrintConversionEventImpl.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/PrintConversionEventImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/PrintConversionEventImpl.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/PrintConversionEventImpl.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/ValidationEventImpl.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/ValidationEventImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/ValidationEventImpl.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/ValidationEventImpl.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/ValidationEventLocatorImpl.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/ValidationEventLocatorImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/ValidationEventLocatorImpl.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/ValidationEventLocatorImpl.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/package.html b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/package.html rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/package.html diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/package.html b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/package.html rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/package.html diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/util/JAXBResult.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/util/JAXBResult.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/util/JAXBResult.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/util/JAXBResult.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/util/JAXBSource.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/util/JAXBSource.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/util/JAXBSource.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/util/JAXBSource.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/util/Messages.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/util/Messages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/util/Messages.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/util/Messages.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/util/Messages.properties b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/util/Messages.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/util/Messages.properties rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/util/Messages.properties diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/util/ValidationEventCollector.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/util/ValidationEventCollector.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/util/ValidationEventCollector.java rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/util/ValidationEventCollector.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/util/package.html b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/util/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/bind/util/package.html rename to jaxws/src/java.xml.bind/share/classes/javax/xml/bind/util/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/LazyEnvelopeSource.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/LazyEnvelopeSource.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/LazyEnvelopeSource.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/LazyEnvelopeSource.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_de.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_de.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_es.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_es.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_fr.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_fr.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_it.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_it.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_ja.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_ja.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_ko.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_ko.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_pt_BR.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_pt_BR.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_zh_CN.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_zh_CN.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_zh_TW.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_zh_TW.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/Header.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/Header.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/Header.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/Header.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MultipartDataSource.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MultipartDataSource.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MultipartDataSource.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MultipartDataSource.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentDisposition.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentDisposition.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentDisposition.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentDisposition.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentType.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentType.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/HeaderTokenizer.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/HeaderTokenizer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/HeaderTokenizer.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/HeaderTokenizer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeBodyPart.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeBodyPart.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeBodyPart.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeBodyPart.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePartDataSource.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePartDataSource.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePartDataSource.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePartDataSource.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePullMultipart.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePullMultipart.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePullMultipart.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePullMultipart.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeUtility.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeUtility.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeUtility.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeUtility.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParseException.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParseException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParseException.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParseException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/SharedInputStream.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/SharedInputStream.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/SharedInputStream.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/SharedInputStream.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/UniqueValue.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/UniqueValue.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/UniqueValue.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/UniqueValue.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/ASCIIUtility.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/ASCIIUtility.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/ASCIIUtility.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/ASCIIUtility.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64DecoderStream.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64DecoderStream.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64DecoderStream.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64DecoderStream.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64EncoderStream.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64EncoderStream.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64EncoderStream.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64EncoderStream.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BEncoderStream.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BEncoderStream.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BEncoderStream.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BEncoderStream.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/LineInputStream.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/LineInputStream.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/LineInputStream.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/LineInputStream.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/OutputUtil.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/OutputUtil.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/OutputUtil.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/OutputUtil.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QDecoderStream.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QDecoderStream.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QDecoderStream.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QDecoderStream.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QEncoderStream.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QEncoderStream.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QEncoderStream.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QEncoderStream.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPDecoderStream.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPDecoderStream.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPDecoderStream.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPDecoderStream.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPEncoderStream.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPEncoderStream.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPEncoderStream.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPEncoderStream.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUDecoderStream.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUDecoderStream.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUDecoderStream.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUDecoderStream.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUEncoderStream.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUEncoderStream.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUEncoderStream.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUEncoderStream.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/ContextClassloaderLocal.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/ContextClassloaderLocal.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/Envelope.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/Envelope.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/Envelope.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/Envelope.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/FastInfosetDataContentHandler.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/FastInfosetDataContentHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/FastInfosetDataContentHandler.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/FastInfosetDataContentHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/GifDataContentHandler.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/GifDataContentHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/GifDataContentHandler.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/GifDataContentHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/JpegDataContentHandler.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/JpegDataContentHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/JpegDataContentHandler.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/JpegDataContentHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/LazyEnvelope.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LazyEnvelope.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/LazyEnvelope.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LazyEnvelope.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_de.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_de.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_es.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_es.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_fr.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_fr.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_it.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_it.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_ja.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_ja.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_ko.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_ko.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_pt_BR.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_pt_BR.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_zh_CN.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_zh_CN.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_zh_TW.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_zh_TW.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/MultipartDataContentHandler.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/MultipartDataContentHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/MultipartDataContentHandler.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/MultipartDataContentHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocument.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocument.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocument.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocument.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/SOAPVersionMismatchException.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPVersionMismatchException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/SOAPVersionMismatchException.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPVersionMismatchException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/StaxBridge.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxBridge.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/StaxBridge.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxBridge.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/StaxLazySourceBridge.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxLazySourceBridge.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/StaxLazySourceBridge.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxLazySourceBridge.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/StaxReaderBridge.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxReaderBridge.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/StaxReaderBridge.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxReaderBridge.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/StringDataContentHandler.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/StringDataContentHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/StringDataContentHandler.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/StringDataContentHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/XmlDataContentHandler.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/XmlDataContentHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/XmlDataContentHandler.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/XmlDataContentHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultImpl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultImpl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_de.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_de.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_es.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_es.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_fr.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_fr.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_it.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_it.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_ja.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_ja.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_ko.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_ko.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_pt_BR.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_pt_BR.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_zh_CN.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_zh_CN.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_zh_TW.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_zh_TW.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPCommentImpl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPCommentImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPCommentImpl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPCommentImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPTextImpl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPTextImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPTextImpl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPTextImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/TreeException.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TreeException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/TreeException.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TreeException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_de.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_de.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_es.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_es.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_fr.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_fr.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_it.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_it.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_ja.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_ja.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_ko.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_ko.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_pt_BR.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_pt_BR.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_zh_CN.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_zh_CN.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_zh_TW.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_zh_TW.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_de.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_de.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_es.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_es.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_fr.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_fr.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_it.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_it.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_ja.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_ja.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_ko.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_ko.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_pt_BR.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_pt_BR.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_zh_CN.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_zh_CN.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_zh_TW.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_zh_TW.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_de.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_de.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_es.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_es.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_fr.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_fr.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_it.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_it.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_ja.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_ja.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_ko.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_ko.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_pt_BR.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_pt_BR.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_zh_CN.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_zh_CN.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_zh_TW.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_zh_TW.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/Base64.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/Base64.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/Base64.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/Base64.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/ByteOutputStream.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteOutputStream.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/ByteOutputStream.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteOutputStream.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/CharReader.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/CharReader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/CharReader.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/CharReader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/CharWriter.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/CharWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/CharWriter.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/CharWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/FastInfosetReflection.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/FastInfosetReflection.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/FastInfosetReflection.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/FastInfosetReflection.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/FinalArrayList.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/FinalArrayList.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/FinalArrayList.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/FinalArrayList.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/JaxmURI.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/JaxmURI.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/JaxmURI.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/JaxmURI.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_de.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_de.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_es.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_es.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_fr.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_fr.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_it.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_it.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_ja.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_ja.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_ko.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_ko.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_pt_BR.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_pt_BR.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_zh_CN.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_zh_CN.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_zh_TW.properties b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_zh_TW.properties rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/LogDomainConstants.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LogDomainConstants.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/LogDomainConstants.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LogDomainConstants.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/MimeHeadersUtil.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/MimeHeadersUtil.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/MimeHeadersUtil.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/MimeHeadersUtil.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/ParseUtil.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/ParseUtil.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/ParseUtil.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/ParseUtil.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/ParserPool.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/ParserPool.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/ParserPool.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/ParserPool.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/SAAJUtil.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/SAAJUtil.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/SAAJUtil.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/SAAJUtil.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/XMLDeclarationParser.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/XMLDeclarationParser.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/XMLDeclarationParser.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/XMLDeclarationParser.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/stax/LazyEnvelopeStaxReader.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/LazyEnvelopeStaxReader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/stax/LazyEnvelopeStaxReader.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/LazyEnvelopeStaxReader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxReaderEx.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxReaderEx.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxReaderEx.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxReaderEx.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriter.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriter.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriterEx.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriterEx.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriterEx.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriterEx.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java b/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java rename to jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/AttachmentPart.java b/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/AttachmentPart.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/soap/AttachmentPart.java rename to jaxws/src/java.xml.soap/share/classes/javax/xml/soap/AttachmentPart.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/Detail.java b/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/Detail.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/soap/Detail.java rename to jaxws/src/java.xml.soap/share/classes/javax/xml/soap/Detail.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/DetailEntry.java b/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/DetailEntry.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/soap/DetailEntry.java rename to jaxws/src/java.xml.soap/share/classes/javax/xml/soap/DetailEntry.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/FactoryFinder.java b/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/FactoryFinder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/soap/FactoryFinder.java rename to jaxws/src/java.xml.soap/share/classes/javax/xml/soap/FactoryFinder.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/MessageFactory.java b/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/MessageFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/soap/MessageFactory.java rename to jaxws/src/java.xml.soap/share/classes/javax/xml/soap/MessageFactory.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/MimeHeader.java b/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/MimeHeader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/soap/MimeHeader.java rename to jaxws/src/java.xml.soap/share/classes/javax/xml/soap/MimeHeader.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/MimeHeaders.java b/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/MimeHeaders.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/soap/MimeHeaders.java rename to jaxws/src/java.xml.soap/share/classes/javax/xml/soap/MimeHeaders.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/Name.java b/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/Name.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/soap/Name.java rename to jaxws/src/java.xml.soap/share/classes/javax/xml/soap/Name.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/Node.java b/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/Node.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/soap/Node.java rename to jaxws/src/java.xml.soap/share/classes/javax/xml/soap/Node.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SAAJMetaFactory.java b/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SAAJMetaFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/soap/SAAJMetaFactory.java rename to jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SAAJMetaFactory.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SAAJResult.java b/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SAAJResult.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/soap/SAAJResult.java rename to jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SAAJResult.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPBody.java b/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPBody.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPBody.java rename to jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPBody.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPBodyElement.java b/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPBodyElement.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPBodyElement.java rename to jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPBodyElement.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPConnection.java b/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPConnection.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPConnection.java rename to jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPConnection.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPConnectionFactory.java b/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPConnectionFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPConnectionFactory.java rename to jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPConnectionFactory.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPConstants.java b/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPConstants.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPConstants.java rename to jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPConstants.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPElement.java b/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPElement.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPElement.java rename to jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPElement.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPElementFactory.java b/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPElementFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPElementFactory.java rename to jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPElementFactory.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPEnvelope.java b/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPEnvelope.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPEnvelope.java rename to jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPEnvelope.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPException.java b/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPException.java rename to jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPException.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFactory.java b/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFactory.java rename to jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPFactory.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFault.java b/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPFault.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFault.java rename to jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPFault.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFaultElement.java b/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPFaultElement.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFaultElement.java rename to jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPFaultElement.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPHeader.java b/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPHeader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPHeader.java rename to jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPHeader.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPHeaderElement.java b/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPHeaderElement.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPHeaderElement.java rename to jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPHeaderElement.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPMessage.java b/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPMessage.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPMessage.java rename to jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPMessage.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPPart.java b/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPPart.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPPart.java rename to jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPPart.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/Text.java b/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/Text.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/soap/Text.java rename to jaxws/src/java.xml.soap/share/classes/javax/xml/soap/Text.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/package.html b/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/soap/package.html rename to jaxws/src/java.xml.soap/share/classes/javax/xml/soap/package.html diff --git a/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/EnvelopeStyle.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/EnvelopeStyle.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/EnvelopeStyle.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/EnvelopeStyle.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/EnvelopeStyleFeature.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/EnvelopeStyleFeature.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/EnvelopeStyleFeature.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/EnvelopeStyleFeature.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/databinding/Databinding.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/Databinding.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/databinding/Databinding.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/Databinding.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/databinding/DatabindingFactory.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/DatabindingFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/databinding/DatabindingFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/DatabindingFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/databinding/DatabindingMode.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/DatabindingMode.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/databinding/DatabindingMode.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/DatabindingMode.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/databinding/DatabindingModeFeature.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/DatabindingModeFeature.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/databinding/DatabindingModeFeature.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/DatabindingModeFeature.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/databinding/ExternalMetadataFeature.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/ExternalMetadataFeature.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/databinding/ExternalMetadataFeature.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/ExternalMetadataFeature.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/databinding/JavaCallInfo.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/JavaCallInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/databinding/JavaCallInfo.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/JavaCallInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/databinding/WSDLGenerator.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/WSDLGenerator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/databinding/WSDLGenerator.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/WSDLGenerator.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/databinding/WSDLResolver.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/WSDLResolver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/databinding/WSDLResolver.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/WSDLResolver.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/message/BaseDistributedPropertySet.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/BaseDistributedPropertySet.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/message/BaseDistributedPropertySet.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/BaseDistributedPropertySet.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/message/BasePropertySet.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/BasePropertySet.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/message/BasePropertySet.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/BasePropertySet.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/message/ContentType.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/ContentType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/message/ContentType.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/ContentType.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/message/DistributedPropertySet.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/DistributedPropertySet.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/message/DistributedPropertySet.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/DistributedPropertySet.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/message/MessageContext.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/MessageContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/message/MessageContext.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/MessageContext.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/message/MessageContextFactory.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/MessageContextFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/message/MessageContextFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/MessageContextFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/message/PropertySet.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/PropertySet.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/message/PropertySet.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/PropertySet.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/message/ReadOnlyPropertyException.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/ReadOnlyPropertyException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/message/ReadOnlyPropertyException.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/ReadOnlyPropertyException.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/impl/encoding/StreamDecoderImpl.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/impl/encoding/StreamDecoderImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/impl/encoding/StreamDecoderImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/impl/encoding/StreamDecoderImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/impl/internalspi/encoding/StreamDecoder.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/impl/internalspi/encoding/StreamDecoder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/impl/internalspi/encoding/StreamDecoder.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/impl/internalspi/encoding/StreamDecoder.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/ExistingAnnotationsType.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/ExistingAnnotationsType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/ExistingAnnotationsType.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/ExistingAnnotationsType.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/JavaMethod.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/JavaMethod.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/JavaMethod.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/JavaMethod.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/JavaParam.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/JavaParam.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/JavaParam.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/JavaParam.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/JavaWsdlMappingType.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/JavaWsdlMappingType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/JavaWsdlMappingType.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/JavaWsdlMappingType.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/ObjectFactory.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/ObjectFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/ObjectFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/ObjectFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/SoapBindingParameterStyle.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/SoapBindingParameterStyle.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/SoapBindingParameterStyle.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/SoapBindingParameterStyle.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/SoapBindingStyle.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/SoapBindingStyle.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/SoapBindingStyle.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/SoapBindingStyle.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/SoapBindingUse.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/SoapBindingUse.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/SoapBindingUse.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/SoapBindingUse.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/Util.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/Util.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/Util.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/Util.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/WebParamMode.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/WebParamMode.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/WebParamMode.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/WebParamMode.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlAction.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlAction.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlAction.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlAction.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlAddressing.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlAddressing.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlAddressing.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlAddressing.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlBindingType.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlBindingType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlBindingType.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlBindingType.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlFaultAction.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlFaultAction.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlFaultAction.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlFaultAction.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlHandlerChain.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlHandlerChain.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlHandlerChain.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlHandlerChain.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlMTOM.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlMTOM.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlMTOM.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlMTOM.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlOneway.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlOneway.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlOneway.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlOneway.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlRequestWrapper.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlRequestWrapper.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlRequestWrapper.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlRequestWrapper.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlResponseWrapper.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlResponseWrapper.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlResponseWrapper.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlResponseWrapper.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlSOAPBinding.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlSOAPBinding.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlSOAPBinding.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlSOAPBinding.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlServiceMode.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlServiceMode.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlServiceMode.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlServiceMode.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebEndpoint.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebEndpoint.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebEndpoint.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebEndpoint.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebFault.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebFault.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebFault.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebFault.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebMethod.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebMethod.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebMethod.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebMethod.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebParam.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebParam.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebParam.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebParam.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebResult.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebResult.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebResult.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebResult.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebService.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebService.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebService.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebService.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebServiceClient.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebServiceClient.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebServiceClient.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebServiceClient.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebServiceProvider.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebServiceProvider.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebServiceProvider.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebServiceProvider.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebServiceRef.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebServiceRef.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebServiceRef.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebServiceRef.java diff --git a/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/package-info.java b/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/package-info.java rename to jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/amx/AMX.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/amx/AMX.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/amx/AMX.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/amx/AMX.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/amx/AMXGlassfish.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/amx/AMXGlassfish.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/amx/AMXGlassfish.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/amx/AMXGlassfish.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/amx/AMXUtil.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/amx/AMXUtil.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/amx/AMXUtil.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/amx/AMXUtil.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/amx/BootAMXMBean.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/amx/BootAMXMBean.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/amx/BootAMXMBean.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/amx/BootAMXMBean.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/amx/MBeanListener.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/amx/MBeanListener.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/amx/MBeanListener.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/amx/MBeanListener.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/arc/Stability.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/arc/Stability.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/arc/Stability.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/arc/Stability.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/arc/Taxonomy.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/arc/Taxonomy.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/arc/Taxonomy.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/arc/Taxonomy.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/PluginPoint.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/PluginPoint.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/PluginPoint.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/PluginPoint.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/StatsProvider.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/StatsProvider.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/StatsProvider.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/StatsProvider.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/StatsProviderInfo.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/StatsProviderInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/StatsProviderInfo.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/StatsProviderInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/StatsProviderManager.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/StatsProviderManager.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/StatsProviderManager.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/StatsProviderManager.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/StatsProviderManagerDelegate.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/StatsProviderManagerDelegate.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/StatsProviderManagerDelegate.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/StatsProviderManagerDelegate.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/Probe.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/annotations/Probe.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/Probe.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/annotations/Probe.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeListener.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeListener.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeListener.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeListener.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeParam.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeParam.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeParam.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeParam.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeProvider.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeProvider.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeProvider.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeProvider.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/AverageRangeStatistic.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/AverageRangeStatistic.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/AverageRangeStatistic.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/AverageRangeStatistic.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/BoundaryStatistic.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/BoundaryStatistic.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/BoundaryStatistic.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/BoundaryStatistic.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/BoundedRangeStatistic.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/BoundedRangeStatistic.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/BoundedRangeStatistic.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/BoundedRangeStatistic.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/CountStatistic.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/CountStatistic.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/CountStatistic.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/CountStatistic.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/RangeStatistic.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/RangeStatistic.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/RangeStatistic.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/RangeStatistic.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/Statistic.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/Statistic.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/Statistic.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/Statistic.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/Stats.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/Stats.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/Stats.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/Stats.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/StringStatistic.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/StringStatistic.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/StringStatistic.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/StringStatistic.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/TimeStatistic.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/TimeStatistic.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/TimeStatistic.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/TimeStatistic.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/annotations/Reset.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/annotations/Reset.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/annotations/Reset.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/annotations/Reset.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StatsImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/StatsImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StatsImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/StatsImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/AMXClient.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/AMXClient.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/AMXClient.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/AMXClient.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/AMXMBeanInterface.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/AMXMBeanInterface.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/AMXMBeanInterface.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/AMXMBeanInterface.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/AMXMetadata.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/AMXMetadata.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/AMXMetadata.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/AMXMetadata.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/Description.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/Description.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/Description.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/Description.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/DescriptorFields.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/DescriptorFields.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/DescriptorFields.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/DescriptorFields.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/DescriptorKey.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/DescriptorKey.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/DescriptorKey.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/DescriptorKey.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/GmbalException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/GmbalException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/GmbalException.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/GmbalException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/GmbalMBean.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/GmbalMBean.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/GmbalMBean.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/GmbalMBean.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/GmbalMBeanNOPImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/GmbalMBeanNOPImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/GmbalMBeanNOPImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/GmbalMBeanNOPImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/Impact.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/Impact.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/Impact.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/Impact.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/IncludeSubclass.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/IncludeSubclass.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/IncludeSubclass.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/IncludeSubclass.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/InheritedAttribute.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/InheritedAttribute.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/InheritedAttribute.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/InheritedAttribute.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/InheritedAttributes.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/InheritedAttributes.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/InheritedAttributes.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/InheritedAttributes.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/ManagedAttribute.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedAttribute.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/ManagedAttribute.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedAttribute.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/ManagedData.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedData.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/ManagedData.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedData.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/ManagedObject.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedObject.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/ManagedObject.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedObject.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/ManagedObjectManager.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedObjectManager.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/ManagedObjectManager.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedObjectManager.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/ManagedObjectManagerFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedObjectManagerFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/ManagedObjectManagerFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedObjectManagerFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/ManagedObjectManagerNOPImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedObjectManagerNOPImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/ManagedObjectManagerNOPImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedObjectManagerNOPImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/ManagedOperation.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedOperation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/ManagedOperation.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedOperation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/NameValue.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/NameValue.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/NameValue.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/NameValue.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/ParameterNames.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ParameterNames.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/ParameterNames.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ParameterNames.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/util/GenericConstructor.java b/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/util/GenericConstructor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/util/GenericConstructor.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/util/GenericConstructor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/AbstractCreator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/AbstractCreator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/AbstractCreator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/AbstractCreator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/AbstractCreatorProcessor.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/AbstractCreatorProcessor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/AbstractCreatorProcessor.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/AbstractCreatorProcessor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/AbstractProcessor.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/AbstractProcessor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/AbstractProcessor.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/AbstractProcessor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/AttributesHolder.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/AttributesHolder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/AttributesHolder.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/AttributesHolder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/ContextClassloaderLocal.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/ContextClassloaderLocal.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/ContextClassloaderLocal.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/ContextClassloaderLocal.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/ContextClassloaderLocal.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/ContextClassloaderLocal.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/FragmentedArray.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/FragmentedArray.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/FragmentedArray.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/FragmentedArray.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/MutableXMLStreamBuffer.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/MutableXMLStreamBuffer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/MutableXMLStreamBuffer.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/MutableXMLStreamBuffer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferException.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferMark.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferMark.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferMark.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferMark.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferResult.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferResult.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferResult.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferResult.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferSource.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferSource.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferSource.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferSource.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/DefaultWithLexicalHandler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/sax/DefaultWithLexicalHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/DefaultWithLexicalHandler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/sax/DefaultWithLexicalHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/Features.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/sax/Features.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/Features.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/sax/Features.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/Properties.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/sax/Properties.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/Properties.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/sax/Properties.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferCreator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferCreator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferCreator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferCreator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferProcessor.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferProcessor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferProcessor.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferProcessor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/NamespaceContexHelper.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/NamespaceContexHelper.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/NamespaceContexHelper.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/NamespaceContexHelper.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamBufferCreator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamBufferCreator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamBufferCreator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamBufferCreator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferCreator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferCreator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferCreator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferCreator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferProcessor.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferProcessor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferProcessor.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferProcessor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferCreator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferCreator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferCreator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferCreator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferProcessor.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferProcessor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferProcessor.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferProcessor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/Closeable.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/Closeable.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/Closeable.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/Closeable.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/EPRSDDocumentFilter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/EPRSDDocumentFilter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/EPRSDDocumentFilter.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/EPRSDDocumentFilter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/EndpointReferenceUtil.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/EndpointReferenceUtil.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/EndpointReferenceUtil.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/EndpointReferenceUtil.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/ProblemAction.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/ProblemAction.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/ProblemAction.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/ProblemAction.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/ProblemHeaderQName.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/ProblemHeaderQName.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/ProblemHeaderQName.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/ProblemHeaderQName.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/W3CAddressingConstants.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/W3CAddressingConstants.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/W3CAddressingConstants.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/W3CAddressingConstants.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/W3CAddressingMetadataConstants.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/W3CAddressingMetadataConstants.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/W3CAddressingMetadataConstants.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/W3CAddressingMetadataConstants.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/W3CWsaClientTube.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/W3CWsaClientTube.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/W3CWsaClientTube.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/W3CWsaClientTube.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/W3CWsaServerTube.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/W3CWsaServerTube.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/W3CWsaServerTube.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/W3CWsaServerTube.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WSEPRExtension.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WSEPRExtension.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WSEPRExtension.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WSEPRExtension.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WsaActionUtil.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaActionUtil.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WsaActionUtil.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaActionUtil.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WsaClientTube.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaClientTube.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WsaClientTube.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaClientTube.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WsaPropertyBag.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaPropertyBag.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WsaPropertyBag.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaPropertyBag.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WsaServerTube.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaServerTube.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WsaServerTube.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaServerTube.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WsaTube.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaTube.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WsaTube.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaTube.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WsaTubeHelper.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelper.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WsaTubeHelper.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelper.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WsaTubeHelperImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelperImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WsaTubeHelperImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelperImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/model/ActionNotSupportedException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/model/ActionNotSupportedException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/model/ActionNotSupportedException.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/model/ActionNotSupportedException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/model/InvalidAddressingHeaderException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/model/InvalidAddressingHeaderException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/model/InvalidAddressingHeaderException.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/model/InvalidAddressingHeaderException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/model/MissingAddressingHeaderException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/model/MissingAddressingHeaderException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/model/MissingAddressingHeaderException.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/model/MissingAddressingHeaderException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/policy/AddressingFeatureConfigurator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/policy/AddressingFeatureConfigurator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/policy/AddressingFeatureConfigurator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/policy/AddressingFeatureConfigurator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/policy/AddressingPolicyMapConfigurator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/policy/AddressingPolicyMapConfigurator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/policy/AddressingPolicyMapConfigurator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/policy/AddressingPolicyMapConfigurator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/policy/AddressingPolicyValidator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/policy/AddressingPolicyValidator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/policy/AddressingPolicyValidator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/policy/AddressingPolicyValidator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/policy/AddressingPrefixMapper.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/policy/AddressingPrefixMapper.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/policy/AddressingPrefixMapper.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/policy/AddressingPrefixMapper.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionAddressingConstants.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionAddressingConstants.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionAddressingConstants.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionAddressingConstants.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaClientTube.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaClientTube.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaClientTube.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaClientTube.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaServerTube.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaServerTube.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaServerTube.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaServerTube.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/v200408/ProblemAction.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/ProblemAction.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/v200408/ProblemAction.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/ProblemAction.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/v200408/ProblemHeaderQName.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/ProblemHeaderQName.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/v200408/ProblemHeaderQName.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/ProblemHeaderQName.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/v200408/WsaTubeHelperImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/WsaTubeHelperImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/v200408/WsaTubeHelperImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/WsaTubeHelperImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/BindingID.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/BindingID.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/BindingID.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/BindingID.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/BindingIDFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/BindingIDFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/BindingIDFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/BindingIDFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/Cancelable.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/Cancelable.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/Cancelable.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/Cancelable.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/Component.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/Component.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/Component.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/Component.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ComponentEx.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ComponentEx.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ComponentEx.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ComponentEx.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ComponentFeature.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ComponentFeature.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ComponentFeature.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ComponentFeature.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ComponentRegistry.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ComponentRegistry.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ComponentRegistry.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ComponentRegistry.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ComponentsFeature.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ComponentsFeature.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ComponentsFeature.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ComponentsFeature.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/DistributedPropertySet.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/DistributedPropertySet.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/DistributedPropertySet.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/DistributedPropertySet.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/EndpointAddress.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/EndpointAddress.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/EndpointAddress.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/EndpointAddress.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/FeatureConstructor.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/FeatureConstructor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/FeatureConstructor.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/FeatureConstructor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/FeatureListValidator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/FeatureListValidator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/FeatureListValidator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/FeatureListValidator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/FeatureListValidatorAnnotation.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/FeatureListValidatorAnnotation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/FeatureListValidatorAnnotation.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/FeatureListValidatorAnnotation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ImpliesWebServiceFeature.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ImpliesWebServiceFeature.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ImpliesWebServiceFeature.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ImpliesWebServiceFeature.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/PropertySet.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/PropertySet.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/PropertySet.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/PropertySet.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ResourceLoader.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ResourceLoader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ResourceLoader.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ResourceLoader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/SOAPVersion.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/SOAPVersion.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/SOAPVersion.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/SOAPVersion.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ServiceSharedFeatureMarker.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ServiceSharedFeatureMarker.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ServiceSharedFeatureMarker.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ServiceSharedFeatureMarker.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/WSBinding.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/WSBinding.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/WSBinding.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/WSBinding.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/WSDLLocator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/WSDLLocator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/WSDLLocator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/WSDLLocator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/WSFeatureList.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/WSFeatureList.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/WSFeatureList.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/WSFeatureList.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/WSService.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/WSService.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/WSService.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/WSService.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/WebServiceFeatureFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/WebServiceFeatureFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/WebServiceFeatureFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/WebServiceFeatureFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/addressing/AddressingPropertySet.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/AddressingPropertySet.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/addressing/AddressingPropertySet.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/AddressingPropertySet.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/addressing/AddressingVersion.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/AddressingVersion.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/addressing/AddressingVersion.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/AddressingVersion.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/addressing/EPRHeader.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/EPRHeader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/addressing/EPRHeader.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/EPRHeader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/addressing/NonAnonymousResponseProcessor.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/NonAnonymousResponseProcessor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/addressing/NonAnonymousResponseProcessor.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/NonAnonymousResponseProcessor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/addressing/OneWayFeature.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/OneWayFeature.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/addressing/OneWayFeature.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/OneWayFeature.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/addressing/OutboundReferenceParameterHeader.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/OutboundReferenceParameterHeader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/addressing/OutboundReferenceParameterHeader.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/OutboundReferenceParameterHeader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/addressing/WSEndpointReference.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/WSEndpointReference.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/addressing/WSEndpointReference.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/WSEndpointReference.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/addressing/package-info.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/addressing/package-info.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/client/ClientPipelineHook.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ClientPipelineHook.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/client/ClientPipelineHook.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ClientPipelineHook.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/client/SelectOptimalEncodingFeature.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/SelectOptimalEncodingFeature.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/client/SelectOptimalEncodingFeature.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/SelectOptimalEncodingFeature.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/client/ServiceInterceptor.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ServiceInterceptor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/client/ServiceInterceptor.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ServiceInterceptor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/client/ServiceInterceptorFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ServiceInterceptorFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/client/ServiceInterceptorFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ServiceInterceptorFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/client/ThrowableInPacketCompletionFeature.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ThrowableInPacketCompletionFeature.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/client/ThrowableInPacketCompletionFeature.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ThrowableInPacketCompletionFeature.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/client/WSPortInfo.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/WSPortInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/client/WSPortInfo.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/WSPortInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/config/management/EndpointCreationAttributes.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/EndpointCreationAttributes.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/config/management/EndpointCreationAttributes.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/EndpointCreationAttributes.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/config/management/ManagedEndpointFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/ManagedEndpointFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/config/management/ManagedEndpointFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/ManagedEndpointFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/config/management/Reconfigurable.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/Reconfigurable.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/config/management/Reconfigurable.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/Reconfigurable.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/config/management/policy/ManagedClientAssertion.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/policy/ManagedClientAssertion.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/config/management/policy/ManagedClientAssertion.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/policy/ManagedClientAssertion.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/config/management/policy/ManagedServiceAssertion.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/policy/ManagedServiceAssertion.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/config/management/policy/ManagedServiceAssertion.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/policy/ManagedServiceAssertion.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/config/management/policy/ManagementAssertion.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/policy/ManagementAssertion.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/config/management/policy/ManagementAssertion.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/policy/ManagementAssertion.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/ClientCallBridge.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/ClientCallBridge.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/ClientCallBridge.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/ClientCallBridge.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/Databinding.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/Databinding.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/Databinding.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/Databinding.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/DatabindingConfig.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/DatabindingConfig.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/DatabindingConfig.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/DatabindingConfig.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/DatabindingFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/DatabindingFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/DatabindingFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/DatabindingFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/EndpointCallBridge.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/EndpointCallBridge.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/EndpointCallBridge.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/EndpointCallBridge.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/JavaCallInfo.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/JavaCallInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/JavaCallInfo.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/JavaCallInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/MappingInfo.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/MappingInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/MappingInfo.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/MappingInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/MetadataReader.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/MetadataReader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/MetadataReader.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/MetadataReader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/SoapBodyStyle.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/SoapBodyStyle.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/SoapBodyStyle.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/SoapBodyStyle.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/WSDLGenInfo.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/WSDLGenInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/WSDLGenInfo.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/WSDLGenInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/fastinfoset/FastInfosetFeature.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/fastinfoset/FastInfosetFeature.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/fastinfoset/FastInfosetFeature.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/fastinfoset/FastInfosetFeature.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ha/HaInfo.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ha/HaInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ha/HaInfo.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ha/HaInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ha/StickyFeature.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ha/StickyFeature.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ha/StickyFeature.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ha/StickyFeature.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/handler/MessageHandler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/handler/MessageHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/handler/MessageHandler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/handler/MessageHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/handler/MessageHandlerContext.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/handler/MessageHandlerContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/handler/MessageHandlerContext.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/handler/MessageHandlerContext.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/AddressingUtils.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/AddressingUtils.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/AddressingUtils.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/AddressingUtils.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/Attachment.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Attachment.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/Attachment.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Attachment.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/AttachmentEx.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/AttachmentEx.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/AttachmentEx.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/AttachmentEx.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/AttachmentSet.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/AttachmentSet.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/AttachmentSet.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/AttachmentSet.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/ExceptionHasMessage.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/ExceptionHasMessage.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/ExceptionHasMessage.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/ExceptionHasMessage.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/FilterMessageImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/FilterMessageImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/FilterMessageImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/FilterMessageImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/Header.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Header.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/Header.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Header.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/HeaderList.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/HeaderList.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/HeaderList.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/HeaderList.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/Headers.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Headers.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/Headers.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Headers.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/Message.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Message.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/Message.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Message.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/MessageContextFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/MessageContextFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/MessageContextFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/MessageContextFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/MessageHeaders.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/MessageHeaders.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/MessageHeaders.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/MessageHeaders.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/MessageMetadata.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/MessageMetadata.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/MessageMetadata.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/MessageMetadata.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/MessageWrapper.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/MessageWrapper.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/MessageWrapper.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/MessageWrapper.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/MessageWritable.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/MessageWritable.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/MessageWritable.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/MessageWritable.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/Messages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Messages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/Messages.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Messages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/Packet.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Packet.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/Packet.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Packet.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/StreamingSOAP.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/StreamingSOAP.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/StreamingSOAP.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/StreamingSOAP.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/SuppressAutomaticWSARequestHeadersFeature.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/SuppressAutomaticWSARequestHeadersFeature.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/SuppressAutomaticWSARequestHeadersFeature.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/SuppressAutomaticWSARequestHeadersFeature.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/package-info.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/package-info.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/saaj/SAAJFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/saaj/SAAJFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/saaj/SAAJFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/saaj/SAAJFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/saaj/SAAJMessageHeaders.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/saaj/SAAJMessageHeaders.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/saaj/SAAJMessageHeaders.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/saaj/SAAJMessageHeaders.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/saaj/SaajStaxWriter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/saaj/SaajStaxWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/saaj/SaajStaxWriter.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/saaj/SaajStaxWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/stream/InputStreamMessage.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/stream/InputStreamMessage.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/stream/InputStreamMessage.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/stream/InputStreamMessage.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/stream/StreamBasedMessage.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/stream/StreamBasedMessage.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/stream/StreamBasedMessage.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/stream/StreamBasedMessage.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/stream/XMLStreamReaderMessage.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/stream/XMLStreamReaderMessage.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/stream/XMLStreamReaderMessage.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/stream/XMLStreamReaderMessage.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/CheckedException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/CheckedException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/CheckedException.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/CheckedException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/ExceptionType.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/ExceptionType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/ExceptionType.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/ExceptionType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/JavaMethod.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/JavaMethod.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/JavaMethod.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/JavaMethod.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/MEP.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/MEP.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/MEP.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/MEP.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/Parameter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/Parameter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/Parameter.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/Parameter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/ParameterBinding.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/ParameterBinding.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/ParameterBinding.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/ParameterBinding.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/SEIModel.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/SEIModel.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/SEIModel.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/SEIModel.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/WSDLOperationMapping.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/WSDLOperationMapping.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/WSDLOperationMapping.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/WSDLOperationMapping.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/soap/SOAPBinding.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/soap/SOAPBinding.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/soap/SOAPBinding.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/soap/SOAPBinding.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundFault.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundFault.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundFault.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundFault.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundOperation.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundOperation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundOperation.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundOperation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundPortType.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundPortType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundPortType.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundPortType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLDescriptorKind.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLDescriptorKind.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLDescriptorKind.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLDescriptorKind.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtensible.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtensible.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtensible.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtensible.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtension.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtension.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtension.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtension.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFault.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFault.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFault.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFault.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFeaturedObject.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFeaturedObject.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFeaturedObject.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFeaturedObject.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLInput.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLInput.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLInput.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLInput.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLMessage.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLMessage.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLMessage.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLMessage.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLModel.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLModel.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLModel.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLModel.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLObject.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLObject.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLObject.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLObject.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOperation.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOperation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOperation.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOperation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOutput.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOutput.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOutput.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOutput.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPart.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPart.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPart.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPart.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPartDescriptor.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPartDescriptor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPartDescriptor.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPartDescriptor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPort.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPort.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPort.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPort.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPortType.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPortType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPortType.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPortType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLService.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLService.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLService.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLService.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLBoundFault.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLBoundFault.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLBoundFault.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLBoundFault.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLBoundOperation.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLBoundOperation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLBoundOperation.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLBoundOperation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLBoundPortType.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLBoundPortType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLBoundPortType.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLBoundPortType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLFault.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLFault.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLFault.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLFault.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLInput.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLInput.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLInput.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLInput.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLMessage.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLMessage.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLMessage.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLMessage.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLModel.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLModel.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLModel.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLModel.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLOperation.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLOperation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLOperation.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLOperation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLOutput.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLOutput.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLOutput.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLOutput.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLPart.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLPart.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLPart.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLPart.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLPort.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLPort.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLPort.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLPort.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLPortType.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLPortType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLPortType.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLPortType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLService.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLService.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLService.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLService.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/package-info.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/package-info.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/ClientPipeAssemblerContext.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ClientPipeAssemblerContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/ClientPipeAssemblerContext.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ClientPipeAssemblerContext.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/ClientTubeAssemblerContext.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ClientTubeAssemblerContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/ClientTubeAssemblerContext.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ClientTubeAssemblerContext.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/Codec.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Codec.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/Codec.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Codec.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/Codecs.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Codecs.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/Codecs.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Codecs.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/ContentType.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ContentType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/ContentType.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ContentType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/Engine.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Engine.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/Engine.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Engine.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/Fiber.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Fiber.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/Fiber.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Fiber.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptor.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptor.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptorFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptorFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptorFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptorFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/NextAction.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/NextAction.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/NextAction.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/NextAction.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/Pipe.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Pipe.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/Pipe.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Pipe.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/PipeCloner.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/PipeCloner.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/PipeCloner.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/PipeCloner.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/PipeClonerImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/PipeClonerImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/PipeClonerImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/PipeClonerImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/PipelineAssembler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/PipelineAssembler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/PipelineAssembler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/PipelineAssembler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/PipelineAssemblerFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/PipelineAssemblerFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/PipelineAssemblerFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/PipelineAssemblerFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/SOAPBindingCodec.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/SOAPBindingCodec.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/SOAPBindingCodec.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/SOAPBindingCodec.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/ServerPipeAssemblerContext.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ServerPipeAssemblerContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/ServerPipeAssemblerContext.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ServerPipeAssemblerContext.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/ServerTubeAssemblerContext.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ServerTubeAssemblerContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/ServerTubeAssemblerContext.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ServerTubeAssemblerContext.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/StreamSOAPCodec.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/StreamSOAPCodec.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/StreamSOAPCodec.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/StreamSOAPCodec.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/Stubs.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Stubs.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/Stubs.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Stubs.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/SyncStartForAsyncFeature.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/SyncStartForAsyncFeature.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/SyncStartForAsyncFeature.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/SyncStartForAsyncFeature.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/ThrowableContainerPropertySet.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ThrowableContainerPropertySet.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/ThrowableContainerPropertySet.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ThrowableContainerPropertySet.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/TransportPipeFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TransportPipeFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/TransportPipeFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TransportPipeFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/TransportTubeFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TransportTubeFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/TransportTubeFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TransportTubeFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/Tube.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Tube.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/Tube.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Tube.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/TubeCloner.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TubeCloner.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/TubeCloner.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TubeCloner.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/TubelineAssembler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TubelineAssembler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/TubelineAssembler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TubelineAssembler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/TubelineAssemblerFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TubelineAssemblerFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/TubelineAssemblerFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TubelineAssemblerFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterPipeImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterPipeImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterPipeImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterPipeImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterTubeImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterTubeImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterTubeImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterTubeImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractPipeImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractPipeImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractPipeImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractPipeImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractTubeImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractTubeImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractTubeImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractTubeImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/helper/PipeAdapter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/PipeAdapter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/helper/PipeAdapter.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/PipeAdapter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/helper/package-info.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/helper/package-info.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/package-info.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/package-info.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/AlternativeSelector.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/AlternativeSelector.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/AlternativeSelector.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/AlternativeSelector.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/ModelGenerator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/ModelGenerator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/ModelGenerator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/ModelGenerator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/ModelTranslator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/ModelTranslator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/ModelTranslator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/ModelTranslator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/ModelUnmarshaller.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/ModelUnmarshaller.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/ModelUnmarshaller.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/ModelUnmarshaller.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/PolicyResolver.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/PolicyResolver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/PolicyResolver.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/PolicyResolver.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/PolicyResolverFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/PolicyResolverFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/PolicyResolverFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/PolicyResolverFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/SourceModel.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/SourceModel.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/SourceModel.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/SourceModel.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/ValidationProcessor.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/ValidationProcessor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/ValidationProcessor.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/ValidationProcessor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/subject/BindingSubject.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/subject/BindingSubject.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/subject/BindingSubject.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/subject/BindingSubject.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/AbstractInstanceResolver.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/AbstractInstanceResolver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/AbstractInstanceResolver.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/AbstractInstanceResolver.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/AbstractServerAsyncTransport.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/AbstractServerAsyncTransport.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/AbstractServerAsyncTransport.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/AbstractServerAsyncTransport.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/Adapter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Adapter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/Adapter.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Adapter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/AsyncProvider.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/AsyncProvider.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/AsyncProvider.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/AsyncProvider.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/AsyncProviderCallback.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/AsyncProviderCallback.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/AsyncProviderCallback.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/AsyncProviderCallback.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/BoundEndpoint.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/BoundEndpoint.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/BoundEndpoint.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/BoundEndpoint.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/Container.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Container.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/Container.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Container.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/ContainerResolver.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ContainerResolver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/ContainerResolver.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ContainerResolver.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/DocumentAddressResolver.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/DocumentAddressResolver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/DocumentAddressResolver.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/DocumentAddressResolver.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/EndpointAwareCodec.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/EndpointAwareCodec.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/EndpointAwareCodec.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/EndpointAwareCodec.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/EndpointComponent.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/EndpointComponent.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/EndpointComponent.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/EndpointComponent.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/EndpointData.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/EndpointData.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/EndpointData.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/EndpointData.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/EndpointReferenceExtensionContributor.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/EndpointReferenceExtensionContributor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/EndpointReferenceExtensionContributor.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/EndpointReferenceExtensionContributor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/HttpEndpoint.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/HttpEndpoint.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/HttpEndpoint.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/HttpEndpoint.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/InstanceResolverAnnotation.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/InstanceResolverAnnotation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/InstanceResolverAnnotation.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/InstanceResolverAnnotation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/Invoker.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Invoker.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/Invoker.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Invoker.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/LazyMOMProvider.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/LazyMOMProvider.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/LazyMOMProvider.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/LazyMOMProvider.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/MethodUtil.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/MethodUtil.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/MethodUtil.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/MethodUtil.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/Module.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Module.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/Module.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Module.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/PortAddressResolver.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/PortAddressResolver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/PortAddressResolver.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/PortAddressResolver.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/ProviderInvokerTubeFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ProviderInvokerTubeFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/ProviderInvokerTubeFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ProviderInvokerTubeFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/ResourceInjector.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ResourceInjector.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/ResourceInjector.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ResourceInjector.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/SDDocument.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/SDDocument.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/SDDocument.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/SDDocument.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/SDDocumentFilter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentFilter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/SDDocumentFilter.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentFilter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/SDDocumentSource.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentSource.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/SDDocumentSource.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentSource.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/ServerPipelineHook.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ServerPipelineHook.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/ServerPipelineHook.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ServerPipelineHook.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/ServiceDefinition.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ServiceDefinition.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/ServiceDefinition.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ServiceDefinition.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/ThreadLocalContainerResolver.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ThreadLocalContainerResolver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/ThreadLocalContainerResolver.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ThreadLocalContainerResolver.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/TransportBackChannel.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/TransportBackChannel.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/TransportBackChannel.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/TransportBackChannel.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/WSEndpoint.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WSEndpoint.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/WSEndpoint.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WSEndpoint.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/WSWebServiceContext.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WSWebServiceContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/WSWebServiceContext.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WSWebServiceContext.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/WebModule.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WebModule.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/WebModule.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WebModule.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/WebServiceContextDelegate.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WebServiceContextDelegate.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/WebServiceContextDelegate.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WebServiceContextDelegate.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/package-info.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/package-info.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/ContextClassloaderLocal.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/ContextClassloaderLocal.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/ContextClassloaderLocal.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/ContextClassloaderLocal.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/ContextClassloaderLocal.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/ContextClassloaderLocal.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/ContextClassloaderLocal.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/ContextClassloaderLocal.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/parser/MetaDataResolver.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/MetaDataResolver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/parser/MetaDataResolver.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/MetaDataResolver.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/parser/MetadataResolverFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/MetadataResolverFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/parser/MetadataResolverFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/MetadataResolverFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/parser/PolicyWSDLParserExtension.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/PolicyWSDLParserExtension.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/parser/PolicyWSDLParserExtension.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/PolicyWSDLParserExtension.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/parser/ServiceDescriptor.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/ServiceDescriptor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/parser/ServiceDescriptor.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/ServiceDescriptor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtension.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtension.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtension.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtension.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtensionContext.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtensionContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtensionContext.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtensionContext.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/parser/XMLEntityResolver.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/XMLEntityResolver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/parser/XMLEntityResolver.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/XMLEntityResolver.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/parser/package-info.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/parser/package-info.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGenExtnContext.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGenExtnContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGenExtnContext.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGenExtnContext.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGeneratorExtension.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGeneratorExtension.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGeneratorExtension.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGeneratorExtension.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/DefaultClientTubelineAssemblyContext.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/DefaultClientTubelineAssemblyContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/DefaultClientTubelineAssemblyContext.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/DefaultClientTubelineAssemblyContext.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/DefaultServerTubelineAssemblyContext.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/DefaultServerTubelineAssemblyContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/DefaultServerTubelineAssemblyContext.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/DefaultServerTubelineAssemblyContext.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/MetroConfigLoader.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/MetroConfigLoader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/MetroConfigLoader.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/MetroConfigLoader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/MetroConfigName.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/MetroConfigName.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/MetroConfigName.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/MetroConfigName.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/MetroConfigNameImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/MetroConfigNameImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/MetroConfigNameImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/MetroConfigNameImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/MetroTubelineAssembler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/MetroTubelineAssembler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/MetroTubelineAssembler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/MetroTubelineAssembler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/TubeCreator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/TubeCreator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/TubeCreator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/TubeCreator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/TubelineAssemblyContextImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/TubelineAssemblyContextImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/TubelineAssemblyContextImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/TubelineAssemblyContextImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/TubelineAssemblyController.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/TubelineAssemblyController.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/TubelineAssemblyController.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/TubelineAssemblyController.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/dev/ClientTubelineAssemblyContext.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/ClientTubelineAssemblyContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/dev/ClientTubelineAssemblyContext.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/ClientTubelineAssemblyContext.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/dev/ServerTubelineAssemblyContext.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/ServerTubelineAssemblyContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/dev/ServerTubelineAssemblyContext.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/ServerTubelineAssemblyContext.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/dev/TubeFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/TubeFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/dev/TubeFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/TubeFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/dev/TubelineAssemblyContext.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/TubelineAssemblyContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/dev/TubelineAssemblyContext.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/TubelineAssemblyContext.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/dev/TubelineAssemblyContextUpdater.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/TubelineAssemblyContextUpdater.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/dev/TubelineAssemblyContextUpdater.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/TubelineAssemblyContextUpdater.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/dev/TubelineAssemblyDecorator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/TubelineAssemblyDecorator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/dev/TubelineAssemblyDecorator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/TubelineAssemblyDecorator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws-tubes-default.xml b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws-tubes-default.xml similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws-tubes-default.xml rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws-tubes-default.xml diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws/AddressingTubeFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/AddressingTubeFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws/AddressingTubeFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/AddressingTubeFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws/BasicTransportTubeFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/BasicTransportTubeFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws/BasicTransportTubeFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/BasicTransportTubeFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws/HandlerTubeFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/HandlerTubeFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws/HandlerTubeFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/HandlerTubeFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws/MonitoringTubeFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/MonitoringTubeFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws/MonitoringTubeFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/MonitoringTubeFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws/MustUnderstandTubeFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/MustUnderstandTubeFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws/MustUnderstandTubeFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/MustUnderstandTubeFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws/TerminalTubeFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/TerminalTubeFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws/TerminalTubeFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/TerminalTubeFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws/ValidationTubeFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/ValidationTubeFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws/ValidationTubeFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/ValidationTubeFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/binding/BindingImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/binding/BindingImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/binding/BindingImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/binding/BindingImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/binding/FeatureListUtil.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/binding/FeatureListUtil.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/binding/FeatureListUtil.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/binding/FeatureListUtil.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/binding/HTTPBindingImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/binding/HTTPBindingImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/binding/HTTPBindingImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/binding/HTTPBindingImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/binding/SOAPBindingImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/binding/SOAPBindingImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/binding/SOAPBindingImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/binding/SOAPBindingImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/binding/WebServiceFeatureList.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/binding/WebServiceFeatureList.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/binding/WebServiceFeatureList.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/binding/WebServiceFeatureList.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/AsyncInvoker.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/AsyncInvoker.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/AsyncInvoker.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/AsyncInvoker.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/AsyncResponseImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/AsyncResponseImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/AsyncResponseImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/AsyncResponseImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/BindingProviderProperties.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/BindingProviderProperties.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/BindingProviderProperties.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/BindingProviderProperties.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/ClientContainer.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ClientContainer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/ClientContainer.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ClientContainer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/ClientSchemaValidationTube.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ClientSchemaValidationTube.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/ClientSchemaValidationTube.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ClientSchemaValidationTube.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/ClientTransportException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ClientTransportException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/ClientTransportException.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ClientTransportException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/ContentNegotiation.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ContentNegotiation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/ContentNegotiation.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ContentNegotiation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/HandlerConfiguration.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/HandlerConfiguration.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/HandlerConfiguration.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/HandlerConfiguration.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/HandlerConfigurator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/HandlerConfigurator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/HandlerConfigurator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/HandlerConfigurator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/MonitorRootClient.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/MonitorRootClient.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/MonitorRootClient.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/MonitorRootClient.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/PortInfo.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/PortInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/PortInfo.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/PortInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/RequestContext.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/RequestContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/RequestContext.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/RequestContext.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/ResponseContext.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ResponseContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/ResponseContext.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ResponseContext.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/ResponseContextReceiver.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ResponseContextReceiver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/ResponseContextReceiver.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ResponseContextReceiver.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/SCAnnotations.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/SCAnnotations.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/SCAnnotations.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/SCAnnotations.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/SEIPortInfo.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/SEIPortInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/SEIPortInfo.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/SEIPortInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/SenderException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/SenderException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/SenderException.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/SenderException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/Stub.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/Stub.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/Stub.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/Stub.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/dispatch/DataSourceDispatch.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/DataSourceDispatch.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/dispatch/DataSourceDispatch.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/DataSourceDispatch.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/dispatch/DispatchImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/DispatchImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/dispatch/DispatchImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/DispatchImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/dispatch/JAXBDispatch.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/JAXBDispatch.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/dispatch/JAXBDispatch.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/JAXBDispatch.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/dispatch/MessageDispatch.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/MessageDispatch.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/dispatch/MessageDispatch.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/MessageDispatch.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/dispatch/PacketDispatch.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/PacketDispatch.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/dispatch/PacketDispatch.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/PacketDispatch.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/dispatch/RESTSourceDispatch.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/RESTSourceDispatch.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/dispatch/RESTSourceDispatch.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/RESTSourceDispatch.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/dispatch/SOAPMessageDispatch.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/SOAPMessageDispatch.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/dispatch/SOAPMessageDispatch.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/SOAPMessageDispatch.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/dispatch/SOAPSourceDispatch.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/SOAPSourceDispatch.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/dispatch/SOAPSourceDispatch.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/SOAPSourceDispatch.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/package-info.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/package-info.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/AsyncMethodHandler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/AsyncMethodHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/AsyncMethodHandler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/AsyncMethodHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/BodyBuilder.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/BodyBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/BodyBuilder.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/BodyBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/CallbackMethodHandler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/CallbackMethodHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/CallbackMethodHandler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/CallbackMethodHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/MessageFiller.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/MessageFiller.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/MessageFiller.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/MessageFiller.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/MethodHandler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/MethodHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/MethodHandler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/MethodHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/MethodUtil.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/MethodUtil.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/MethodUtil.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/MethodUtil.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/PollingMethodHandler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/PollingMethodHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/PollingMethodHandler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/PollingMethodHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/ResponseBuilder.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ResponseBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/ResponseBuilder.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ResponseBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SEIMethodHandler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/SEIMethodHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SEIMethodHandler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/SEIMethodHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SEIStub.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/SEIStub.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SEIStub.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/SEIStub.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/StubAsyncHandler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/StubAsyncHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/StubAsyncHandler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/StubAsyncHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/StubHandler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/StubHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/StubHandler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/StubHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SyncMethodHandler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/SyncMethodHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SyncMethodHandler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/SyncMethodHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/ValueGetter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ValueGetter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/ValueGetter.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ValueGetter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/ValueGetterFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ValueGetterFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/ValueGetterFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ValueGetterFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/ValueSetter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/ValueSetter.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/ValueSetterFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetterFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/ValueSetterFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetterFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/package-info.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/package-info.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/commons/xmlutil/ContextClassloaderLocal.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/commons/xmlutil/ContextClassloaderLocal.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/commons/xmlutil/ContextClassloaderLocal.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/commons/xmlutil/ContextClassloaderLocal.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/ContextClassloaderLocal.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/commons/xmlutil/ContextClassloaderLocal.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/ContextClassloaderLocal.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/commons/xmlutil/ContextClassloaderLocal.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/commons/xmlutil/Converter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/commons/xmlutil/Converter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/commons/xmlutil/Converter.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/commons/xmlutil/Converter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/config/management/policy/ManagementAssertionCreator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/config/management/policy/ManagementAssertionCreator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/config/management/policy/ManagementAssertionCreator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/config/management/policy/ManagementAssertionCreator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/config/management/policy/ManagementPolicyValidator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/config/management/policy/ManagementPolicyValidator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/config/management/policy/ManagementPolicyValidator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/config/management/policy/ManagementPolicyValidator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/config/management/policy/ManagementPrefixMapper.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/config/management/policy/ManagementPrefixMapper.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/config/management/policy/ManagementPrefixMapper.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/config/management/policy/ManagementPrefixMapper.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/config/metro/dev/FeatureReader.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/config/metro/dev/FeatureReader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/config/metro/dev/FeatureReader.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/config/metro/dev/FeatureReader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/config/metro/util/ParserUtil.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/config/metro/util/ParserUtil.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/config/metro/util/ParserUtil.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/config/metro/util/ParserUtil.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/db/DatabindingFactoryImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/DatabindingFactoryImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/db/DatabindingFactoryImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/DatabindingFactoryImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/db/DatabindingImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/DatabindingImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/db/DatabindingImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/DatabindingImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/db/DatabindingProviderImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/DatabindingProviderImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/db/DatabindingProviderImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/DatabindingProviderImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/db/glassfish/BridgeWrapper.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/BridgeWrapper.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/db/glassfish/BridgeWrapper.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/BridgeWrapper.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/db/glassfish/JAXBRIContextFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/JAXBRIContextFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/db/glassfish/JAXBRIContextFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/JAXBRIContextFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/db/glassfish/JAXBRIContextWrapper.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/JAXBRIContextWrapper.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/db/glassfish/JAXBRIContextWrapper.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/JAXBRIContextWrapper.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/db/glassfish/MarshallerBridge.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/MarshallerBridge.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/db/glassfish/MarshallerBridge.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/MarshallerBridge.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/db/glassfish/RawAccessorWrapper.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/RawAccessorWrapper.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/db/glassfish/RawAccessorWrapper.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/RawAccessorWrapper.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/db/glassfish/WrapperBridge.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/WrapperBridge.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/db/glassfish/WrapperBridge.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/WrapperBridge.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/BindingTypeFeature.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/BindingTypeFeature.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/BindingTypeFeature.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/BindingTypeFeature.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/ContextClassloaderLocal.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/ContextClassloaderLocal.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/ContextClassloaderLocal.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/ContextClassloaderLocal.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/EPRRecipe.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/EPRRecipe.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/EPRRecipe.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/EPRRecipe.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/HttpConfigFeature.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/HttpConfigFeature.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/HttpConfigFeature.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/HttpConfigFeature.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/JAXBContextFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/JAXBContextFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/JAXBContextFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/JAXBContextFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/JAXWSProperties.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/JAXWSProperties.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/JAXWSProperties.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/JAXWSProperties.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressing.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressing.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressing.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressing.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressingFeature.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressingFeature.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressingFeature.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressingFeature.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/MemberSubmissionEndpointReference.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionEndpointReference.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/MemberSubmissionEndpointReference.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionEndpointReference.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/SchemaValidation.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/SchemaValidation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/SchemaValidation.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/SchemaValidation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/SchemaValidationFeature.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/SchemaValidationFeature.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/SchemaValidationFeature.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/SchemaValidationFeature.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/Serialization.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/Serialization.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/Serialization.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/Serialization.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/SerializationFeature.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/SerializationFeature.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/SerializationFeature.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/SerializationFeature.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/ServerSideException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/ServerSideException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/ServerSideException.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/ServerSideException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/StreamingAttachment.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/StreamingAttachment.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/StreamingAttachment.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/StreamingAttachment.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/StreamingAttachmentFeature.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/StreamingAttachmentFeature.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/StreamingAttachmentFeature.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/StreamingAttachmentFeature.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/StreamingDataHandler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/StreamingDataHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/StreamingDataHandler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/StreamingDataHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/UsesJAXBContext.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/UsesJAXBContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/UsesJAXBContext.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/UsesJAXBContext.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/UsesJAXBContextFeature.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/UsesJAXBContextFeature.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/UsesJAXBContextFeature.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/UsesJAXBContextFeature.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/ValidationErrorHandler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/ValidationErrorHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/ValidationErrorHandler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/ValidationErrorHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/WSBindingProvider.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/WSBindingProvider.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/WSBindingProvider.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/WSBindingProvider.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/package-info.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/package-info.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/dump/LoggingDumpTube.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/LoggingDumpTube.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/dump/LoggingDumpTube.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/LoggingDumpTube.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/dump/MessageDumper.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/MessageDumper.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/dump/MessageDumper.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/MessageDumper.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/dump/MessageDumping.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/MessageDumping.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/dump/MessageDumping.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/MessageDumping.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/dump/MessageDumpingFeature.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/MessageDumpingFeature.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/dump/MessageDumpingFeature.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/MessageDumpingFeature.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/dump/MessageDumpingTube.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/MessageDumpingTube.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/dump/MessageDumpingTube.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/MessageDumpingTube.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/dump/MessageDumpingTubeFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/MessageDumpingTubeFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/dump/MessageDumpingTubeFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/MessageDumpingTubeFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/ContentType.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/ContentType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/ContentType.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/ContentType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/ContentTypeImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/ContentTypeImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/ContentTypeImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/ContentTypeImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/DataHandlerDataSource.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/DataHandlerDataSource.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/DataHandlerDataSource.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/DataHandlerDataSource.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/DataSourceStreamingDataHandler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/DataSourceStreamingDataHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/DataSourceStreamingDataHandler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/DataSourceStreamingDataHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/HasEncoding.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/HasEncoding.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/HasEncoding.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/HasEncoding.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/HeaderTokenizer.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/HeaderTokenizer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/HeaderTokenizer.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/HeaderTokenizer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/ImageDataContentHandler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/ImageDataContentHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/ImageDataContentHandler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/ImageDataContentHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/MIMEPartStreamingDataHandler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/MIMEPartStreamingDataHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/MIMEPartStreamingDataHandler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/MIMEPartStreamingDataHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/MimeCodec.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/MimeCodec.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/MimeCodec.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/MimeCodec.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/MimeMultipartParser.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/MimeMultipartParser.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/MimeMultipartParser.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/MimeMultipartParser.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/MtomCodec.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/MtomCodec.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/MtomCodec.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/MtomCodec.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/ParameterList.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/ParameterList.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/ParameterList.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/ParameterList.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/RootOnlyCodec.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/RootOnlyCodec.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/RootOnlyCodec.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/RootOnlyCodec.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/SOAPBindingCodec.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/SOAPBindingCodec.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/SOAPBindingCodec.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/SOAPBindingCodec.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/StreamSOAP11Codec.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAP11Codec.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/StreamSOAP11Codec.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAP11Codec.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/StreamSOAP12Codec.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAP12Codec.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/StreamSOAP12Codec.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAP12Codec.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/StreamSOAPCodec.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAPCodec.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/StreamSOAPCodec.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAPCodec.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/StringDataContentHandler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/StringDataContentHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/StringDataContentHandler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/StringDataContentHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/SwACodec.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/SwACodec.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/SwACodec.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/SwACodec.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/TagInfoset.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/TagInfoset.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/TagInfoset.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/TagInfoset.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/XMLHTTPBindingCodec.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/XMLHTTPBindingCodec.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/XMLHTTPBindingCodec.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/XMLHTTPBindingCodec.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/XmlDataContentHandler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/XmlDataContentHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/XmlDataContentHandler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/XmlDataContentHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetCodec.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetCodec.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetCodec.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetCodec.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetMIMETypes.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetMIMETypes.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetMIMETypes.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetMIMETypes.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderRecyclable.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderRecyclable.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderRecyclable.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderRecyclable.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP11Codec.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP11Codec.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP11Codec.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP11Codec.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP12Codec.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP12Codec.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP12Codec.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP12Codec.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAPCodec.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAPCodec.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAPCodec.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAPCodec.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/policy/EncodingConstants.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/EncodingConstants.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/policy/EncodingConstants.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/EncodingConstants.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/policy/EncodingPolicyValidator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/EncodingPolicyValidator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/policy/EncodingPolicyValidator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/EncodingPolicyValidator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/policy/EncodingPrefixMapper.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/EncodingPrefixMapper.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/policy/EncodingPrefixMapper.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/EncodingPrefixMapper.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/policy/FastInfosetFeatureConfigurator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/FastInfosetFeatureConfigurator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/policy/FastInfosetFeatureConfigurator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/FastInfosetFeatureConfigurator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/policy/MtomFeatureConfigurator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/MtomFeatureConfigurator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/policy/MtomFeatureConfigurator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/MtomFeatureConfigurator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/policy/MtomPolicyMapConfigurator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/MtomPolicyMapConfigurator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/policy/MtomPolicyMapConfigurator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/MtomPolicyMapConfigurator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/policy/SelectOptimalEncodingFeatureConfigurator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/SelectOptimalEncodingFeatureConfigurator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/policy/SelectOptimalEncodingFeatureConfigurator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/SelectOptimalEncodingFeatureConfigurator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/soap/DeserializationException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/DeserializationException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/soap/DeserializationException.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/DeserializationException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/soap/SOAP12Constants.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/SOAP12Constants.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/soap/SOAP12Constants.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/SOAP12Constants.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/soap/SOAPConstants.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/SOAPConstants.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/soap/SOAPConstants.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/SOAPConstants.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/soap/SerializationException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/SerializationException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/soap/SerializationException.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/SerializationException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/soap/SerializerConstants.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/SerializerConstants.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/soap/SerializerConstants.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/SerializerConstants.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/soap/streaming/SOAP12NamespaceConstants.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/streaming/SOAP12NamespaceConstants.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/soap/streaming/SOAP12NamespaceConstants.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/streaming/SOAP12NamespaceConstants.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/soap/streaming/SOAPNamespaceConstants.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/streaming/SOAPNamespaceConstants.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/soap/streaming/SOAPNamespaceConstants.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/streaming/SOAPNamespaceConstants.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/xml/XMLCodec.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLCodec.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/xml/XMLCodec.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLCodec.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/xml/XMLConstants.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLConstants.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/xml/XMLConstants.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLConstants.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/xml/XMLMessage.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLMessage.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/xml/XMLMessage.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLMessage.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/xml/XMLPropertyBag.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLPropertyBag.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/xml/XMLPropertyBag.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLPropertyBag.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/CodeType.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/CodeType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/CodeType.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/CodeType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/DetailType.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/DetailType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/DetailType.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/DetailType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/ExceptionBean.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/ExceptionBean.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/ExceptionBean.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/ExceptionBean.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/ReasonType.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/ReasonType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/ReasonType.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/ReasonType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/SOAP11Fault.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/SOAP11Fault.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/SOAP11Fault.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/SOAP11Fault.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/SOAP12Fault.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/SOAP12Fault.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/SOAP12Fault.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/SOAP12Fault.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/ServerSOAPFaultException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/ServerSOAPFaultException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/ServerSOAPFaultException.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/ServerSOAPFaultException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/SubcodeType.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/SubcodeType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/SubcodeType.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/SubcodeType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/TextType.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/TextType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/TextType.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/TextType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/ClientLogicalHandlerTube.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ClientLogicalHandlerTube.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/ClientLogicalHandlerTube.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ClientLogicalHandlerTube.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/ClientMessageHandlerTube.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ClientMessageHandlerTube.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/ClientMessageHandlerTube.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ClientMessageHandlerTube.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/ClientSOAPHandlerTube.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ClientSOAPHandlerTube.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/ClientSOAPHandlerTube.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ClientSOAPHandlerTube.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/HandlerChainsModel.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/HandlerChainsModel.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/HandlerChainsModel.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/HandlerChainsModel.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/HandlerException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/HandlerException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/HandlerException.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/HandlerException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/HandlerProcessor.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/HandlerProcessor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/HandlerProcessor.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/HandlerProcessor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/HandlerTube.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/HandlerTube.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/HandlerTube.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/HandlerTube.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/LogicalMessageContextImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/LogicalMessageContextImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/LogicalMessageContextImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/LogicalMessageContextImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/LogicalMessageImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/LogicalMessageImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/LogicalMessageImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/LogicalMessageImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/MessageContextImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/MessageContextImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/MessageContextImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/MessageContextImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/MessageHandlerContextImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/MessageHandlerContextImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/MessageHandlerContextImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/MessageHandlerContextImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/MessageUpdatableContext.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/MessageUpdatableContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/MessageUpdatableContext.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/MessageUpdatableContext.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/PortInfoImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/PortInfoImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/PortInfoImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/PortInfoImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/SOAPHandlerProcessor.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/SOAPHandlerProcessor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/SOAPHandlerProcessor.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/SOAPHandlerProcessor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/SOAPMessageContextImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/SOAPMessageContextImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/SOAPMessageContextImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/SOAPMessageContextImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/ServerLogicalHandlerTube.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ServerLogicalHandlerTube.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/ServerLogicalHandlerTube.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ServerLogicalHandlerTube.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/ServerMessageHandlerTube.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ServerMessageHandlerTube.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/ServerMessageHandlerTube.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ServerMessageHandlerTube.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/ServerSOAPHandlerTube.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ServerSOAPHandlerTube.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/ServerSOAPHandlerTube.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ServerSOAPHandlerTube.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/XMLHandlerProcessor.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/XMLHandlerProcessor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/XMLHandlerProcessor.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/XMLHandlerProcessor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/AbstractHeaderImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/AbstractHeaderImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/AbstractHeaderImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/AbstractHeaderImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/AbstractMessageImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/AbstractMessageImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/AbstractMessageImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/AbstractMessageImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/AttachmentSetImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/AttachmentSetImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/AttachmentSetImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/AttachmentSetImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/AttachmentUnmarshallerImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/AttachmentUnmarshallerImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/AttachmentUnmarshallerImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/AttachmentUnmarshallerImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/ByteArrayAttachment.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/ByteArrayAttachment.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/ByteArrayAttachment.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/ByteArrayAttachment.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/DOMHeader.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/DOMHeader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/DOMHeader.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/DOMHeader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/DOMMessage.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/DOMMessage.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/DOMMessage.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/DOMMessage.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/DataHandlerAttachment.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/DataHandlerAttachment.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/DataHandlerAttachment.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/DataHandlerAttachment.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/EmptyMessageImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/EmptyMessageImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/EmptyMessageImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/EmptyMessageImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/FaultDetailHeader.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/FaultDetailHeader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/FaultDetailHeader.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/FaultDetailHeader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/FaultMessage.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/FaultMessage.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/FaultMessage.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/FaultMessage.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/JAXBAttachment.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/JAXBAttachment.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/JAXBAttachment.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/JAXBAttachment.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/MimeAttachmentSet.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/MimeAttachmentSet.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/MimeAttachmentSet.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/MimeAttachmentSet.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/PayloadElementSniffer.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/PayloadElementSniffer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/PayloadElementSniffer.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/PayloadElementSniffer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/ProblemActionHeader.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/ProblemActionHeader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/ProblemActionHeader.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/ProblemActionHeader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/RelatesToHeader.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/RelatesToHeader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/RelatesToHeader.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/RelatesToHeader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/RootElementSniffer.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/RootElementSniffer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/RootElementSniffer.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/RootElementSniffer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/StringHeader.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/StringHeader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/StringHeader.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/StringHeader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/Util.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/Util.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/Util.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/Util.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/XMLReaderImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/XMLReaderImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/XMLReaderImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/XMLReaderImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/AttachmentMarshallerImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/AttachmentMarshallerImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/AttachmentMarshallerImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/AttachmentMarshallerImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/JAXBBridgeSource.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBBridgeSource.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/JAXBBridgeSource.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBBridgeSource.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/JAXBDispatchMessage.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBDispatchMessage.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/JAXBDispatchMessage.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBDispatchMessage.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/JAXBHeader.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBHeader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/JAXBHeader.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBHeader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/MarshallerBridge.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/MarshallerBridge.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/MarshallerBridge.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/MarshallerBridge.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/package-info.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/package-info.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/package-info.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/package-info.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/saaj/SAAJHeader.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/saaj/SAAJHeader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/saaj/SAAJHeader.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/saaj/SAAJHeader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/saaj/SAAJMessage.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/saaj/SAAJMessage.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/saaj/SAAJMessage.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/saaj/SAAJMessage.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/source/PayloadSourceMessage.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/source/PayloadSourceMessage.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/source/PayloadSourceMessage.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/source/PayloadSourceMessage.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/source/ProtocolSourceMessage.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/source/ProtocolSourceMessage.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/source/ProtocolSourceMessage.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/source/ProtocolSourceMessage.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/source/SourceUtils.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/source/SourceUtils.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/source/SourceUtils.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/source/SourceUtils.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/stream/OutboundStreamHeader.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/OutboundStreamHeader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/stream/OutboundStreamHeader.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/OutboundStreamHeader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/stream/PayloadStreamReaderMessage.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/PayloadStreamReaderMessage.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/stream/PayloadStreamReaderMessage.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/PayloadStreamReaderMessage.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/stream/StreamAttachment.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/StreamAttachment.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/stream/StreamAttachment.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/StreamAttachment.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/stream/StreamHeader.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/stream/StreamHeader.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/stream/StreamHeader11.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader11.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/stream/StreamHeader11.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader11.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/stream/StreamHeader12.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader12.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/stream/StreamHeader12.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader12.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/stream/StreamMessage.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/StreamMessage.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/stream/StreamMessage.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/StreamMessage.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/AbstractSEIModelImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/AbstractSEIModelImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/AbstractSEIModelImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/AbstractSEIModelImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/AbstractWrapperBeanGenerator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/AbstractWrapperBeanGenerator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/AbstractWrapperBeanGenerator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/AbstractWrapperBeanGenerator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/CheckedExceptionImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/CheckedExceptionImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/CheckedExceptionImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/CheckedExceptionImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/ExternalMetadataReader.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/ExternalMetadataReader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/ExternalMetadataReader.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/ExternalMetadataReader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/FieldSignature.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/FieldSignature.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/FieldSignature.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/FieldSignature.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/Injector.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/Injector.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/Injector.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/Injector.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/JavaMethodImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/JavaMethodImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/JavaMethodImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/JavaMethodImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/ParameterImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/ParameterImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/ParameterImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/ParameterImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/ReflectAnnotationReader.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/ReflectAnnotationReader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/ReflectAnnotationReader.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/ReflectAnnotationReader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/RuntimeModeler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/RuntimeModeler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/RuntimeModeler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/RuntimeModeler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/RuntimeModelerException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/RuntimeModelerException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/RuntimeModelerException.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/RuntimeModelerException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/SOAPSEIModel.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/SOAPSEIModel.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/SOAPSEIModel.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/SOAPSEIModel.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/Utils.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/Utils.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/Utils.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/Utils.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/WrapperBeanGenerator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/WrapperBeanGenerator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/WrapperBeanGenerator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/WrapperBeanGenerator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/WrapperParameter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/WrapperParameter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/WrapperParameter.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/WrapperParameter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/soap/SOAPBindingImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/soap/SOAPBindingImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/soap/SOAPBindingImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/soap/SOAPBindingImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/AbstractExtensibleImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/AbstractExtensibleImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/AbstractExtensibleImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/AbstractExtensibleImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/AbstractFeaturedObjectImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/AbstractFeaturedObjectImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/AbstractFeaturedObjectImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/AbstractFeaturedObjectImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/AbstractObjectImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/AbstractObjectImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/AbstractObjectImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/AbstractObjectImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundFaultImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundFaultImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundFaultImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundFaultImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundOperationImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundOperationImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundOperationImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundOperationImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundPortTypeImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundPortTypeImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundPortTypeImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundPortTypeImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLDirectProperties.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLDirectProperties.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLDirectProperties.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLDirectProperties.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLFaultImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLFaultImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLFaultImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLFaultImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLInputImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLInputImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLInputImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLInputImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLMessageImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLMessageImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLMessageImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLMessageImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLModelImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLModelImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLModelImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLModelImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLOperationImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLOperationImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLOperationImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLOperationImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLOutputImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLOutputImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLOutputImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLOutputImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLPartDescriptorImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPartDescriptorImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLPartDescriptorImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPartDescriptorImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLPartImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPartImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLPartImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPartImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLPortImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPortImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLPortImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPortImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLPortProperties.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPortProperties.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLPortProperties.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPortProperties.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLPortTypeImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPortTypeImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLPortTypeImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPortTypeImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLProperties.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLProperties.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLProperties.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLProperties.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLServiceImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLServiceImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLServiceImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLServiceImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationVisitor.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationVisitor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationVisitor.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationVisitor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationWriter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationWriter.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/Attribute.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Attribute.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/Attribute.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Attribute.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/ByteVector.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ByteVector.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/ByteVector.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ByteVector.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassAdapter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassAdapter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassAdapter.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassAdapter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassReader.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassReader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassReader.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassReader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassVisitor.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassVisitor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassVisitor.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassVisitor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassWriter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassWriter.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/Edge.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Edge.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/Edge.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Edge.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldVisitor.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldVisitor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldVisitor.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldVisitor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldWriter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldWriter.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/Frame.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Frame.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/Frame.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Frame.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/Handler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Handler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/Handler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Handler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/Item.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Item.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/Item.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Item.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/Label.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Label.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/Label.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Label.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodAdapter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodAdapter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodAdapter.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodAdapter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodVisitor.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodVisitor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodVisitor.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodVisitor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodWriter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodWriter.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/Opcodes.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Opcodes.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/Opcodes.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Opcodes.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/Type.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Type.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/Type.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Type.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/package-info.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/package-info.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/AssertionSet.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/AssertionSet.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/AssertionSet.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/AssertionSet.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/AssertionValidationProcessor.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/AssertionValidationProcessor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/AssertionValidationProcessor.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/AssertionValidationProcessor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/ComplexAssertion.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/ComplexAssertion.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/ComplexAssertion.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/ComplexAssertion.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/EffectiveAlternativeSelector.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/EffectiveAlternativeSelector.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/EffectiveAlternativeSelector.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/EffectiveAlternativeSelector.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/EffectivePolicyModifier.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/EffectivePolicyModifier.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/EffectivePolicyModifier.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/EffectivePolicyModifier.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/NestedPolicy.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/NestedPolicy.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/NestedPolicy.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/NestedPolicy.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/Policy.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/Policy.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/Policy.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/Policy.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyAssertion.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyAssertion.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyAssertion.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyAssertion.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyConstants.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyConstants.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyConstants.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyConstants.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyException.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyIntersector.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyIntersector.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyIntersector.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyIntersector.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMap.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMap.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMap.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMap.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapExtender.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMapExtender.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapExtender.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMapExtender.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapKey.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMapKey.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapKey.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMapKey.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapKeyHandler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMapKeyHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapKeyHandler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMapKeyHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapMutator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMapMutator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapMutator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMapMutator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapUtil.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMapUtil.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapUtil.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMapUtil.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMerger.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMerger.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMerger.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMerger.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyScope.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyScope.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyScope.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyScope.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicySubject.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicySubject.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicySubject.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicySubject.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/SimpleAssertion.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/SimpleAssertion.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/SimpleAssertion.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/SimpleAssertion.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerEndpointScope.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerEndpointScope.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerEndpointScope.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerEndpointScope.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerMessageScope.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerMessageScope.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerMessageScope.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerMessageScope.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerOperationScope.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerOperationScope.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerOperationScope.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerOperationScope.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerServiceScope.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerServiceScope.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerServiceScope.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerServiceScope.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/DefaultPolicyResolver.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/DefaultPolicyResolver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/DefaultPolicyResolver.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/DefaultPolicyResolver.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/PolicyMapBuilder.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/PolicyMapBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/PolicyMapBuilder.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/PolicyMapBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/PolicyUtil.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/PolicyUtil.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/PolicyUtil.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/PolicyUtil.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/PolicyWSDLGeneratorExtension.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/PolicyWSDLGeneratorExtension.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/PolicyWSDLGeneratorExtension.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/PolicyWSDLGeneratorExtension.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/PolicyWSDLParserExtension.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/PolicyWSDLParserExtension.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/PolicyWSDLParserExtension.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/PolicyWSDLParserExtension.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/SafePolicyReader.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/SafePolicyReader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/SafePolicyReader.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/SafePolicyReader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/WSDLBoundFaultContainer.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/WSDLBoundFaultContainer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/WSDLBoundFaultContainer.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/WSDLBoundFaultContainer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/spi/PolicyFeatureConfigurator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/spi/PolicyFeatureConfigurator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/spi/PolicyFeatureConfigurator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/spi/PolicyFeatureConfigurator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/spi/PolicyMapConfigurator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/spi/PolicyMapConfigurator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/spi/PolicyMapConfigurator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/spi/PolicyMapConfigurator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/package-info.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/package-info.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/Localization.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/Localization.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/Localization.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/Localization.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/LocalizationMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/LocalizationMessages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/LocalizationMessages.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/LocalizationMessages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/MethodUtil.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/MethodUtil.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/MethodUtil.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/MethodUtil.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyLogger.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/PolicyLogger.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyLogger.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/PolicyLogger.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/RuntimePolicyUtilsException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/RuntimePolicyUtilsException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/RuntimePolicyUtilsException.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/RuntimePolicyUtilsException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/ServiceConfigurationError.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/ServiceConfigurationError.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/ServiceConfigurationError.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/ServiceConfigurationError.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/ServiceFinder.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/ServiceFinder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/ServiceFinder.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/ServiceFinder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/package-info.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/package-info.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/AssertionData.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/AssertionData.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/AssertionData.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/AssertionData.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/CompactModelGenerator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/CompactModelGenerator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/CompactModelGenerator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/CompactModelGenerator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/DefaultPolicyAssertionCreator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/DefaultPolicyAssertionCreator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/DefaultPolicyAssertionCreator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/DefaultPolicyAssertionCreator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/ModelNode.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/ModelNode.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/ModelNode.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/ModelNode.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/NormalizedModelGenerator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/NormalizedModelGenerator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/NormalizedModelGenerator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/NormalizedModelGenerator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelGenerator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelGenerator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelGenerator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelGenerator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelMarshaller.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelMarshaller.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelMarshaller.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelMarshaller.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelTranslator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelTranslator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelTranslator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelTranslator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelUnmarshaller.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelUnmarshaller.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelUnmarshaller.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelUnmarshaller.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyReferenceData.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyReferenceData.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyReferenceData.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyReferenceData.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModel.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModel.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModel.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModel.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModelContext.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModelContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModelContext.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModelContext.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/XmlPolicyModelMarshaller.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/XmlPolicyModelMarshaller.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/XmlPolicyModelMarshaller.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/XmlPolicyModelMarshaller.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/XmlPolicyModelUnmarshaller.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/XmlPolicyModelUnmarshaller.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/XmlPolicyModelUnmarshaller.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/XmlPolicyModelUnmarshaller.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ExternalAttachmentsUnmarshaller.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ExternalAttachmentsUnmarshaller.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ExternalAttachmentsUnmarshaller.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ExternalAttachmentsUnmarshaller.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/package-info.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/package-info.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/package-info.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/package-info.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/wspolicy/NamespaceVersion.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/wspolicy/NamespaceVersion.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/wspolicy/NamespaceVersion.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/wspolicy/NamespaceVersion.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/wspolicy/XmlToken.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/wspolicy/XmlToken.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/wspolicy/XmlToken.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/wspolicy/XmlToken.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/AbstractQNameValidator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/AbstractQNameValidator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/AbstractQNameValidator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/AbstractQNameValidator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/AssertionCreationException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/AssertionCreationException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/AssertionCreationException.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/AssertionCreationException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/PolicyAssertionCreator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/PolicyAssertionCreator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/PolicyAssertionCreator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/PolicyAssertionCreator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/PolicyAssertionValidator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/PolicyAssertionValidator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/PolicyAssertionValidator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/PolicyAssertionValidator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/PrefixMapper.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/PrefixMapper.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/PrefixMapper.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/PrefixMapper.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/package-info.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/package-info.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/subject/PolicyMapKeyConverter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/subject/PolicyMapKeyConverter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/subject/PolicyMapKeyConverter.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/subject/PolicyMapKeyConverter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/subject/WsdlBindingSubject.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/subject/WsdlBindingSubject.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/subject/WsdlBindingSubject.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/subject/WsdlBindingSubject.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/subject/package-info.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/subject/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/subject/package-info.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/subject/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/protocol/soap/ClientMUTube.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/soap/ClientMUTube.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/protocol/soap/ClientMUTube.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/soap/ClientMUTube.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/protocol/soap/MUTube.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/soap/MUTube.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/protocol/soap/MUTube.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/soap/MUTube.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/protocol/soap/MessageCreationException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/soap/MessageCreationException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/protocol/soap/MessageCreationException.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/soap/MessageCreationException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/protocol/soap/ServerMUTube.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/soap/ServerMUTube.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/protocol/soap/ServerMUTube.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/soap/ServerMUTube.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/protocol/soap/VersionMismatchException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/soap/VersionMismatchException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/protocol/soap/VersionMismatchException.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/soap/VersionMismatchException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/protocol/xml/XMLMessageException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/xml/XMLMessageException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/protocol/xml/XMLMessageException.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/xml/XMLMessageException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/AddressingMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/AddressingMessages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/AddressingMessages.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/AddressingMessages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/BindingApiMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/BindingApiMessages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/BindingApiMessages.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/BindingApiMessages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/ClientMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ClientMessages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/ClientMessages.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ClientMessages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/DispatchMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/DispatchMessages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/DispatchMessages.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/DispatchMessages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/EncodingMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/EncodingMessages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/EncodingMessages.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/EncodingMessages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/HandlerMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/HandlerMessages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/HandlerMessages.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/HandlerMessages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/HttpserverMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/HttpserverMessages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/HttpserverMessages.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/HttpserverMessages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/ManagementMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ManagementMessages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/ManagementMessages.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ManagementMessages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/ModelerMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ModelerMessages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/ModelerMessages.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ModelerMessages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/PolicyMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/PolicyMessages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/PolicyMessages.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/PolicyMessages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/ProviderApiMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ProviderApiMessages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/ProviderApiMessages.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ProviderApiMessages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/SenderMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/SenderMessages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/SenderMessages.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/SenderMessages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/ServerMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ServerMessages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/ServerMessages.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ServerMessages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/SoapMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/SoapMessages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/SoapMessages.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/SoapMessages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/StreamingMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/StreamingMessages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/StreamingMessages.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/StreamingMessages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/TubelineassemblyMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/TubelineassemblyMessages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/TubelineassemblyMessages.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/TubelineassemblyMessages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/UtilMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/UtilMessages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/UtilMessages.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/UtilMessages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/WsdlmodelMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/WsdlmodelMessages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/WsdlmodelMessages.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/WsdlmodelMessages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/WsservletMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/WsservletMessages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/WsservletMessages.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/WsservletMessages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/XmlmessageMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/XmlmessageMessages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/XmlmessageMessages.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/XmlmessageMessages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/addressing.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/addressing.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/addressing_de.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/addressing_de.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/addressing_es.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/addressing_es.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/addressing_fr.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/addressing_fr.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/addressing_it.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/addressing_it.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/addressing_ja.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/addressing_ja.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/addressing_ko.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/addressing_ko.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/addressing_pt_BR.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/addressing_pt_BR.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/addressing_zh_CN.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/addressing_zh_CN.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/addressing_zh_TW.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/addressing_zh_TW.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/bindingApi.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/bindingApi.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/bindingApi_de.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/bindingApi_de.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/bindingApi_es.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/bindingApi_es.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/bindingApi_fr.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/bindingApi_fr.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/bindingApi_it.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/bindingApi_it.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/bindingApi_ja.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/bindingApi_ja.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/bindingApi_ko.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/bindingApi_ko.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/bindingApi_pt_BR.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/bindingApi_pt_BR.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/bindingApi_zh_CN.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/bindingApi_zh_CN.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/bindingApi_zh_TW.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/bindingApi_zh_TW.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/client.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/client.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/client_de.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/client_de.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/client_es.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/client_es.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/client_fr.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/client_fr.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/client_it.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/client_it.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/client_ja.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/client_ja.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/client_ko.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/client_ko.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/client_pt_BR.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/client_pt_BR.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/client_zh_CN.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/client_zh_CN.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/client_zh_TW.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/client_zh_TW.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/dispatch.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/dispatch.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/dispatch_de.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/dispatch_de.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/dispatch_es.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/dispatch_es.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/dispatch_fr.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/dispatch_fr.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/dispatch_it.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/dispatch_it.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/dispatch_ja.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/dispatch_ja.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/dispatch_ko.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/dispatch_ko.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/dispatch_pt_BR.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/dispatch_pt_BR.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/dispatch_zh_CN.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/dispatch_zh_CN.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/dispatch_zh_TW.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/dispatch_zh_TW.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/encoding.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/encoding.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/encoding_de.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/encoding_de.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/encoding_es.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/encoding_es.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/encoding_fr.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/encoding_fr.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/encoding_it.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/encoding_it.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/encoding_ja.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/encoding_ja.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/encoding_ko.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/encoding_ko.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/encoding_pt_BR.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/encoding_pt_BR.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/encoding_zh_CN.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/encoding_zh_CN.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/encoding_zh_TW.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/encoding_zh_TW.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/handler.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/handler.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/handler_de.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/handler_de.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/handler_es.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/handler_es.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/handler_fr.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/handler_fr.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/handler_it.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/handler_it.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/handler_ja.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/handler_ja.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/handler_ko.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/handler_ko.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/handler_pt_BR.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/handler_pt_BR.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/handler_zh_CN.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/handler_zh_CN.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/handler_zh_TW.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/handler_zh_TW.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/httpserver.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/httpserver.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/httpserver_de.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/httpserver_de.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/httpserver_es.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/httpserver_es.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/httpserver_fr.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/httpserver_fr.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/httpserver_it.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/httpserver_it.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/httpserver_ja.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/httpserver_ja.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/httpserver_ko.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/httpserver_ko.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/httpserver_pt_BR.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/httpserver_pt_BR.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/httpserver_zh_CN.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/httpserver_zh_CN.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/httpserver_zh_TW.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/httpserver_zh_TW.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/management.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/management.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/management_de.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/management_de.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/management_es.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/management_es.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/management_fr.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/management_fr.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/management_it.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/management_it.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/management_ja.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/management_ja.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/management_ko.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/management_ko.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/management_pt_BR.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/management_pt_BR.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/management_zh_CN.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/management_zh_CN.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/management_zh_TW.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/management_zh_TW.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/modeler.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/modeler.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/modeler_de.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/modeler_de.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/modeler_es.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/modeler_es.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/modeler_fr.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/modeler_fr.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/modeler_it.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/modeler_it.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/modeler_ja.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/modeler_ja.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/modeler_ko.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/modeler_ko.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/modeler_pt_BR.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/modeler_pt_BR.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/modeler_zh_CN.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/modeler_zh_CN.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/modeler_zh_TW.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/modeler_zh_TW.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/policy.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/policy.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/policy_de.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/policy_de.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/policy_es.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/policy_es.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/policy_fr.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/policy_fr.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/policy_it.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/policy_it.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/policy_ja.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/policy_ja.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/policy_ko.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/policy_ko.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/policy_pt_BR.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/policy_pt_BR.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/policy_zh_CN.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/policy_zh_CN.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/policy_zh_TW.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/policy_zh_TW.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/providerApi.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/providerApi.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/providerApi_de.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/providerApi_de.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/providerApi_es.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/providerApi_es.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/providerApi_fr.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/providerApi_fr.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/providerApi_it.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/providerApi_it.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/providerApi_ja.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/providerApi_ja.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/providerApi_ko.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/providerApi_ko.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/providerApi_pt_BR.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/providerApi_pt_BR.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/providerApi_zh_CN.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/providerApi_zh_CN.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/providerApi_zh_TW.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/providerApi_zh_TW.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/sender.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/sender.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/sender_de.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/sender_de.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/sender_es.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/sender_es.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/sender_fr.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/sender_fr.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/sender_it.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/sender_it.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/sender_ja.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/sender_ja.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/sender_ko.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/sender_ko.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/sender_pt_BR.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/sender_pt_BR.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/sender_zh_CN.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/sender_zh_CN.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/sender_zh_TW.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/sender_zh_TW.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/server.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/server.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/server_de.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/server_de.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/server_es.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/server_es.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/server_fr.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/server_fr.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/server_it.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/server_it.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/server_ja.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/server_ja.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/server_ko.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/server_ko.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/server_pt_BR.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/server_pt_BR.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/server_zh_CN.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/server_zh_CN.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/server_zh_TW.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/server_zh_TW.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/soap.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/soap.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/soap_de.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/soap_de.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/soap_es.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/soap_es.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/soap_fr.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/soap_fr.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/soap_it.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/soap_it.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/soap_ja.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/soap_ja.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/soap_ko.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/soap_ko.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/soap_pt_BR.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/soap_pt_BR.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/soap_zh_CN.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/soap_zh_CN.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/soap_zh_TW.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/soap_zh_TW.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/streaming.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/streaming.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/streaming_de.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/streaming_de.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/streaming_es.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/streaming_es.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/streaming_fr.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/streaming_fr.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/streaming_it.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/streaming_it.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/streaming_ja.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/streaming_ja.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/streaming_ko.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/streaming_ko.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/streaming_pt_BR.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/streaming_pt_BR.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/streaming_zh_CN.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/streaming_zh_CN.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/streaming_zh_TW.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/streaming_zh_TW.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/tubelineassembly.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/tubelineassembly.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/tubelineassembly.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/tubelineassembly.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/util.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/util.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/util_de.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/util_de.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/util_es.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/util_es.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/util_fr.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/util_fr.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/util_it.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/util_it.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/util_ja.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/util_ja.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/util_ko.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/util_ko.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/util_pt_BR.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/util_pt_BR.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/util_zh_CN.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/util_zh_CN.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/util_zh_TW.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/util_zh_TW.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsdlmodel.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsdlmodel.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsdlmodel_de.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsdlmodel_de.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsdlmodel_es.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsdlmodel_es.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsdlmodel_fr.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsdlmodel_fr.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsdlmodel_it.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsdlmodel_it.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsdlmodel_ja.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsdlmodel_ja.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsdlmodel_ko.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsdlmodel_ko.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsdlmodel_pt_BR.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsdlmodel_pt_BR.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsdlmodel_zh_CN.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsdlmodel_zh_CN.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsdlmodel_zh_TW.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsdlmodel_zh_TW.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsservlet.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsservlet.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsservlet_de.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsservlet_de.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsservlet_es.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsservlet_es.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsservlet_fr.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsservlet_fr.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsservlet_it.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsservlet_it.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsservlet_ja.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsservlet_ja.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsservlet_ko.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsservlet_ko.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsservlet_pt_BR.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsservlet_pt_BR.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsservlet_zh_CN.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsservlet_zh_CN.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsservlet_zh_TW.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsservlet_zh_TW.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/xmlmessage.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/xmlmessage.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/xmlmessage_de.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/xmlmessage_de.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/xmlmessage_es.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/xmlmessage_es.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/xmlmessage_fr.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/xmlmessage_fr.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/xmlmessage_it.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/xmlmessage_it.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/xmlmessage_ja.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/xmlmessage_ja.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/xmlmessage_ko.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/xmlmessage_ko.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/xmlmessage_pt_BR.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/xmlmessage_pt_BR.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/xmlmessage_zh_CN.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/xmlmessage_zh_CN.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/xmlmessage_zh_TW.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/xmlmessage_zh_TW.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/runtime/config/MetroConfig.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/MetroConfig.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/runtime/config/MetroConfig.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/MetroConfig.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/runtime/config/ObjectFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/ObjectFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/runtime/config/ObjectFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/ObjectFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/runtime/config/TubeFactoryConfig.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubeFactoryConfig.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/runtime/config/TubeFactoryConfig.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubeFactoryConfig.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/runtime/config/TubeFactoryList.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubeFactoryList.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/runtime/config/TubeFactoryList.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubeFactoryList.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/runtime/config/TubelineDefinition.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubelineDefinition.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/runtime/config/TubelineDefinition.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubelineDefinition.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/runtime/config/TubelineFeature.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubelineFeature.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/runtime/config/TubelineFeature.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubelineFeature.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/runtime/config/TubelineFeatureReader.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubelineFeatureReader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/runtime/config/TubelineFeatureReader.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubelineFeatureReader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/runtime/config/TubelineMapping.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubelineMapping.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/runtime/config/TubelineMapping.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubelineMapping.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/runtime/config/Tubelines.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/Tubelines.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/runtime/config/Tubelines.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/Tubelines.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/runtime/config/package-info.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/runtime/config/package-info.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/AbstractMultiInstanceResolver.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/AbstractMultiInstanceResolver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/AbstractMultiInstanceResolver.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/AbstractMultiInstanceResolver.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/AbstractWebServiceContext.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/AbstractWebServiceContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/AbstractWebServiceContext.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/AbstractWebServiceContext.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/DefaultResourceInjector.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/DefaultResourceInjector.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/DefaultResourceInjector.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/DefaultResourceInjector.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/DraconianValidationErrorHandler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/DraconianValidationErrorHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/DraconianValidationErrorHandler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/DraconianValidationErrorHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/EndpointAwareTube.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/EndpointAwareTube.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/EndpointAwareTube.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/EndpointAwareTube.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/EndpointFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/EndpointFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/EndpointFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/EndpointFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/EndpointMessageContextImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/EndpointMessageContextImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/EndpointMessageContextImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/EndpointMessageContextImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/InvokerTube.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/InvokerTube.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/InvokerTube.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/InvokerTube.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/MonitorBase.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/MonitorBase.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/MonitorBase.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/MonitorBase.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/MonitorRootService.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/MonitorRootService.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/MonitorRootService.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/MonitorRootService.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/SDDocumentImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/SDDocumentImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/SDDocumentImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/SDDocumentImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/ServerPropertyConstants.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/ServerPropertyConstants.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/ServerPropertyConstants.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/ServerPropertyConstants.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/ServerRtException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/ServerRtException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/ServerRtException.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/ServerRtException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/ServerSchemaValidationTube.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/ServerSchemaValidationTube.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/ServerSchemaValidationTube.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/ServerSchemaValidationTube.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/ServiceDefinitionImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/ServiceDefinitionImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/ServiceDefinitionImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/ServiceDefinitionImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/SingletonResolver.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/SingletonResolver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/SingletonResolver.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/SingletonResolver.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/UnsupportedMediaException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/UnsupportedMediaException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/UnsupportedMediaException.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/UnsupportedMediaException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/WSDLGenResolver.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/WSDLGenResolver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/WSDLGenResolver.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/WSDLGenResolver.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/WSEndpointImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/WSEndpointImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/WSEndpointImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/WSEndpointImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/WSEndpointMOMProxy.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/WSEndpointMOMProxy.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/WSEndpointMOMProxy.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/WSEndpointMOMProxy.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/package-info.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/package-info.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/provider/AsyncProviderInvokerTube.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/AsyncProviderInvokerTube.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/provider/AsyncProviderInvokerTube.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/AsyncProviderInvokerTube.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/provider/MessageProviderArgumentBuilder.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/MessageProviderArgumentBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/provider/MessageProviderArgumentBuilder.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/MessageProviderArgumentBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/provider/ProviderArgumentsBuilder.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/ProviderArgumentsBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/provider/ProviderArgumentsBuilder.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/ProviderArgumentsBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/provider/ProviderEndpointModel.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/ProviderEndpointModel.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/provider/ProviderEndpointModel.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/ProviderEndpointModel.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/provider/ProviderInvokerTube.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/ProviderInvokerTube.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/provider/ProviderInvokerTube.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/ProviderInvokerTube.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/provider/SOAPProviderArgumentBuilder.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/SOAPProviderArgumentBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/provider/SOAPProviderArgumentBuilder.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/SOAPProviderArgumentBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/provider/SyncProviderInvokerTube.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/SyncProviderInvokerTube.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/provider/SyncProviderInvokerTube.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/SyncProviderInvokerTube.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/provider/XMLProviderArgumentBuilder.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/XMLProviderArgumentBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/provider/XMLProviderArgumentBuilder.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/XMLProviderArgumentBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/EndpointArgumentsBuilder.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/EndpointArgumentsBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/EndpointArgumentsBuilder.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/EndpointArgumentsBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/EndpointResponseMessageBuilder.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/EndpointResponseMessageBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/EndpointResponseMessageBuilder.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/EndpointResponseMessageBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/EndpointValueSetter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/EndpointValueSetter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/EndpointValueSetter.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/EndpointValueSetter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/Invoker.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/Invoker.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/Invoker.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/Invoker.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/InvokerSource.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/InvokerSource.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/InvokerSource.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/InvokerSource.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/InvokerTube.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/InvokerTube.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/InvokerTube.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/InvokerTube.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/MessageFiller.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/MessageFiller.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/MessageFiller.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/MessageFiller.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/SEIInvokerTube.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/SEIInvokerTube.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/SEIInvokerTube.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/SEIInvokerTube.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/TieHandler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/TieHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/TieHandler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/TieHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/ValueGetter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/ValueGetter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/ValueGetter.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/ValueGetter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ContextClassloaderLocal.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/ContextClassloaderLocal.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ContextClassloaderLocal.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/ContextClassloaderLocal.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/commons/xmlutil/ContextClassloaderLocal.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/ContextClassloaderLocal.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/commons/xmlutil/ContextClassloaderLocal.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/ContextClassloaderLocal.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ProviderImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/ProviderImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ProviderImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/ProviderImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/BindingContext.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/BindingContext.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingContext.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/BindingContextFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingContextFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/BindingContextFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingContextFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/BindingHelper.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingHelper.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/BindingHelper.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingHelper.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/BindingInfo.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/BindingInfo.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/DatabindingException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/DatabindingException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/DatabindingException.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/DatabindingException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/DatabindingProvider.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/DatabindingProvider.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/DatabindingProvider.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/DatabindingProvider.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/FieldGetter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/FieldGetter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/FieldGetter.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/FieldGetter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/FieldSetter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/FieldSetter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/FieldSetter.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/FieldSetter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/JAXBWrapperAccessor.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/JAXBWrapperAccessor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/JAXBWrapperAccessor.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/JAXBWrapperAccessor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/MethodGetter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/MethodGetter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/MethodGetter.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/MethodGetter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/MethodSetter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/MethodSetter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/MethodSetter.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/MethodSetter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/OldBridge.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/OldBridge.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/OldBridge.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/OldBridge.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/PropertyAccessor.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/PropertyAccessor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/PropertyAccessor.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/PropertyAccessor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/PropertyGetter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/PropertyGetter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/PropertyGetter.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/PropertyGetter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/PropertyGetterBase.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/PropertyGetterBase.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/PropertyGetterBase.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/PropertyGetterBase.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/PropertySetter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/PropertySetter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/PropertySetter.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/PropertySetter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/PropertySetterBase.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/PropertySetterBase.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/PropertySetterBase.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/PropertySetterBase.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/RepeatedElementBridge.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/RepeatedElementBridge.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/RepeatedElementBridge.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/RepeatedElementBridge.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/TypeInfo.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/TypeInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/TypeInfo.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/TypeInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/Utils.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/Utils.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/Utils.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/Utils.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/WrapperAccessor.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/WrapperAccessor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/WrapperAccessor.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/WrapperAccessor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/WrapperBridge.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/WrapperBridge.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/WrapperBridge.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/WrapperBridge.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/WrapperComposite.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/WrapperComposite.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/WrapperComposite.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/WrapperComposite.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/XMLBridge.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/XMLBridge.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/XMLBridge.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/XMLBridge.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/Attributes.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/Attributes.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/Attributes.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/Attributes.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/DOMStreamReader.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/DOMStreamReader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/DOMStreamReader.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/DOMStreamReader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/MtomStreamWriter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/MtomStreamWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/MtomStreamWriter.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/MtomStreamWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/PrefixFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/PrefixFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/PrefixFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/PrefixFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/PrefixFactoryImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/PrefixFactoryImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/PrefixFactoryImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/PrefixFactoryImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/SourceReaderFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/SourceReaderFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/SourceReaderFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/SourceReaderFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/TidyXMLStreamReader.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/TidyXMLStreamReader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/TidyXMLStreamReader.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/TidyXMLStreamReader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/XMLReaderException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/XMLReaderException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/XMLReaderException.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/XMLReaderException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderException.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderUtil.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderUtil.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderUtil.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderUtil.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterException.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterUtil.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterUtil.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterUtil.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterUtil.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/DeferredTransportPipe.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/DeferredTransportPipe.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/DeferredTransportPipe.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/DeferredTransportPipe.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/Headers.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/Headers.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/Headers.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/Headers.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/DeploymentDescriptorParser.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/DeploymentDescriptorParser.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/DeploymentDescriptorParser.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/DeploymentDescriptorParser.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/HttpAdapter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/HttpAdapter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/HttpAdapter.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/HttpAdapter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/HttpAdapterList.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/HttpAdapterList.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/HttpAdapterList.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/HttpAdapterList.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/HttpMetadataPublisher.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/HttpMetadataPublisher.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/HttpMetadataPublisher.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/HttpMetadataPublisher.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/ResourceLoader.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/ResourceLoader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/ResourceLoader.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/ResourceLoader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/WSHTTPConnection.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/WSHTTPConnection.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/WSHTTPConnection.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/WSHTTPConnection.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/client/HttpClientTransport.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpClientTransport.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/client/HttpClientTransport.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpClientTransport.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/client/HttpResponseProperties.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpResponseProperties.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/client/HttpResponseProperties.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpResponseProperties.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/client/HttpTransportPipe.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpTransportPipe.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/client/HttpTransportPipe.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpTransportPipe.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/EndpointImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/EndpointImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/EndpointImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/EndpointImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/HttpEndpoint.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/HttpEndpoint.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/HttpEndpoint.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/HttpEndpoint.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/PortableConnectionImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/PortableConnectionImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/PortableConnectionImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/PortableConnectionImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/PortableHttpHandler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/PortableHttpHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/PortableHttpHandler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/PortableHttpHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/ServerAdapter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerAdapter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/ServerAdapter.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerAdapter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/ServerAdapterList.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerAdapterList.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/ServerAdapterList.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerAdapterList.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/ServerConnectionImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerConnectionImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/ServerConnectionImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerConnectionImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/ServerContainer.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerContainer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/ServerContainer.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerContainer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/ServerMgr.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerMgr.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/ServerMgr.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerMgr.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/WSHttpHandler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/WSHttpHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/WSHttpHandler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/WSHttpHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/ASCIIUtility.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ASCIIUtility.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/ASCIIUtility.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ASCIIUtility.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/ByteArrayBuffer.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ByteArrayBuffer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/ByteArrayBuffer.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ByteArrayBuffer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/ByteArrayDataSource.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ByteArrayDataSource.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/ByteArrayDataSource.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ByteArrayDataSource.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/CompletedFuture.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/CompletedFuture.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/CompletedFuture.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/CompletedFuture.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/Constants.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/Constants.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/Constants.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/Constants.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/DOMUtil.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/DOMUtil.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/DOMUtil.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/DOMUtil.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/FastInfosetReflection.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/FastInfosetReflection.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/FastInfosetReflection.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/FastInfosetReflection.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/FastInfosetUtil.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/FastInfosetUtil.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/FastInfosetUtil.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/FastInfosetUtil.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/HandlerAnnotationInfo.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/HandlerAnnotationInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/HandlerAnnotationInfo.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/HandlerAnnotationInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/HandlerAnnotationProcessor.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/HandlerAnnotationProcessor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/HandlerAnnotationProcessor.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/HandlerAnnotationProcessor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/InjectionPlan.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/InjectionPlan.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/InjectionPlan.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/InjectionPlan.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/JAXWSUtils.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/JAXWSUtils.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/JAXWSUtils.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/JAXWSUtils.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/MetadataUtil.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/MetadataUtil.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/MetadataUtil.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/MetadataUtil.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/NamespaceSupport.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/NamespaceSupport.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/NamespaceSupport.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/NamespaceSupport.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/NoCloseInputStream.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/NoCloseInputStream.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/NoCloseInputStream.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/NoCloseInputStream.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/NoCloseOutputStream.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/NoCloseOutputStream.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/NoCloseOutputStream.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/NoCloseOutputStream.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/Pool.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/Pool.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/Pool.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/Pool.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/QNameMap.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/QNameMap.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/QNameMap.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/QNameMap.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/ReadAllStream.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ReadAllStream.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/ReadAllStream.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ReadAllStream.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/RuntimeVersion.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/RuntimeVersion.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/RuntimeVersion.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/RuntimeVersion.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/ServiceConfigurationError.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ServiceConfigurationError.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/ServiceConfigurationError.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ServiceConfigurationError.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/ServiceFinder.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ServiceFinder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/ServiceFinder.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ServiceFinder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/StreamUtils.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/StreamUtils.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/StreamUtils.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/StreamUtils.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/StringUtils.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/StringUtils.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/StringUtils.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/StringUtils.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/UtilException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/UtilException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/UtilException.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/UtilException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/Version.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/Version.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/Version.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/Version.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/VersionUtil.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/VersionUtil.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/VersionUtil.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/VersionUtil.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/exception/LocatableWebServiceException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/exception/LocatableWebServiceException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/exception/LocatableWebServiceException.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/exception/LocatableWebServiceException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/pipe/DumpTube.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/DumpTube.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/pipe/DumpTube.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/DumpTube.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/pipe/StandalonePipeAssembler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/StandalonePipeAssembler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/pipe/StandalonePipeAssembler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/StandalonePipeAssembler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/pipe/StandaloneTubeAssembler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/StandaloneTubeAssembler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/pipe/StandaloneTubeAssembler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/StandaloneTubeAssembler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/resources/Messages_en.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/resources/Messages_en.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/resources/Messages_en_de.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/resources/Messages_en_de.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/resources/Messages_en_es.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/resources/Messages_en_es.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/resources/Messages_en_fr.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/resources/Messages_en_fr.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/resources/Messages_en_it.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/resources/Messages_en_it.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/resources/Messages_en_ja.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/resources/Messages_en_ja.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/resources/Messages_en_ko.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/resources/Messages_en_ko.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/resources/Messages_en_pt_BR.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/resources/Messages_en_pt_BR.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/resources/Messages_en_zh_CN.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/resources/Messages_en_zh_CN.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/resources/Messages_en_zh_TW.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/resources/Messages_en_zh_TW.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/version.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/version.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/version.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/version.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/CDATA.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/CDATA.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/CDATA.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/CDATA.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/ContentHandlerToXMLStreamWriter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/ContentHandlerToXMLStreamWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/ContentHandlerToXMLStreamWriter.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/ContentHandlerToXMLStreamWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/ContextClassloaderLocal.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/ContextClassloaderLocal.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/ContextClassloaderLocal.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/ContextClassloaderLocal.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ContextClassloaderLocal.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/ContextClassloaderLocal.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ContextClassloaderLocal.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/ContextClassloaderLocal.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/DummyLocation.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/DummyLocation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/DummyLocation.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/DummyLocation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/NamedNodeMapIterator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/NamedNodeMapIterator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/NamedNodeMapIterator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/NamedNodeMapIterator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/NamespaceContextExAdaper.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/NamespaceContextExAdaper.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/NamespaceContextExAdaper.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/NamespaceContextExAdaper.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/NodeListIterator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/NodeListIterator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/NodeListIterator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/NodeListIterator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/StAXResult.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/StAXResult.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/StAXResult.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/StAXResult.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/StAXSource.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/StAXSource.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/StAXSource.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/StAXSource.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XMLReaderComposite.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/XMLReaderComposite.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XMLReaderComposite.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/XMLReaderComposite.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderFilter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderFilter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderFilter.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderFilter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderToXMLStreamWriter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderToXMLStreamWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderToXMLStreamWriter.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderToXMLStreamWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XMLStreamWriterFilter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamWriterFilter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XMLStreamWriterFilter.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamWriterFilter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/ActionBasedOperationFinder.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/ActionBasedOperationFinder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/ActionBasedOperationFinder.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/ActionBasedOperationFinder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/ActionBasedOperationSignature.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/ActionBasedOperationSignature.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/ActionBasedOperationSignature.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/ActionBasedOperationSignature.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/DispatchException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/DispatchException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/DispatchException.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/DispatchException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/OperationDispatcher.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/OperationDispatcher.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/OperationDispatcher.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/OperationDispatcher.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/PayloadQNameBasedOperationFinder.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/PayloadQNameBasedOperationFinder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/PayloadQNameBasedOperationFinder.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/PayloadQNameBasedOperationFinder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/SDDocumentResolver.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/SDDocumentResolver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/SDDocumentResolver.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/SDDocumentResolver.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/SOAPActionBasedOperationFinder.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/SOAPActionBasedOperationFinder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/SOAPActionBasedOperationFinder.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/SOAPActionBasedOperationFinder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/WSDLOperationFinder.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/WSDLOperationFinder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/WSDLOperationFinder.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/WSDLOperationFinder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/DelegatingParserExtension.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/DelegatingParserExtension.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/DelegatingParserExtension.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/DelegatingParserExtension.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/EntityResolverWrapper.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/EntityResolverWrapper.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/EntityResolverWrapper.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/EntityResolverWrapper.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/ErrorHandler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/ErrorHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/ErrorHandler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/ErrorHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/FoolProofParserExtension.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/FoolProofParserExtension.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/FoolProofParserExtension.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/FoolProofParserExtension.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/InaccessibleWSDLException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/InaccessibleWSDLException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/InaccessibleWSDLException.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/InaccessibleWSDLException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/MIMEConstants.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/MIMEConstants.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/MIMEConstants.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/MIMEConstants.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/MemberSubmissionAddressingWSDLParserExtension.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/MemberSubmissionAddressingWSDLParserExtension.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/MemberSubmissionAddressingWSDLParserExtension.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/MemberSubmissionAddressingWSDLParserExtension.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/MexEntityResolver.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/MexEntityResolver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/MexEntityResolver.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/MexEntityResolver.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/ParserUtil.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/ParserUtil.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/ParserUtil.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/ParserUtil.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/RuntimeWSDLParser.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/RuntimeWSDLParser.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/RuntimeWSDLParser.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/RuntimeWSDLParser.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/SOAPConstants.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/SOAPConstants.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/SOAPConstants.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/SOAPConstants.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingMetadataWSDLParserExtension.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingMetadataWSDLParserExtension.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingMetadataWSDLParserExtension.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingMetadataWSDLParserExtension.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingWSDLParserExtension.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingWSDLParserExtension.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingWSDLParserExtension.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingWSDLParserExtension.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/WSDLConstants.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLConstants.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/WSDLConstants.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLConstants.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionContextImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionContextImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionContextImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionContextImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionFacade.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionFacade.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionFacade.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionFacade.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/DocumentLocationResolver.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/DocumentLocationResolver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/DocumentLocationResolver.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/DocumentLocationResolver.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/TXWContentHandler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/TXWContentHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/TXWContentHandler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/TXWContentHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/UsingAddressing.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/UsingAddressing.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/UsingAddressing.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/UsingAddressing.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/W3CAddressingMetadataWSDLGeneratorExtension.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/W3CAddressingMetadataWSDLGeneratorExtension.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/W3CAddressingMetadataWSDLGeneratorExtension.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/W3CAddressingMetadataWSDLGeneratorExtension.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/W3CAddressingWSDLGeneratorExtension.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/W3CAddressingWSDLGeneratorExtension.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/W3CAddressingWSDLGeneratorExtension.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/W3CAddressingWSDLGeneratorExtension.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGenerator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGenerator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGenerator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGenerator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGeneratorExtensionFacade.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGeneratorExtensionFacade.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGeneratorExtensionFacade.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGeneratorExtensionFacade.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/WSDLPatcher.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLPatcher.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/WSDLPatcher.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLPatcher.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/WSDLResolver.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLResolver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/WSDLResolver.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLResolver.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Binding.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Binding.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Binding.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Binding.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/BindingOperationType.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/BindingOperationType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/BindingOperationType.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/BindingOperationType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Definitions.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Definitions.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Definitions.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Definitions.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Documented.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Documented.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Documented.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Documented.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Fault.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Fault.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Fault.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Fault.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/FaultType.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/FaultType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/FaultType.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/FaultType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Import.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Import.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Import.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Import.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Message.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Message.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Message.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Message.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/OpenAtts.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/OpenAtts.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/OpenAtts.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/OpenAtts.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Operation.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Operation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Operation.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Operation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/ParamType.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/ParamType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/ParamType.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/ParamType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Part.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Part.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Part.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Part.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Port.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Port.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Port.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Port.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/PortType.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/PortType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/PortType.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/PortType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Service.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Service.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Service.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Service.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/StartWithExtensionsType.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/StartWithExtensionsType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/StartWithExtensionsType.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/StartWithExtensionsType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Types.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Types.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Types.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Types.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/http/Address.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/http/Address.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/http/Address.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/http/Address.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/http/Binding.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/http/Binding.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/http/Binding.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/http/Binding.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/http/Operation.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/http/Operation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/http/Operation.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/http/Operation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/http/package-info.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/http/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/http/package-info.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/http/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/package-info.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/package-info.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/Body.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/Body.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/Body.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/Body.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/BodyType.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/BodyType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/BodyType.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/BodyType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/Header.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/Header.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/Header.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/Header.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/HeaderFault.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/HeaderFault.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/HeaderFault.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/HeaderFault.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPAddress.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPAddress.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPAddress.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPAddress.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPBinding.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPBinding.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPBinding.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPBinding.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPFault.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPFault.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPFault.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPFault.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPOperation.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPOperation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPOperation.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPOperation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/package-info.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/package-info.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/Body.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/Body.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/Body.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/Body.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/BodyType.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/BodyType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/BodyType.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/BodyType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/Header.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/Header.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/Header.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/Header.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/HeaderFault.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/HeaderFault.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/HeaderFault.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/HeaderFault.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPAddress.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPAddress.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPAddress.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPAddress.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPBinding.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPBinding.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPBinding.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPBinding.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPFault.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPFault.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPFault.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPFault.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPOperation.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPOperation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPOperation.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPOperation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/package-info.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/package-info.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/Import.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/Import.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/Import.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/Import.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/Schema.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/Schema.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/Schema.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/Schema.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/package-info.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/package-info.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/package-info.java diff --git a/jaxws/src/share/jaxws_classes/javax/jws/HandlerChain.java b/jaxws/src/java.xml.ws/share/classes/javax/jws/HandlerChain.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/jws/HandlerChain.java rename to jaxws/src/java.xml.ws/share/classes/javax/jws/HandlerChain.java diff --git a/jaxws/src/share/jaxws_classes/javax/jws/Oneway.java b/jaxws/src/java.xml.ws/share/classes/javax/jws/Oneway.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/jws/Oneway.java rename to jaxws/src/java.xml.ws/share/classes/javax/jws/Oneway.java diff --git a/jaxws/src/share/jaxws_classes/javax/jws/WebMethod.java b/jaxws/src/java.xml.ws/share/classes/javax/jws/WebMethod.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/jws/WebMethod.java rename to jaxws/src/java.xml.ws/share/classes/javax/jws/WebMethod.java diff --git a/jaxws/src/share/jaxws_classes/javax/jws/WebParam.java b/jaxws/src/java.xml.ws/share/classes/javax/jws/WebParam.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/jws/WebParam.java rename to jaxws/src/java.xml.ws/share/classes/javax/jws/WebParam.java diff --git a/jaxws/src/share/jaxws_classes/javax/jws/WebResult.java b/jaxws/src/java.xml.ws/share/classes/javax/jws/WebResult.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/jws/WebResult.java rename to jaxws/src/java.xml.ws/share/classes/javax/jws/WebResult.java diff --git a/jaxws/src/share/jaxws_classes/javax/jws/WebService.java b/jaxws/src/java.xml.ws/share/classes/javax/jws/WebService.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/jws/WebService.java rename to jaxws/src/java.xml.ws/share/classes/javax/jws/WebService.java diff --git a/jaxws/src/share/jaxws_classes/javax/jws/soap/InitParam.java b/jaxws/src/java.xml.ws/share/classes/javax/jws/soap/InitParam.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/jws/soap/InitParam.java rename to jaxws/src/java.xml.ws/share/classes/javax/jws/soap/InitParam.java diff --git a/jaxws/src/share/jaxws_classes/javax/jws/soap/SOAPBinding.java b/jaxws/src/java.xml.ws/share/classes/javax/jws/soap/SOAPBinding.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/jws/soap/SOAPBinding.java rename to jaxws/src/java.xml.ws/share/classes/javax/jws/soap/SOAPBinding.java diff --git a/jaxws/src/share/jaxws_classes/javax/jws/soap/SOAPMessageHandler.java b/jaxws/src/java.xml.ws/share/classes/javax/jws/soap/SOAPMessageHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/jws/soap/SOAPMessageHandler.java rename to jaxws/src/java.xml.ws/share/classes/javax/jws/soap/SOAPMessageHandler.java diff --git a/jaxws/src/share/jaxws_classes/javax/jws/soap/SOAPMessageHandlers.java b/jaxws/src/java.xml.ws/share/classes/javax/jws/soap/SOAPMessageHandlers.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/jws/soap/SOAPMessageHandlers.java rename to jaxws/src/java.xml.ws/share/classes/javax/jws/soap/SOAPMessageHandlers.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/Action.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Action.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/Action.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Action.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/AsyncHandler.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/AsyncHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/AsyncHandler.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/AsyncHandler.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/Binding.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Binding.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/Binding.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Binding.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/BindingProvider.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/BindingProvider.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/BindingProvider.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/BindingProvider.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/BindingType.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/BindingType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/BindingType.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/BindingType.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/Dispatch.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Dispatch.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/Dispatch.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Dispatch.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/Endpoint.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Endpoint.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/Endpoint.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Endpoint.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/EndpointContext.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/EndpointContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/EndpointContext.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/EndpointContext.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/EndpointReference.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/EndpointReference.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/EndpointReference.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/EndpointReference.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/FaultAction.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/FaultAction.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/FaultAction.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/FaultAction.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/Holder.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Holder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/Holder.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Holder.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/LogicalMessage.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/LogicalMessage.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/LogicalMessage.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/LogicalMessage.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/ProtocolException.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/ProtocolException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/ProtocolException.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/ProtocolException.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/Provider.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Provider.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/Provider.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Provider.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/RequestWrapper.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/RequestWrapper.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/RequestWrapper.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/RequestWrapper.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/RespectBinding.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/RespectBinding.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/RespectBinding.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/RespectBinding.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/RespectBindingFeature.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/RespectBindingFeature.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/RespectBindingFeature.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/RespectBindingFeature.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/Response.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Response.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/Response.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Response.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/ResponseWrapper.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/ResponseWrapper.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/ResponseWrapper.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/ResponseWrapper.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/Service.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Service.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/Service.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Service.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/ServiceMode.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/ServiceMode.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/ServiceMode.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/ServiceMode.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/WebEndpoint.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebEndpoint.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/WebEndpoint.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebEndpoint.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/WebFault.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebFault.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/WebFault.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebFault.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceClient.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceClient.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceClient.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceClient.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceContext.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceContext.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceContext.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceException.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceException.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceException.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceFeature.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceFeature.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceFeature.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceFeature.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServicePermission.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServicePermission.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/WebServicePermission.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServicePermission.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceProvider.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceProvider.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceProvider.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceProvider.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceRef.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceRef.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceRef.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceRef.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceRefs.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceRefs.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceRefs.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceRefs.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/Handler.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/Handler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/handler/Handler.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/Handler.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/HandlerResolver.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/HandlerResolver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/handler/HandlerResolver.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/HandlerResolver.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/LogicalHandler.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/LogicalHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/handler/LogicalHandler.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/LogicalHandler.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/LogicalMessageContext.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/LogicalMessageContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/handler/LogicalMessageContext.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/LogicalMessageContext.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/MessageContext.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/MessageContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/handler/MessageContext.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/MessageContext.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/PortInfo.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/PortInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/handler/PortInfo.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/PortInfo.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/package.html b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/handler/package.html rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/package.html diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/soap/SOAPHandler.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/soap/SOAPHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/handler/soap/SOAPHandler.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/soap/SOAPHandler.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/soap/SOAPMessageContext.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/soap/SOAPMessageContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/handler/soap/SOAPMessageContext.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/soap/SOAPMessageContext.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/soap/package.html b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/soap/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/handler/soap/package.html rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/soap/package.html diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/http/HTTPBinding.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/http/HTTPBinding.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/http/HTTPBinding.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/http/HTTPBinding.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/http/HTTPException.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/http/HTTPException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/http/HTTPException.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/http/HTTPException.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/http/package.html b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/http/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/http/package.html rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/http/package.html diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/package.html b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/package.html rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/package.html diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/Addressing.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/Addressing.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/soap/Addressing.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/Addressing.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/AddressingFeature.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/AddressingFeature.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/soap/AddressingFeature.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/AddressingFeature.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/MTOM.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/MTOM.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/soap/MTOM.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/MTOM.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/MTOMFeature.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/MTOMFeature.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/soap/MTOMFeature.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/MTOMFeature.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/SOAPBinding.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/SOAPBinding.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/soap/SOAPBinding.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/SOAPBinding.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/SOAPFaultException.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/SOAPFaultException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/soap/SOAPFaultException.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/SOAPFaultException.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/package.html b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/soap/package.html rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/package.html diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/FactoryFinder.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/FactoryFinder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/spi/FactoryFinder.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/FactoryFinder.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/Invoker.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/Invoker.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/spi/Invoker.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/Invoker.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/Provider.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/Provider.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/spi/Provider.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/Provider.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/ServiceDelegate.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/ServiceDelegate.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/spi/ServiceDelegate.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/ServiceDelegate.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/WebServiceFeatureAnnotation.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/WebServiceFeatureAnnotation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/spi/WebServiceFeatureAnnotation.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/WebServiceFeatureAnnotation.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/http/HttpContext.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/http/HttpContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/spi/http/HttpContext.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/http/HttpContext.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/http/HttpExchange.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/http/HttpExchange.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/spi/http/HttpExchange.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/http/HttpExchange.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/http/HttpHandler.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/http/HttpHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/spi/http/HttpHandler.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/http/HttpHandler.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/http/package-info.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/http/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/spi/http/package-info.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/http/package-info.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/package.html b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/spi/package.html rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/package.html diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/wsaddressing/W3CEndpointReference.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReference.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/wsaddressing/W3CEndpointReference.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReference.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/wsaddressing/package-info.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/wsaddressing/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/wsaddressing/package-info.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/wsaddressing/package-info.java diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/wsaddressing/package.html b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/wsaddressing/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/javax/xml/ws/wsaddressing/package.html rename to jaxws/src/java.xml.ws/share/classes/javax/xml/ws/wsaddressing/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin b/jaxws/src/jdk.xml.bind/share/classes/META-INF/services/com.sun.tools.internal.xjc.Plugin similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin rename to jaxws/src/jdk.xml.bind/share/classes/META-INF/services/com.sun.tools.internal.xjc.Plugin diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/ClassType.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/ClassType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/ClassType.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/ClassType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/CodeWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/CodeWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/CodeWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/CodeWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JAnnotatable.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotatable.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JAnnotatable.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotatable.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JAnnotationArrayMember.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotationArrayMember.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JAnnotationArrayMember.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotationArrayMember.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JAnnotationStringValue.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotationStringValue.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JAnnotationStringValue.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotationStringValue.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JAnnotationUse.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotationUse.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JAnnotationUse.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotationUse.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JAnnotationValue.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotationValue.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JAnnotationValue.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotationValue.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JAnnotationWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotationWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JAnnotationWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotationWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JAnonymousClass.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnonymousClass.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JAnonymousClass.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnonymousClass.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JArray.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JArray.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JArray.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JArray.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JArrayClass.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JArrayClass.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JArrayClass.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JArrayClass.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JArrayCompRef.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JArrayCompRef.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JArrayCompRef.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JArrayCompRef.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JAssignment.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAssignment.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JAssignment.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAssignment.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JAssignmentTarget.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAssignmentTarget.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JAssignmentTarget.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAssignmentTarget.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JAtom.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAtom.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JAtom.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAtom.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JBlock.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JBlock.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JBlock.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JBlock.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JBreak.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JBreak.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JBreak.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JBreak.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JCase.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCase.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JCase.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCase.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JCast.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCast.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JCast.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCast.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JCatchBlock.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCatchBlock.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JCatchBlock.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCatchBlock.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JClass.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JClass.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JClass.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JClass.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JClassAlreadyExistsException.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JClassAlreadyExistsException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JClassAlreadyExistsException.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JClassAlreadyExistsException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JClassContainer.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JClassContainer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JClassContainer.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JClassContainer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JCodeModel.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCodeModel.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JCodeModel.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCodeModel.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JCommentPart.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCommentPart.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JCommentPart.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCommentPart.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JConditional.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JConditional.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JConditional.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JConditional.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JContinue.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JContinue.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JContinue.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JContinue.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JDeclaration.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDeclaration.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JDeclaration.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDeclaration.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JDefinedClass.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDefinedClass.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JDefinedClass.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDefinedClass.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JDirectClass.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDirectClass.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JDirectClass.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDirectClass.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JDoLoop.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDoLoop.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JDoLoop.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDoLoop.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JDocComment.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDocComment.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JDocComment.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDocComment.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JDocCommentable.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDocCommentable.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JDocCommentable.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDocCommentable.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JEnumConstant.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JEnumConstant.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JEnumConstant.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JEnumConstant.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JExpr.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpr.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JExpr.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpr.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JExpression.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpression.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JExpression.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpression.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JExpressionImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpressionImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JExpressionImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpressionImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JFieldRef.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JFieldRef.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JFieldRef.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JFieldRef.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JFieldVar.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JFieldVar.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JFieldVar.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JFieldVar.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JForEach.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JForEach.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JForEach.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JForEach.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JForLoop.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JForLoop.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JForLoop.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JForLoop.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JFormatter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JFormatter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JFormatter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JFormatter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JGenerable.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JGenerable.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JGenerable.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JGenerable.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JGenerifiable.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JGenerifiable.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JGenerifiable.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JGenerifiable.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JGenerifiableImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JGenerifiableImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JGenerifiableImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JGenerifiableImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JInvocation.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JInvocation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JInvocation.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JInvocation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JJavaName.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JJavaName.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JJavaName.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JJavaName.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JLabel.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JLabel.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JLabel.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JLabel.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JMethod.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JMethod.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JMethod.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JMethod.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JMod.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JMod.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JMod.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JMod.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JMods.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JMods.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JMods.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JMods.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JNarrowedClass.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JNarrowedClass.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JNarrowedClass.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JNarrowedClass.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JNullType.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JNullType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JNullType.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JNullType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JOp.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JOp.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JOp.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JOp.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JPackage.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JPackage.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JPackage.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JPackage.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JPrimitiveType.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JPrimitiveType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JPrimitiveType.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JPrimitiveType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JResourceFile.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JResourceFile.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JResourceFile.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JResourceFile.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JReturn.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JReturn.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JReturn.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JReturn.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JStatement.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JStatement.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JStatement.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JStatement.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JStringLiteral.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JStringLiteral.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JStringLiteral.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JStringLiteral.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JSwitch.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JSwitch.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JSwitch.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JSwitch.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JThrow.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JThrow.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JThrow.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JThrow.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JTryBlock.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JTryBlock.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JTryBlock.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JTryBlock.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JType.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JType.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JTypeVar.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JTypeVar.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JTypeVar.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JTypeVar.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JTypeWildcard.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JTypeWildcard.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JTypeWildcard.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JTypeWildcard.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JVar.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JVar.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JVar.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JVar.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JWhileLoop.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JWhileLoop.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JWhileLoop.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JWhileLoop.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/SecureLoader.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/SecureLoader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/SecureLoader.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/SecureLoader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/TypedAnnotationWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/TypedAnnotationWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/TypedAnnotationWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/TypedAnnotationWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/fmt/JBinaryFile.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JBinaryFile.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/fmt/JBinaryFile.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JBinaryFile.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/fmt/JPropertyFile.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JPropertyFile.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/fmt/JPropertyFile.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JPropertyFile.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/fmt/JSerializedObject.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JSerializedObject.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/fmt/JSerializedObject.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JSerializedObject.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/fmt/JStaticFile.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JStaticFile.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/fmt/JStaticFile.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JStaticFile.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/fmt/JStaticJavaFile.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JStaticJavaFile.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/fmt/JStaticJavaFile.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JStaticJavaFile.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/fmt/JTextFile.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JTextFile.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/fmt/JTextFile.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JTextFile.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/fmt/SecureLoader.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/SecureLoader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/fmt/SecureLoader.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/SecureLoader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/package-info.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/package-info.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/util/ClassNameComparator.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/util/ClassNameComparator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/util/ClassNameComparator.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/util/ClassNameComparator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/util/EncoderFactory.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/util/EncoderFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/util/EncoderFactory.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/util/EncoderFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/util/JavadocEscapeWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/util/JavadocEscapeWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/util/JavadocEscapeWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/util/JavadocEscapeWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/util/UnicodeEscapeWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/util/UnicodeEscapeWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/util/UnicodeEscapeWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/util/UnicodeEscapeWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/writer/FileCodeWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/FileCodeWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/writer/FileCodeWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/FileCodeWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/writer/FilterCodeWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/FilterCodeWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/writer/FilterCodeWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/FilterCodeWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/writer/OutputStreamCodeWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/OutputStreamCodeWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/writer/OutputStreamCodeWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/OutputStreamCodeWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/writer/ProgressCodeWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/ProgressCodeWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/writer/ProgressCodeWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/ProgressCodeWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/writer/PrologCodeWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/PrologCodeWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/writer/PrologCodeWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/PrologCodeWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/writer/SingleStreamCodeWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/SingleStreamCodeWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/writer/SingleStreamCodeWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/SingleStreamCodeWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/writer/ZipCodeWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/ZipCodeWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/writer/ZipCodeWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/ZipCodeWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/istack/internal/tools/DefaultAuthenticator.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/DefaultAuthenticator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/istack/internal/tools/DefaultAuthenticator.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/DefaultAuthenticator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/istack/internal/tools/MaskingClassLoader.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/MaskingClassLoader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/istack/internal/tools/MaskingClassLoader.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/MaskingClassLoader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/istack/internal/tools/SecureLoader.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/SecureLoader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/istack/internal/tools/SecureLoader.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/SecureLoader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/istack/internal/tools/package-info.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/istack/internal/tools/package-info.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ConfigReader.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ConfigReader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ConfigReader.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ConfigReader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_de.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_de.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_es.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_es.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_fr.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_fr.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_it.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_it.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_ja.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_ja.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_ko.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_ko.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_pt_BR.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_pt_BR.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_zh_CN.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_zh_CN.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_zh_TW.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_zh_TW.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/Messages.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/Messages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/Messages.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/Messages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/NGCCRuntimeEx.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/NGCCRuntimeEx.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/NGCCRuntimeEx.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/NGCCRuntimeEx.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/SchemaGenerator.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/SchemaGenerator.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/SchemaGeneratorFacade.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGeneratorFacade.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/SchemaGeneratorFacade.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGeneratorFacade.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/SecureLoader.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SecureLoader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/SecureLoader.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SecureLoader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/AnnotationParser.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/AnnotationParser.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/AnnotationParser.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/AnnotationParser.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/Const.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/Const.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/Const.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/Const.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/ErrorReceiverImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/ErrorReceiverImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/ErrorReceiverImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/ErrorReceiverImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/InlineAnnotationReaderImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/InlineAnnotationReaderImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/InlineAnnotationReaderImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/InlineAnnotationReaderImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_de.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_de.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_es.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_es.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_fr.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_fr.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_it.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_it.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_ja.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_ja.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_ko.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_ko.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_pt_BR.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_pt_BR.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_zh_CN.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_zh_CN.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_zh_TW.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_zh_TW.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/Messages.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/Messages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/Messages.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/Messages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/Options.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/Options.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/Options.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/Options.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/SchemaGenerator.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/SchemaGenerator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/SchemaGenerator.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/SchemaGenerator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/SecureLoader.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/SecureLoader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/SecureLoader.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/SecureLoader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/package.html b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/package.html rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/api/JXC.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/api/JXC.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/api/JXC.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/api/JXC.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/api/impl/j2s/JAXBModelImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/api/impl/j2s/JAXBModelImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/api/impl/j2s/JAXBModelImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/api/impl/j2s/JAXBModelImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/api/impl/j2s/JavaCompilerImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/api/impl/j2s/JavaCompilerImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/api/impl/j2s/JavaCompilerImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/api/impl/j2s/JavaCompilerImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Classes.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/Classes.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Classes.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/Classes.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Config.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/Config.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Config.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/Config.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCEventReceiver.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCEventReceiver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCEventReceiver.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCEventReceiver.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Schema.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/Schema.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Schema.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/Schema.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/config.xsd b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/config.xsd similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/config.xsd rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/config.xsd diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/AbortException.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/AbortException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/AbortException.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/AbortException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/BadCommandLineException.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/BadCommandLineException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/BadCommandLineException.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/BadCommandLineException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/ClassLoaderBuilder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/ClassLoaderBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/ClassLoaderBuilder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/ClassLoaderBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/ConsoleErrorReporter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/ConsoleErrorReporter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/ConsoleErrorReporter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/ConsoleErrorReporter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/Driver.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Driver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/Driver.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Driver.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/ErrorReceiver.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/ErrorReceiver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/ErrorReceiver.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/ErrorReceiver.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/Language.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Language.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/Language.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Language.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_de.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_de.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_es.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_es.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_fr.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_fr.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_it.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_it.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_ja.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_ja.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_ko.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_ko.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_pt_BR.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_pt_BR.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_zh_CN.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_zh_CN.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_zh_TW.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_zh_TW.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/Messages.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Messages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/Messages.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Messages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/ModelLoader.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/ModelLoader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/ModelLoader.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/ModelLoader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/Options.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Options.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/Options.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Options.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/Plugin.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Plugin.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/Plugin.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Plugin.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/ProgressCodeWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/ProgressCodeWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/ProgressCodeWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/ProgressCodeWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/SchemaCache.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/SchemaCache.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/SchemaCache.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/SchemaCache.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/SecureLoader.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/SecureLoader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/SecureLoader.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/SecureLoader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/XJCFacade.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/XJCFacade.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/XJCFacade.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/XJCFacade.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/XJCListener.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/XJCListener.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/XJCListener.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/XJCListener.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/addon/accessors/PluginImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/accessors/PluginImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/addon/accessors/PluginImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/accessors/PluginImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/addon/at_generated/PluginImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/at_generated/PluginImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/addon/at_generated/PluginImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/at_generated/PluginImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/addon/code_injector/Const.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/code_injector/Const.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/addon/code_injector/Const.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/code_injector/Const.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/addon/code_injector/PluginImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/code_injector/PluginImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/addon/code_injector/PluginImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/code_injector/PluginImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/addon/episode/PluginImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/episode/PluginImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/addon/episode/PluginImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/episode/PluginImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/addon/episode/package-info.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/episode/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/addon/episode/package-info.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/episode/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/addon/locator/SourceLocationAddOn.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/locator/SourceLocationAddOn.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/addon/locator/SourceLocationAddOn.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/locator/SourceLocationAddOn.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/addon/sync/SynchronizedMethodAddOn.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/sync/SynchronizedMethodAddOn.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/addon/sync/SynchronizedMethodAddOn.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/sync/SynchronizedMethodAddOn.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/ClassNameAllocator.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/ClassNameAllocator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/ClassNameAllocator.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/ClassNameAllocator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/ErrorListener.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/ErrorListener.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/ErrorListener.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/ErrorListener.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/J2SJAXBModel.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/J2SJAXBModel.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/J2SJAXBModel.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/J2SJAXBModel.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/JAXBModel.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/JAXBModel.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/JAXBModel.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/JAXBModel.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/JavaCompiler.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/JavaCompiler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/JavaCompiler.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/JavaCompiler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/Mapping.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/Mapping.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/Mapping.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/Mapping.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/Property.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/Property.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/Property.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/Property.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/Reference.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/Reference.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/Reference.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/Reference.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/S2JJAXBModel.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/S2JJAXBModel.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/S2JJAXBModel.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/S2JJAXBModel.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/SchemaCompiler.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/SchemaCompiler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/SchemaCompiler.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/SchemaCompiler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/SpecVersion.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/SpecVersion.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/SpecVersion.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/SpecVersion.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/TypeAndAnnotation.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/TypeAndAnnotation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/TypeAndAnnotation.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/TypeAndAnnotation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/XJC.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/XJC.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/XJC.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/XJC.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/AbstractMappingImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/AbstractMappingImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/AbstractMappingImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/AbstractMappingImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/BeanMappingImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/BeanMappingImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/BeanMappingImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/BeanMappingImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/DowngradingErrorHandler.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/DowngradingErrorHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/DowngradingErrorHandler.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/DowngradingErrorHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementAdapter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementAdapter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementAdapter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementAdapter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementCollectionAdapter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementCollectionAdapter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementCollectionAdapter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementCollectionAdapter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementMappingImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementMappingImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementMappingImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementMappingImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementSingleAdapter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementSingleAdapter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementSingleAdapter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementSingleAdapter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/JAXBModelImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/JAXBModelImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/JAXBModelImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/JAXBModelImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/PropertyImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/PropertyImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/PropertyImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/PropertyImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/SchemaCompilerImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/SchemaCompilerImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/SchemaCompilerImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/SchemaCompilerImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/TypeAndAnnotationImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/TypeAndAnnotationImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/TypeAndAnnotationImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/TypeAndAnnotationImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/package.html b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/package.html rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/package.html b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/package.html rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/ApClassLoader.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/ApClassLoader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/ApClassLoader.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/ApClassLoader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/FilerCodeWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/FilerCodeWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/FilerCodeWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/FilerCodeWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/Messages.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/Messages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/Messages.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/Messages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/Messages.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/Messages.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/Messages.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/Messages.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/Messages_de.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/Messages_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/Messages_de.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/Messages_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/Messages_es.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/Messages_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/Messages_es.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/Messages_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/Messages_fr.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/Messages_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/Messages_fr.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/Messages_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/Messages_it.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/Messages_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/Messages_it.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/Messages_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/Messages_ja.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/Messages_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/Messages_ja.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/Messages_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/Messages_ko.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/Messages_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/Messages_ko.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/Messages_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/Messages_pt_BR.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/Messages_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/Messages_pt_BR.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/Messages_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/Messages_zh_CN.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/Messages_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/Messages_zh_CN.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/Messages_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/Messages_zh_TW.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/Messages_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/Messages_zh_TW.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/Messages_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/ToolsJarNotFoundException.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/ToolsJarNotFoundException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/ToolsJarNotFoundException.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/ToolsJarNotFoundException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/package.html b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/package.html rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorOrderWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorOrderWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorOrderWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorOrderWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorTypeWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorTypeWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorTypeWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorTypeWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyAttributeWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyAttributeWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyAttributeWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyAttributeWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyElementWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyElementWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyElementWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyElementWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttachmentRefWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttachmentRefWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttachmentRefWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttachmentRefWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttributeWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttributeWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttributeWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttributeWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementDeclWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementDeclWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementDeclWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementDeclWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefsWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefsWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefsWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefsWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWrapperWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWrapperWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWrapperWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWrapperWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementsWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementsWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementsWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementsWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumValueWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumValueWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumValueWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumValueWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDREFWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDREFWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDREFWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDREFWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlInlineBinaryDataWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlInlineBinaryDataWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlInlineBinaryDataWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlInlineBinaryDataWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlJavaTypeAdapterWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlJavaTypeAdapterWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlJavaTypeAdapterWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlJavaTypeAdapterWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlListWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlListWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlListWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlListWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMimeTypeWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMimeTypeWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMimeTypeWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMimeTypeWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMixedWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMixedWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMixedWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMixedWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlNsWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlNsWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlNsWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlNsWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRegistryWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRegistryWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRegistryWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRegistryWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRootElementWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRootElementWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRootElementWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRootElementWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypeWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypeWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypeWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypeWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypesWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypesWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypesWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypesWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSeeAlsoWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSeeAlsoWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSeeAlsoWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSeeAlsoWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTransientWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTransientWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTransientWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTransientWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTypeWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTypeWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTypeWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTypeWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlValueWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlValueWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlValueWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlValueWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/ClassOutlineImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ClassOutlineImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/ClassOutlineImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ClassOutlineImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/DualObjectFactoryGenerator.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/DualObjectFactoryGenerator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/DualObjectFactoryGenerator.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/DualObjectFactoryGenerator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/ElementOutlineImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ElementOutlineImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/ElementOutlineImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ElementOutlineImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/ImplStructureStrategy.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ImplStructureStrategy.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/ImplStructureStrategy.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ImplStructureStrategy.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_de.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_de.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_es.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_es.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_fr.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_fr.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_it.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_it.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_ja.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_ja.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_ko.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_ko.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_pt_BR.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_pt_BR.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_zh_CN.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_zh_CN.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_zh_TW.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_zh_TW.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/Messages.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/Messages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/Messages.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/Messages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/MethodWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MethodWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/MethodWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MethodWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGenerator.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGenerator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGenerator.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGenerator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGeneratorImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGeneratorImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGeneratorImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGeneratorImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/PackageOutlineImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/PackageOutlineImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/PackageOutlineImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/PackageOutlineImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/PrivateObjectFactoryGenerator.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/PrivateObjectFactoryGenerator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/PrivateObjectFactoryGenerator.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/PrivateObjectFactoryGenerator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/PublicObjectFactoryGenerator.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/PublicObjectFactoryGenerator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/PublicObjectFactoryGenerator.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/PublicObjectFactoryGenerator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractField.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractField.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractField.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractField.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractFieldWithVar.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractFieldWithVar.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractFieldWithVar.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractFieldWithVar.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractListField.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractListField.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractListField.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractListField.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/ArrayField.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ArrayField.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/ArrayField.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ArrayField.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/ConstField.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ConstField.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/ConstField.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ConstField.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/ConstFieldRenderer.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ConstFieldRenderer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/ConstFieldRenderer.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ConstFieldRenderer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/ContentListField.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ContentListField.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/ContentListField.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ContentListField.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/DefaultFieldRenderer.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/DefaultFieldRenderer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/DefaultFieldRenderer.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/DefaultFieldRenderer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/DummyListField.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/DummyListField.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/DummyListField.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/DummyListField.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRenderer.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRenderer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRenderer.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRenderer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRendererFactory.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRendererFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRendererFactory.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRendererFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/GenericFieldRenderer.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/GenericFieldRenderer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/GenericFieldRenderer.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/GenericFieldRenderer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetField.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetField.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetField.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetField.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetFieldRenderer.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetFieldRenderer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetFieldRenderer.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetFieldRenderer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_de.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_de.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_es.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_es.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_fr.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_fr.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_it.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_it.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_ja.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_ja.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_ko.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_ko.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_pt_BR.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_pt_BR.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_zh_CN.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_zh_CN.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_zh_TW.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_zh_TW.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/Messages.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/Messages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/Messages.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/Messages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/NoExtendedContentField.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/NoExtendedContentField.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/NoExtendedContentField.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/NoExtendedContentField.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/SingleField.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SingleField.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/SingleField.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SingleField.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/SinglePrimitiveAccessField.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SinglePrimitiveAccessField.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/SinglePrimitiveAccessField.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SinglePrimitiveAccessField.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/UnboxedField.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UnboxedField.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/UnboxedField.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UnboxedField.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListField.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListField.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListField.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListField.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListFieldRenderer.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListFieldRenderer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListFieldRenderer.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListFieldRenderer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/package.html b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/package.html rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/package-info.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/package-info.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/util/BlockReference.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/util/BlockReference.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/util/BlockReference.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/util/BlockReference.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/util/ExistingBlockReference.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/util/ExistingBlockReference.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/util/ExistingBlockReference.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/util/ExistingBlockReference.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/util/LazyBlockReference.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/util/LazyBlockReference.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/util/LazyBlockReference.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/util/LazyBlockReference.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/util/WhitespaceNormalizer.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/util/WhitespaceNormalizer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/util/WhitespaceNormalizer.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/util/WhitespaceNormalizer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/AbstractCElement.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/AbstractCElement.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/AbstractCElement.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/AbstractCElement.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/AbstractCTypeInfoImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/AbstractCTypeInfoImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/AbstractCTypeInfoImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/AbstractCTypeInfoImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/AutoClassNameAllocator.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/AutoClassNameAllocator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/AutoClassNameAllocator.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/AutoClassNameAllocator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CAdapter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CAdapter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CAdapter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CAdapter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CArrayInfo.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CArrayInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CArrayInfo.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CArrayInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CAttributePropertyInfo.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CAttributePropertyInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CAttributePropertyInfo.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CAttributePropertyInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CBuiltinLeafInfo.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CBuiltinLeafInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CBuiltinLeafInfo.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CBuiltinLeafInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CClass.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CClass.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CClass.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CClass.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CClassInfo.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CClassInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CClassInfo.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CClassInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CClassInfoParent.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CClassInfoParent.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CClassInfoParent.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CClassInfoParent.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CClassRef.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CClassRef.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CClassRef.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CClassRef.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CCustomizable.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CCustomizable.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CCustomizable.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CCustomizable.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CCustomizations.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CCustomizations.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CCustomizations.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CCustomizations.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CDefaultValue.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CDefaultValue.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CDefaultValue.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CDefaultValue.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CElement.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CElement.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CElement.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CElement.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CElementInfo.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CElementInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CElementInfo.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CElementInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CElementPropertyInfo.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CElementPropertyInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CElementPropertyInfo.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CElementPropertyInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CEnumConstant.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CEnumConstant.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CEnumConstant.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CEnumConstant.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CEnumLeafInfo.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CEnumLeafInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CEnumLeafInfo.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CEnumLeafInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CNonElement.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CNonElement.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CNonElement.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CNonElement.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CPluginCustomization.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPluginCustomization.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CPluginCustomization.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPluginCustomization.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CPropertyVisitor.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPropertyVisitor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CPropertyVisitor.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPropertyVisitor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CReferencePropertyInfo.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CReferencePropertyInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CReferencePropertyInfo.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CReferencePropertyInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CSingleTypePropertyInfo.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CSingleTypePropertyInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CSingleTypePropertyInfo.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CSingleTypePropertyInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CTypeInfo.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CTypeInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CTypeInfo.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CTypeInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CTypeRef.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CTypeRef.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CTypeRef.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CTypeRef.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CValuePropertyInfo.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CValuePropertyInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CValuePropertyInfo.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CValuePropertyInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CWildcardTypeInfo.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CWildcardTypeInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CWildcardTypeInfo.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CWildcardTypeInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/ClassNameAllocatorWrapper.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/ClassNameAllocatorWrapper.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/ClassNameAllocatorWrapper.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/ClassNameAllocatorWrapper.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/Constructor.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/Constructor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/Constructor.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/Constructor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/Model.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/Model.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/Model.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/Model.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/Multiplicity.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/Multiplicity.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/Multiplicity.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/Multiplicity.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/Populatable.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/Populatable.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/Populatable.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/Populatable.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/SymbolSpace.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/SymbolSpace.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/SymbolSpace.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/SymbolSpace.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/TypeUse.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/TypeUse.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/TypeUse.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/TypeUse.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/TypeUseFactory.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/TypeUseFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/TypeUseFactory.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/TypeUseFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/TypeUseImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/TypeUseImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/TypeUseImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/TypeUseImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/EagerNClass.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNClass.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/EagerNClass.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNClass.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/NClass.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NClass.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/NClass.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NClass.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/NClassByJClass.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NClassByJClass.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/NClassByJClass.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NClassByJClass.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/NParameterizedType.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NParameterizedType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/NParameterizedType.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NParameterizedType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/NType.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/NType.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/Utils.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/Utils.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/Utils.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/Utils.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/package.html b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/package.html rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/package-info.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/package-info.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/Aspect.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/Aspect.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/Aspect.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/Aspect.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/ClassOutline.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/ClassOutline.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/ClassOutline.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/ClassOutline.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/ElementOutline.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/ElementOutline.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/ElementOutline.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/ElementOutline.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/EnumConstantOutline.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/EnumConstantOutline.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/EnumConstantOutline.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/EnumConstantOutline.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/EnumOutline.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/EnumOutline.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/EnumOutline.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/EnumOutline.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/FieldAccessor.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/FieldAccessor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/FieldAccessor.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/FieldAccessor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/FieldOutline.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/FieldOutline.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/FieldOutline.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/FieldOutline.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/Outline.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/Outline.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/Outline.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/Outline.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/PackageOutline.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/PackageOutline.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/PackageOutline.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/PackageOutline.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/package.html b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/package.html rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/package-info.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/package-info.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/AbstractExtensionBindingChecker.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/AbstractExtensionBindingChecker.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/AbstractExtensionBindingChecker.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/AbstractExtensionBindingChecker.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/Const.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/Const.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/Const.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/Const.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/ExtensionBindingChecker.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/ExtensionBindingChecker.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/ExtensionBindingChecker.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/ExtensionBindingChecker.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/MessageBundle.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/MessageBundle.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/MessageBundle_de.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/MessageBundle_de.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/MessageBundle_es.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/MessageBundle_es.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/MessageBundle_fr.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/MessageBundle_fr.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/MessageBundle_it.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/MessageBundle_it.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/MessageBundle_ja.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/MessageBundle_ja.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/MessageBundle_ko.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/MessageBundle_ko.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/MessageBundle_pt_BR.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/MessageBundle_pt_BR.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/MessageBundle_zh_CN.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/MessageBundle_zh_CN.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/MessageBundle_zh_TW.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/MessageBundle_zh_TW.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/Messages.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/Messages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/Messages.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/Messages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/ModelChecker.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/ModelChecker.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/ModelChecker.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/ModelChecker.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/RawTypeSet.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/RawTypeSet.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/RawTypeSet.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/RawTypeSet.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/Ring.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/Ring.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/Ring.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/Ring.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/TypeUtil.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/TypeUtil.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/TypeUtil.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/TypeUtil.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/Util.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/Util.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/Util.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/Util.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/Block.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/Block.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/Block.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/Block.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/Element.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/Element.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/Element.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/Element.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_de.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_de.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_es.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_es.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_fr.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_fr.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_it.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_it.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_ja.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_ja.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_ko.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_ko.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_pt_BR.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_pt_BR.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_zh_CN.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_zh_CN.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_zh_TW.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_zh_TW.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/Messages.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/Messages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/Messages.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/Messages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/ModelGroup.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/ModelGroup.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/ModelGroup.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/ModelGroup.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/Occurence.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/Occurence.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/Occurence.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/Occurence.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/TDTDReader.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/TDTDReader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/TDTDReader.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/TDTDReader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/Term.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/Term.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/Term.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/Term.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIAttribute.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIAttribute.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIAttribute.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIAttribute.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConstructor.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConstructor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConstructor.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConstructor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIContent.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIContent.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIContent.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIContent.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConversion.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConversion.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConversion.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConversion.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIElement.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIElement.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIElement.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIElement.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIEnumeration.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIEnumeration.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIEnumeration.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIEnumeration.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIInterface.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIInterface.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIInterface.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIInterface.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIUserConversion.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIUserConversion.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIUserConversion.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIUserConversion.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BindInfo.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BindInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BindInfo.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BindInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMBuilder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMBuilder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMLocator.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMLocator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMLocator.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMLocator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMUtil.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMUtil.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMUtil.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMUtil.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DTDExtensionBindingChecker.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DTDExtensionBindingChecker.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DTDExtensionBindingChecker.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DTDExtensionBindingChecker.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_de.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_de.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_es.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_es.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_fr.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_fr.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_it.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_it.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_ja.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_ja.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_ko.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_ko.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_pt_BR.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_pt_BR.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_zh_CN.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_zh_CN.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_zh_TW.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_zh_TW.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/Messages.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/Messages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/Messages.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/Messages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.xsd b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.xsd similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.xsd rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.xsd diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/package.html b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/package.html rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/xjc.xsd b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/xjc.xsd similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/xjc.xsd rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/xjc.xsd diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/Choice.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Choice.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/Choice.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Choice.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/ConnectedComponent.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/ConnectedComponent.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/ConnectedComponent.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/ConnectedComponent.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/Element.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Element.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/Element.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Element.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/ElementSet.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSet.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/ElementSet.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSet.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/ElementSets.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSets.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/ElementSets.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSets.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/Expression.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Expression.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/Expression.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Expression.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/Graph.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Graph.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/Graph.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Graph.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/OneOrMore.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/OneOrMore.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/OneOrMore.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/OneOrMore.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/Sequence.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Sequence.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/Sequence.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Sequence.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/SinkNode.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/SinkNode.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/SinkNode.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/SinkNode.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/SourceNode.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/SourceNode.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/SourceNode.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/SourceNode.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/package.html b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/package.html rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/ContentHandlerNamespacePrefixAdapter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/ContentHandlerNamespacePrefixAdapter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/ContentHandlerNamespacePrefixAdapter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/ContentHandlerNamespacePrefixAdapter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/DOMBuilder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/DOMBuilder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestParser.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestParser.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestParser.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestParser.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestScanner.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestScanner.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestScanner.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestScanner.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/InternalizationLogic.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/InternalizationLogic.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/InternalizationLogic.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/InternalizationLogic.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/Internalizer.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/Internalizer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/Internalizer.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/Internalizer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/LocatorTable.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/LocatorTable.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/LocatorTable.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/LocatorTable.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_de.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_de.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_es.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_es.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_fr.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_fr.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_it.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_it.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_ja.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_ja.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_ko.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_ko.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_pt_BR.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_pt_BR.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_zh_CN.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_zh_CN.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_zh_TW.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_zh_TW.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/Messages.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/Messages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/Messages.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/Messages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/NamespaceContextImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/NamespaceContextImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/NamespaceContextImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/NamespaceContextImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/VersionChecker.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/VersionChecker.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/VersionChecker.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/VersionChecker.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/WhitespaceStripper.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/WhitespaceStripper.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/WhitespaceStripper.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/WhitespaceStripper.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/package.html b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/package.html rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/package.html b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/package.html rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/BindStyle.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/BindStyle.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/BindStyle.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/BindStyle.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/ContentModelBinder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/ContentModelBinder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/ContentModelBinder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/ContentModelBinder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/DatatypeLib.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DatatypeLib.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/DatatypeLib.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DatatypeLib.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/DefineFinder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DefineFinder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/DefineFinder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DefineFinder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/NameCalculator.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/NameCalculator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/NameCalculator.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/NameCalculator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGCompiler.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGCompiler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGCompiler.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGCompiler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGInternalizationLogic.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGInternalizationLogic.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGInternalizationLogic.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGInternalizationLogic.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/RawTypeSetBuilder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RawTypeSetBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/RawTypeSetBuilder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RawTypeSetBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/TypePatternBinder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypePatternBinder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/TypePatternBinder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypePatternBinder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/TypeUseBinder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypeUseBinder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/TypeUseBinder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypeUseBinder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/Abstractifier.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Abstractifier.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/Abstractifier.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Abstractifier.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/BGMBuilder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BGMBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/BGMBuilder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BGMBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/BindBlue.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindBlue.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/BindBlue.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindBlue.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/BindGreen.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindGreen.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/BindGreen.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindGreen.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/BindPurple.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindPurple.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/BindPurple.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindPurple.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/BindRed.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindRed.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/BindRed.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindRed.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/BindYellow.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindYellow.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/BindYellow.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindYellow.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/BindingComponent.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindingComponent.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/BindingComponent.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindingComponent.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinderFilter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinderFilter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinderFilter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinderFilter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassSelector.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassSelector.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassSelector.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassSelector.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/CollisionInfo.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/CollisionInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/CollisionInfo.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/CollisionInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ColorBinder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ColorBinder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ColorBinder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ColorBinder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultClassBinder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultClassBinder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultClassBinder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultClassBinder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultParticleBinder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultParticleBinder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultParticleBinder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultParticleBinder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ErrorReporter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ErrorReporter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ErrorReporter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ErrorReporter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionBuilder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionBuilder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionParticleBinder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionParticleBinder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionParticleBinder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionParticleBinder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/GElement.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElement.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/GElement.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElement.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/GElementImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElementImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/GElementImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElementImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_de.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_de.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_es.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_es.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_fr.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_fr.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_it.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_it.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_ja.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_ja.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_ko.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_ko.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_pt_BR.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_pt_BR.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_zh_CN.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_zh_CN.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_zh_TW.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_zh_TW.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/Messages.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Messages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/Messages.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Messages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/MultiplicityCounter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MultiplicityCounter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/MultiplicityCounter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MultiplicityCounter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ParticleBinder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ParticleBinder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ParticleBinder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ParticleBinder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/RawTypeSetBuilder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RawTypeSetBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/RawTypeSetBuilder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RawTypeSetBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/RefererFinder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RefererFinder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/RefererFinder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RefererFinder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/SimpleTypeBuilder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/SimpleTypeBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/SimpleTypeBuilder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/SimpleTypeBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/UnusedCustomizationChecker.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/UnusedCustomizationChecker.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/UnusedCustomizationChecker.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/UnusedCustomizationChecker.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/WildcardNameClassBuilder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/WildcardNameClassBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/WildcardNameClassBuilder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/WildcardNameClassBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AbstractDeclarationImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AbstractDeclarationImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AbstractDeclarationImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AbstractDeclarationImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AnnotationParserFactoryImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AnnotationParserFactoryImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AnnotationParserFactoryImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AnnotationParserFactoryImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIClass.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIClass.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIClass.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIClass.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIConversion.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIConversion.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIConversion.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIConversion.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDeclaration.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDeclaration.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDeclaration.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDeclaration.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDom.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDom.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDom.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDom.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnum.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnum.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnum.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnum.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnumMember.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnumMember.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnumMember.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnumMember.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIFactoryMethod.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIFactoryMethod.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIFactoryMethod.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIFactoryMethod.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIInlineBinaryData.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIInlineBinaryData.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIInlineBinaryData.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIInlineBinaryData.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIProperty.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIProperty.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIProperty.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIProperty.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISchemaBinding.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISchemaBinding.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISchemaBinding.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISchemaBinding.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISerializable.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISerializable.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISerializable.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISerializable.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXDom.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXDom.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXDom.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXDom.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXPluginCustomization.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXPluginCustomization.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXPluginCustomization.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXPluginCustomization.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXSubstitutable.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXSubstitutable.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXSubstitutable.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXSubstitutable.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BindInfo.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BindInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BindInfo.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BindInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/CollectionTypeAttribute.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/CollectionTypeAttribute.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/CollectionTypeAttribute.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/CollectionTypeAttribute.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/DomHandlerEx.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/DomHandlerEx.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/DomHandlerEx.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/DomHandlerEx.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/EnumMemberMode.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/EnumMemberMode.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/EnumMemberMode.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/EnumMemberMode.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/ForkingFilter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/ForkingFilter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/ForkingFilter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/ForkingFilter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/LocalScoping.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/LocalScoping.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/LocalScoping.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/LocalScoping.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_de.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_de.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_es.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_es.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_fr.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_fr.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_it.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_it.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_ja.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_ja.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_ko.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_ko.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_pt_BR.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_pt_BR.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_zh_CN.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_zh_CN.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_zh_TW.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_zh_TW.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/Messages.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/Messages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/Messages.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/Messages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/OptionalPropertyMode.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/OptionalPropertyMode.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/OptionalPropertyMode.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/OptionalPropertyMode.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.xsd b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.xsd similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.xsd rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.xsd diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package-info.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package-info.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package.html b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package.html rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xjc.xsd b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xjc.xsd similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xjc.xsd rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xjc.xsd diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xs.xsd b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xs.xsd similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xs.xsd rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xs.xsd diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/AbstractExtendedComplexTypeBuilder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/AbstractExtendedComplexTypeBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/AbstractExtendedComplexTypeBuilder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/AbstractExtendedComplexTypeBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/CTBuilder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/CTBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/CTBuilder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/CTBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ChoiceContentComplexTypeBuilder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ChoiceContentComplexTypeBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ChoiceContentComplexTypeBuilder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ChoiceContentComplexTypeBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeBindingMode.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeBindingMode.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeBindingMode.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeBindingMode.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeFieldBuilder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeFieldBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeFieldBuilder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeFieldBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ExtendedComplexTypeBuilder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ExtendedComplexTypeBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ExtendedComplexTypeBuilder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ExtendedComplexTypeBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/FreshComplexTypeBuilder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/FreshComplexTypeBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/FreshComplexTypeBuilder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/FreshComplexTypeBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_de.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_de.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_es.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_es.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_fr.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_fr.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_it.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_it.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_ja.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_ja.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_ko.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_ko.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_pt_BR.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_pt_BR.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_zh_CN.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_zh_CN.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_zh_TW.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_zh_TW.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/Messages.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/Messages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/Messages.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/Messages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedComplexTypeBuilder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedComplexTypeBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedComplexTypeBuilder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedComplexTypeBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedExtendedComplexTypeBuilder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedExtendedComplexTypeBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedExtendedComplexTypeBuilder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedExtendedComplexTypeBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MultiWildcardComplexTypeBuilder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MultiWildcardComplexTypeBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MultiWildcardComplexTypeBuilder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MultiWildcardComplexTypeBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/RestrictedComplexTypeBuilder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/RestrictedComplexTypeBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/RestrictedComplexTypeBuilder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/RestrictedComplexTypeBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/STDerivedComplexTypeBuilder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/STDerivedComplexTypeBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/STDerivedComplexTypeBuilder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/STDerivedComplexTypeBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/CustomizationContextChecker.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/CustomizationContextChecker.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/CustomizationContextChecker.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/CustomizationContextChecker.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/IncorrectNamespaceURIChecker.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/IncorrectNamespaceURIChecker.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/IncorrectNamespaceURIChecker.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/IncorrectNamespaceURIChecker.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/LSInputSAXWrapper.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/LSInputSAXWrapper.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/LSInputSAXWrapper.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/LSInputSAXWrapper.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_de.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_de.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_es.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_es.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_fr.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_fr.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_it.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_it.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_ja.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_ja.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_ko.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_ko.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_pt_BR.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_pt_BR.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_zh_CN.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_zh_CN.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_zh_TW.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_zh_TW.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/Messages.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/Messages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/Messages.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/Messages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/XMLSchemaInternalizationLogic.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/XMLSchemaInternalizationLogic.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/XMLSchemaInternalizationLogic.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/XMLSchemaInternalizationLogic.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/package.html b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/runtime/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/package.html rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/runtime/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/CodeModelClassFactory.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/CodeModelClassFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/CodeModelClassFactory.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/CodeModelClassFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/DOMUtils.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/DOMUtils.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/DOMUtils.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/DOMUtils.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/ErrorReceiverFilter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/ErrorReceiverFilter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/ErrorReceiverFilter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/ErrorReceiverFilter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/ForkContentHandler.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/ForkContentHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/ForkContentHandler.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/ForkContentHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/ForkEntityResolver.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/ForkEntityResolver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/ForkEntityResolver.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/ForkEntityResolver.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/MessageBundle.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/MessageBundle.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/MessageBundle_de.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/MessageBundle_de.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/MessageBundle_es.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/MessageBundle_es.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/MessageBundle_fr.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/MessageBundle_fr.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/MessageBundle_it.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/MessageBundle_it.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/MessageBundle_ja.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/MessageBundle_ja.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/MessageBundle_ko.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/MessageBundle_ko.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/MessageBundle_pt_BR.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/MessageBundle_pt_BR.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/MessageBundle_zh_CN.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/MessageBundle_zh_CN.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/MessageBundle_zh_TW.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/MessageBundle_zh_TW.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/Messages.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/Messages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/Messages.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/Messages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/MimeTypeRange.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MimeTypeRange.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/MimeTypeRange.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MimeTypeRange.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/NamespaceContextAdapter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/NamespaceContextAdapter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/NamespaceContextAdapter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/NamespaceContextAdapter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/NullStream.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/NullStream.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/NullStream.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/NullStream.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/ReadOnlyAdapter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/ReadOnlyAdapter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/ReadOnlyAdapter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/ReadOnlyAdapter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/StringCutter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/StringCutter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/StringCutter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/StringCutter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/SubtreeCutter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/SubtreeCutter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/SubtreeCutter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/SubtreeCutter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/Util.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/Util.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/Util.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/Util.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/writer/SignatureWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/writer/SignatureWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/writer/SignatureWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/writer/SignatureWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDEventListener.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/DTDEventListener.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDEventListener.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/DTDEventListener.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDHandlerBase.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/DTDHandlerBase.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDHandlerBase.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/DTDHandlerBase.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDParser.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/DTDParser.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDParser.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/DTDParser.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/EndOfInputException.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/EndOfInputException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/EndOfInputException.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/EndOfInputException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/EntityDecl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/EntityDecl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/EntityDecl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/EntityDecl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/ExternalEntity.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/ExternalEntity.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/ExternalEntity.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/ExternalEntity.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/InputEntity.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/InputEntity.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/InputEntity.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/InputEntity.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/InternalEntity.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/InternalEntity.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/InternalEntity.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/InternalEntity.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/MessageCatalog.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/MessageCatalog.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/MessageCatalog.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/MessageCatalog.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/Resolver.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/Resolver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/Resolver.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/Resolver.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/SimpleHashtable.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/SimpleHashtable.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/SimpleHashtable.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/SimpleHashtable.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlChars.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/XmlChars.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlChars.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/XmlChars.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlNames.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/XmlNames.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlNames.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/XmlNames.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlReader.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/XmlReader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlReader.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/XmlReader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/package.html b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/package.html rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/resources/Messages.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/resources/Messages.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/resources/Messages.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/resources/Messages.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/Annotations.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/Annotations.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/Annotations.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/Annotations.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/BuildException.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/BuildException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/BuildException.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/BuildException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/CommentList.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/CommentList.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/CommentList.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/CommentList.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/DataPatternBuilder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/DataPatternBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/DataPatternBuilder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/DataPatternBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/Div.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/Div.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/Div.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/Div.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/ElementAnnotationBuilder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/ElementAnnotationBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/ElementAnnotationBuilder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/ElementAnnotationBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/Grammar.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/Grammar.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/Grammar.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/Grammar.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/GrammarSection.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/GrammarSection.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/GrammarSection.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/GrammarSection.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/Include.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/Include.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/Include.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/Include.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/IncludedGrammar.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/IncludedGrammar.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/IncludedGrammar.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/IncludedGrammar.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/NameClassBuilder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/NameClassBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/NameClassBuilder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/NameClassBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/SchemaBuilder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/SchemaBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/SchemaBuilder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/SchemaBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/Scope.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/Scope.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/Scope.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/Scope.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/om/Location.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/om/Location.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/om/Location.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/om/Location.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/om/ParsedElementAnnotation.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/om/ParsedElementAnnotation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/om/ParsedElementAnnotation.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/om/ParsedElementAnnotation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/om/ParsedNameClass.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/om/ParsedNameClass.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/om/ParsedNameClass.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/om/ParsedNameClass.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/om/ParsedPattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/om/ParsedPattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/om/ParsedPattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/om/ParsedPattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/util/CheckingSchemaBuilder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/util/CheckingSchemaBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/util/CheckingSchemaBuilder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/util/CheckingSchemaBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/util/LocatorImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/util/LocatorImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/util/LocatorImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/util/LocatorImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/util/package.html b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/util/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/util/package.html rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/util/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/AfterPattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/AfterPattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/AfterPattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/AfterPattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/Alphabet.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/Alphabet.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/Alphabet.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/Alphabet.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/AttributePattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/AttributePattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/AttributePattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/AttributePattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/BinaryPattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/BinaryPattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/BinaryPattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/BinaryPattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/ChoicePattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/ChoicePattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/ChoicePattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/ChoicePattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/DataExceptPattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/DataExceptPattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/DataExceptPattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/DataExceptPattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/DataPattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/DataPattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/DataPattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/DataPattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/DuplicateAttributeDetector.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/DuplicateAttributeDetector.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/DuplicateAttributeDetector.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/DuplicateAttributeDetector.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/ElementPattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/ElementPattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/ElementPattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/ElementPattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/EmptyPattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/EmptyPattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/EmptyPattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/EmptyPattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/ErrorPattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/ErrorPattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/ErrorPattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/ErrorPattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/GroupPattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/GroupPattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/GroupPattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/GroupPattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/InterleavePattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/InterleavePattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/InterleavePattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/InterleavePattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/ListPattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/ListPattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/ListPattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/ListPattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/Messages.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/Messages.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/Messages.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/Messages.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/NotAllowedPattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/NotAllowedPattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/NotAllowedPattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/NotAllowedPattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/OneOrMorePattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/OneOrMorePattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/OneOrMorePattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/OneOrMorePattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/Pattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/Pattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/Pattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/Pattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/PatternBuilder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/PatternBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/PatternBuilder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/PatternBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/PatternInterner.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/PatternInterner.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/PatternInterner.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/PatternInterner.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/RefPattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/RefPattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/RefPattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/RefPattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/RestrictionViolationException.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/RestrictionViolationException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/RestrictionViolationException.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/RestrictionViolationException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/SchemaBuilderImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/SchemaBuilderImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/SchemaBuilderImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/SchemaBuilderImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/SchemaPatternBuilder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/SchemaPatternBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/SchemaPatternBuilder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/SchemaPatternBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/StringPattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/StringPattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/StringPattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/StringPattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/TextPattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/TextPattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/TextPattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/TextPattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/ValuePattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/ValuePattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/ValuePattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/ValuePattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/package.html b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/package.html rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/visitor/ChildElementFinder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/visitor/ChildElementFinder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/visitor/ChildElementFinder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/visitor/ChildElementFinder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/visitor/PatternFunction.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternFunction.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/visitor/PatternFunction.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternFunction.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/visitor/PatternVisitor.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternVisitor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/visitor/PatternVisitor.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternVisitor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/visitor/PatternWalker.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternWalker.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/visitor/PatternWalker.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternWalker.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/Annotation.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/Annotation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/Annotation.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/Annotation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/CommentListImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/CommentListImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/CommentListImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/CommentListImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DAnnotation.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DAnnotation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DAnnotation.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DAnnotation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DAttributePattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DAttributePattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DAttributePattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DAttributePattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DChoicePattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DChoicePattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DChoicePattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DChoicePattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DContainerPattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DContainerPattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DContainerPattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DContainerPattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DDataPattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DDataPattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DDataPattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DDataPattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DDefine.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DDefine.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DDefine.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DDefine.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DElementPattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DElementPattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DElementPattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DElementPattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DEmptyPattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DEmptyPattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DEmptyPattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DEmptyPattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DGrammarPattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DGrammarPattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DGrammarPattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DGrammarPattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DGroupPattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DGroupPattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DGroupPattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DGroupPattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DInterleavePattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DInterleavePattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DInterleavePattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DInterleavePattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DListPattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DListPattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DListPattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DListPattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DMixedPattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DMixedPattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DMixedPattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DMixedPattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DNotAllowedPattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DNotAllowedPattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DNotAllowedPattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DNotAllowedPattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DOMPrinter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DOMPrinter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DOMPrinter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DOMPrinter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DOneOrMorePattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DOneOrMorePattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DOneOrMorePattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DOneOrMorePattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DOptionalPattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DOptionalPattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DOptionalPattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DOptionalPattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DPattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DPattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DPattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DPattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DPatternVisitor.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DPatternVisitor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DPatternVisitor.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DPatternVisitor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DPatternWalker.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DPatternWalker.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DPatternWalker.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DPatternWalker.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DRefPattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DRefPattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DRefPattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DRefPattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DSchemaBuilderImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DSchemaBuilderImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DSchemaBuilderImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DSchemaBuilderImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DTextPattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DTextPattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DTextPattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DTextPattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DUnaryPattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DUnaryPattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DUnaryPattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DUnaryPattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DValuePattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DValuePattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DValuePattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DValuePattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DXMLPrinter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DXMLPrinter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DXMLPrinter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DXMLPrinter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DXmlTokenPattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DXmlTokenPattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DXmlTokenPattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DXmlTokenPattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DZeroOrMorePattern.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DZeroOrMorePattern.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DZeroOrMorePattern.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DZeroOrMorePattern.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DataPatternBuilderImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DataPatternBuilderImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DataPatternBuilderImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DataPatternBuilderImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/ElementAnnotationBuilderImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/ElementAnnotationBuilderImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/ElementAnnotationBuilderImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/ElementAnnotationBuilderImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/ElementWrapper.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/ElementWrapper.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/ElementWrapper.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/ElementWrapper.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/GrammarBuilderImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/GrammarBuilderImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/GrammarBuilderImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/GrammarBuilderImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/IncludeImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/IncludeImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/IncludeImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/IncludeImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/Main.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/Main.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/Main.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/Main.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/PatternParseable.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/PatternParseable.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/PatternParseable.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/PatternParseable.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/package.html b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/package.html rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/dt/CachedDatatypeLibraryFactory.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/CachedDatatypeLibraryFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/dt/CachedDatatypeLibraryFactory.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/CachedDatatypeLibraryFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/dt/CascadingDatatypeLibraryFactory.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/CascadingDatatypeLibraryFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/dt/CascadingDatatypeLibraryFactory.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/CascadingDatatypeLibraryFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/dt/DoNothingDatatypeLibraryFactoryImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/DoNothingDatatypeLibraryFactoryImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/dt/DoNothingDatatypeLibraryFactoryImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/DoNothingDatatypeLibraryFactoryImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeBuilder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeBuilder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibrary.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibrary.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibrary.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibrary.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibraryFactory.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibraryFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibraryFactory.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibraryFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/dt/builtin/CompatibilityDatatypeLibrary.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/CompatibilityDatatypeLibrary.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/dt/builtin/CompatibilityDatatypeLibrary.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/CompatibilityDatatypeLibrary.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/dt/builtin/Messages.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/Messages.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/dt/builtin/Messages.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/Messages.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/dt/builtin/package.html b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/dt/builtin/package.html rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/AnyNameClass.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/AnyNameClass.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/AnyNameClass.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/AnyNameClass.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/AnyNameExceptNameClass.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/AnyNameExceptNameClass.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/AnyNameExceptNameClass.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/AnyNameExceptNameClass.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/ChoiceNameClass.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/ChoiceNameClass.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/ChoiceNameClass.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/ChoiceNameClass.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/NameClass.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NameClass.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/NameClass.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NameClass.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/NameClassBuilderImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NameClassBuilderImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/NameClassBuilderImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NameClassBuilderImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/NameClassVisitor.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NameClassVisitor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/NameClassVisitor.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NameClassVisitor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/NameClassWalker.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NameClassWalker.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/NameClassWalker.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NameClassWalker.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/NsNameClass.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NsNameClass.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/NsNameClass.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NsNameClass.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/NsNameExceptNameClass.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NsNameExceptNameClass.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/NsNameExceptNameClass.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NsNameExceptNameClass.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/NullNameClass.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NullNameClass.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/NullNameClass.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NullNameClass.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/OverlapDetector.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/OverlapDetector.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/OverlapDetector.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/OverlapDetector.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/SimpleNameClass.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/SimpleNameClass.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/SimpleNameClass.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/SimpleNameClass.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/package.html b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/package.html rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/Context.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/Context.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/Context.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/Context.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/IllegalSchemaException.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/IllegalSchemaException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/IllegalSchemaException.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/IllegalSchemaException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/Messages.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/Messages.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/Messages.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/Messages.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/Parseable.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/Parseable.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/Parseable.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/Parseable.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/CompactParseable.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactParseable.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/CompactParseable.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactParseable.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntax.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntax.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntax.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntax.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxConstants.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxConstants.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxConstants.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxConstants.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxTokenManager.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxTokenManager.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxTokenManager.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxTokenManager.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/EOFException.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/EOFException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/EOFException.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/EOFException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/EscapeSyntaxException.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/EscapeSyntaxException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/EscapeSyntaxException.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/EscapeSyntaxException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/JavaCharStream.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/JavaCharStream.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/JavaCharStream.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/JavaCharStream.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/Messages.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/Messages.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/Messages.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/Messages.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/ParseException.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/ParseException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/ParseException.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/ParseException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/Token.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/Token.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/Token.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/Token.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/TokenMgrError.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/TokenMgrError.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/TokenMgrError.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/TokenMgrError.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/UCode_UCodeESC_CharStream.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/UCode_UCodeESC_CharStream.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/UCode_UCodeESC_CharStream.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/UCode_UCodeESC_CharStream.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/AnnotationsHost.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/AnnotationsHost.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/AnnotationsHost.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/AnnotationsHost.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/Base.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/Base.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/Base.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/Base.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/CommentListHost.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/CommentListHost.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/CommentListHost.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/CommentListHost.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/DataPatternBuilderHost.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/DataPatternBuilderHost.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/DataPatternBuilderHost.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/DataPatternBuilderHost.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/DivHost.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/DivHost.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/DivHost.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/DivHost.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/ElementAnnotationBuilderHost.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/ElementAnnotationBuilderHost.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/ElementAnnotationBuilderHost.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/ElementAnnotationBuilderHost.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/GrammarHost.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/GrammarHost.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/GrammarHost.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/GrammarHost.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/GrammarSectionHost.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/GrammarSectionHost.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/GrammarSectionHost.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/GrammarSectionHost.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/IncludeHost.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/IncludeHost.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/IncludeHost.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/IncludeHost.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/LocationHost.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/LocationHost.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/LocationHost.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/LocationHost.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/NameClassBuilderHost.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/NameClassBuilderHost.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/NameClassBuilderHost.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/NameClassBuilderHost.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/ParsedElementAnnotationHost.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedElementAnnotationHost.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/ParsedElementAnnotationHost.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedElementAnnotationHost.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/ParsedNameClassHost.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedNameClassHost.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/ParsedNameClassHost.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedNameClassHost.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/ParsedPatternHost.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedPatternHost.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/ParsedPatternHost.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedPatternHost.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/SchemaBuilderHost.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/SchemaBuilderHost.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/SchemaBuilderHost.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/SchemaBuilderHost.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/ScopeHost.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/ScopeHost.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/ScopeHost.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/ScopeHost.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/package.html b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/package.html rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/xml/DtdContext.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/xml/DtdContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/xml/DtdContext.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/xml/DtdContext.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/xml/Messages.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/xml/Messages.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/xml/Messages.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/xml/Messages.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/xml/SAXParseable.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/xml/SAXParseable.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/xml/SAXParseable.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/xml/SAXParseable.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/xml/SchemaParser.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/xml/SchemaParser.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/xml/SchemaParser.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/xml/SchemaParser.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/util/Localizer.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/util/Localizer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/util/Localizer.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/util/Localizer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/util/Uri.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/util/Uri.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/util/Uri.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/util/Uri.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/util/Utf16.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/util/Utf16.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/util/Utf16.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/util/Utf16.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/xml/sax/AbstractLexicalHandler.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/sax/AbstractLexicalHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/xml/sax/AbstractLexicalHandler.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/sax/AbstractLexicalHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/xml/sax/JAXPXMLReaderCreator.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/sax/JAXPXMLReaderCreator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/xml/sax/JAXPXMLReaderCreator.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/sax/JAXPXMLReaderCreator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/xml/sax/XMLReaderCreator.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/sax/XMLReaderCreator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/xml/sax/XMLReaderCreator.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/sax/XMLReaderCreator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/xml/sax/XmlBaseHandler.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/sax/XmlBaseHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/xml/sax/XmlBaseHandler.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/sax/XmlBaseHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/xml/util/EncodingMap.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/util/EncodingMap.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/xml/util/EncodingMap.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/util/EncodingMap.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/xml/util/Naming.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/util/Naming.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/xml/util/Naming.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/util/Naming.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/xml/util/WellKnownNamespaces.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/util/WellKnownNamespaces.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/xml/util/WellKnownNamespaces.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/util/WellKnownNamespaces.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/ForeignAttributes.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/ForeignAttributes.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/ForeignAttributes.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/ForeignAttributes.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/SCD.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/SCD.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/SCD.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/SCD.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSAnnotation.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAnnotation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSAnnotation.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAnnotation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSAttContainer.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAttContainer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSAttContainer.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAttContainer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSAttGroupDecl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAttGroupDecl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSAttGroupDecl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAttGroupDecl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSAttributeDecl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAttributeDecl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSAttributeDecl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAttributeDecl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSAttributeUse.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAttributeUse.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSAttributeUse.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAttributeUse.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSComplexType.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSComplexType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSComplexType.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSComplexType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSComponent.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSComponent.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSComponent.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSComponent.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSContentType.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSContentType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSContentType.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSContentType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSDeclaration.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSDeclaration.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSDeclaration.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSDeclaration.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSElementDecl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSElementDecl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSElementDecl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSElementDecl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSFacet.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSFacet.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSFacet.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSFacet.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSIdentityConstraint.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSIdentityConstraint.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSIdentityConstraint.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSIdentityConstraint.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSListSimpleType.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSListSimpleType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSListSimpleType.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSListSimpleType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSModelGroup.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSModelGroup.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSModelGroup.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSModelGroup.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSModelGroupDecl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSModelGroupDecl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSModelGroupDecl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSModelGroupDecl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSNotation.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSNotation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSNotation.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSNotation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSParticle.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSParticle.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSParticle.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSParticle.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSRestrictionSimpleType.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSRestrictionSimpleType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSRestrictionSimpleType.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSRestrictionSimpleType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSSchema.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSSchema.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSSchema.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSSchema.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSSchemaSet.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSSchemaSet.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSSchemaSet.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSSchemaSet.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSSimpleType.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSSimpleType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSSimpleType.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSSimpleType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSTerm.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSTerm.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSTerm.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSTerm.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSType.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSType.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSUnionSimpleType.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSUnionSimpleType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSUnionSimpleType.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSUnionSimpleType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSVariety.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSVariety.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSVariety.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSVariety.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSWildcard.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSWildcard.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSWildcard.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSWildcard.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSXPath.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSXPath.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSXPath.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSXPath.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XmlString.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XmlString.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XmlString.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XmlString.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/AnnotationImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/AnnotationImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/AnnotationImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/AnnotationImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/AttGroupDeclImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/AttGroupDeclImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/AttGroupDeclImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/AttGroupDeclImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/AttributeDeclImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/AttributeDeclImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/AttributeDeclImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/AttributeDeclImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/AttributeUseImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/AttributeUseImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/AttributeUseImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/AttributeUseImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/AttributesHolder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/AttributesHolder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/AttributesHolder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/AttributesHolder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ComplexTypeImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ComplexTypeImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ComplexTypeImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ComplexTypeImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ComponentImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ComponentImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ComponentImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ComponentImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/Const.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/Const.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/Const.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/Const.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ContentTypeImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ContentTypeImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ContentTypeImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ContentTypeImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/DeclarationImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/DeclarationImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/DeclarationImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/DeclarationImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ElementDecl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ElementDecl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ElementDecl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ElementDecl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/EmptyImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/EmptyImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/EmptyImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/EmptyImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/FacetImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/FacetImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/FacetImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/FacetImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ForeignAttributesImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ForeignAttributesImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ForeignAttributesImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ForeignAttributesImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/IdentityConstraintImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/IdentityConstraintImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/IdentityConstraintImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/IdentityConstraintImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ListSimpleTypeImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ListSimpleTypeImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ListSimpleTypeImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ListSimpleTypeImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ModelGroupDeclImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ModelGroupDeclImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ModelGroupDeclImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ModelGroupDeclImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ModelGroupImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ModelGroupImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ModelGroupImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ModelGroupImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/NotationImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/NotationImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/NotationImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/NotationImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ParticleImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ParticleImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ParticleImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ParticleImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/Ref.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/Ref.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/Ref.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/Ref.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/RestrictionSimpleTypeImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/RestrictionSimpleTypeImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/RestrictionSimpleTypeImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/RestrictionSimpleTypeImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/SchemaImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/SchemaImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/SchemaImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/SchemaImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/SchemaSetImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/SchemaSetImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/SchemaSetImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/SchemaSetImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/SimpleTypeImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/SimpleTypeImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/SimpleTypeImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/SimpleTypeImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/UName.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/UName.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/UName.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/UName.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/UnionSimpleTypeImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/UnionSimpleTypeImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/UnionSimpleTypeImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/UnionSimpleTypeImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/Util.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/Util.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/Util.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/Util.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/WildcardImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/WildcardImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/WildcardImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/WildcardImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/XPathImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/XPathImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/XPathImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/XPathImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/package.html b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/package.html rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/BaseContentRef.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/BaseContentRef.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/BaseContentRef.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/BaseContentRef.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/DefaultAnnotationParser.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/DefaultAnnotationParser.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/DefaultAnnotationParser.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/DefaultAnnotationParser.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/DelayedRef.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/DelayedRef.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/DelayedRef.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/DelayedRef.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/Messages.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/Messages.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/Messages.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/Messages.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/Messages_ja.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/Messages_ja.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/NGCCRuntimeEx.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/NGCCRuntimeEx.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/NGCCRuntimeEx.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/NGCCRuntimeEx.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/ParserContext.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/ParserContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/ParserContext.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/ParserContext.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/Patch.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/Patch.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/Patch.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/Patch.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/PatcherManager.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/PatcherManager.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/PatcherManager.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/PatcherManager.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/SAXParserFactoryAdaptor.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/SAXParserFactoryAdaptor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/SAXParserFactoryAdaptor.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/SAXParserFactoryAdaptor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/SchemaDocumentImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/SchemaDocumentImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/SchemaDocumentImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/SchemaDocumentImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/SubstGroupBaseTypeRef.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/SubstGroupBaseTypeRef.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/SubstGroupBaseTypeRef.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/SubstGroupBaseTypeRef.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/datatypes.xsd b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/datatypes.xsd similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/datatypes.xsd rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/datatypes.xsd diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/package.html b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/package.html rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/AttributesImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/AttributesImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/AttributesImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/AttributesImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventReceiver.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventReceiver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventReceiver.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventReceiver.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventSource.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventSource.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventSource.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventSource.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCHandler.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCHandler.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCInterleaveFilter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCInterleaveFilter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCInterleaveFilter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCInterleaveFilter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCRuntime.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCRuntime.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCRuntime.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCRuntime.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/Schema.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/Schema.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/Schema.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/Schema.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_List.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_List.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_List.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_List.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Restriction.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Restriction.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Restriction.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Restriction.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Union.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Union.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Union.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Union.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/annotation.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/annotation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/annotation.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/annotation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeUses.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeUses.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeUses.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeUses.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/complexType_complexContent_body.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/complexType_complexContent_body.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/complexType_complexContent_body.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/complexType_complexContent_body.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/erSet.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/erSet.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/erSet.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/erSet.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/ersSet.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/ersSet.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/ersSet.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/ersSet.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/facet.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/facet.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/facet.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/facet.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/foreignAttributes.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/foreignAttributes.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/foreignAttributes.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/foreignAttributes.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/group.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/group.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/group.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/group.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/importDecl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/importDecl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/importDecl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/importDecl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/includeDecl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/includeDecl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/includeDecl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/includeDecl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/modelGroupBody.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/modelGroupBody.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/modelGroupBody.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/modelGroupBody.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/occurs.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/occurs.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/occurs.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/occurs.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/particle.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/particle.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/particle.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/particle.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/qualification.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/qualification.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/qualification.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/qualification.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/redefine.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/redefine.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/redefine.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/redefine.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/wildcardBody.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/wildcardBody.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/wildcardBody.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/wildcardBody.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/xpath.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/xpath.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/xpath.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/xpath.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/AbstractAxisImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/AbstractAxisImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/AbstractAxisImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/AbstractAxisImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/Axis.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/Axis.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/Axis.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/Axis.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/Iterators.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/Iterators.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/Iterators.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/Iterators.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/ParseException.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/ParseException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/ParseException.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/ParseException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/SCDImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/SCDImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/SCDParser.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParser.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/SCDParser.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParser.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/SCDParserConstants.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParserConstants.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/SCDParserConstants.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParserConstants.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/SCDParserTokenManager.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParserTokenManager.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/SCDParserTokenManager.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParserTokenManager.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/SimpleCharStream.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/SimpleCharStream.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/SimpleCharStream.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/SimpleCharStream.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/Step.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/Step.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/Step.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/Step.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/Token.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/Token.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/Token.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/Token.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/TokenMgrError.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/TokenMgrError.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/TokenMgrError.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/TokenMgrError.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/util/DraconianErrorHandler.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/util/DraconianErrorHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/util/DraconianErrorHandler.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/util/DraconianErrorHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/util/ResourceEntityResolver.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/util/ResourceEntityResolver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/util/ResourceEntityResolver.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/util/ResourceEntityResolver.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/util/SchemaTreeTraverser.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/util/SchemaTreeTraverser.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/util/SchemaTreeTraverser.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/util/SchemaTreeTraverser.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/util/SchemaWriter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/util/SchemaWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/util/SchemaWriter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/util/SchemaWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/util/Uri.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/util/Uri.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/util/Uri.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/util/Uri.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/package.html b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/package.html rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/AnnotationContext.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/AnnotationContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/AnnotationContext.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/AnnotationContext.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/AnnotationParser.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/AnnotationParser.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/AnnotationParser.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/AnnotationParser.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/AnnotationParserFactory.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/AnnotationParserFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/AnnotationParserFactory.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/AnnotationParserFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/JAXPParser.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/JAXPParser.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/JAXPParser.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/JAXPParser.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/SchemaDocument.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/SchemaDocument.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/SchemaDocument.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/SchemaDocument.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/XMLParser.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/XMLParser.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/XMLParser.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/XMLParser.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/XSOMParser.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/XSOMParser.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/XSOMParser.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/XSOMParser.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/package.html b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/package.html rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/package.html diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/ComponentNameFunction.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/ComponentNameFunction.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/ComponentNameFunction.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/ComponentNameFunction.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/ContextClassloaderLocal.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/ContextClassloaderLocal.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/ContextClassloaderLocal.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/ContextClassloaderLocal.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/ContextClassloaderLocal.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/ContextClassloaderLocal.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/ContextClassloaderLocal.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/ContextClassloaderLocal.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/DeferedCollection.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/DeferedCollection.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/DeferedCollection.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/DeferedCollection.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/NameGetter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/NameGetter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/NameGetter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/NameGetter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/NameGetter.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/NameGetter.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/NameGetter.properties rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/NameGetter.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/SimpleTypeSet.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/SimpleTypeSet.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/SimpleTypeSet.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/SimpleTypeSet.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/TypeClosure.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/TypeClosure.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/TypeClosure.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/TypeClosure.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/TypeSet.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/TypeSet.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/TypeSet.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/TypeSet.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/XSFinder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/XSFinder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/XSFinder.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/XSFinder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/XSFunctionFilter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/XSFunctionFilter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/XSFunctionFilter.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/XSFunctionFilter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSContentTypeFunction.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSContentTypeFunction.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSContentTypeFunction.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSContentTypeFunction.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSContentTypeVisitor.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSContentTypeVisitor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSContentTypeVisitor.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSContentTypeVisitor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSFunction.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSFunction.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSFunction.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSFunction.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeFunction.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeFunction.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeFunction.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeFunction.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeVisitor.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeVisitor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeVisitor.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeVisitor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSTermFunction.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSTermFunction.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSTermFunction.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSTermFunction.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSTermFunctionWithParam.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSTermFunctionWithParam.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSTermFunctionWithParam.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSTermFunctionWithParam.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSTermVisitor.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSTermVisitor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSTermVisitor.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSTermVisitor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSVisitor.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSVisitor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSVisitor.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSVisitor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSWildcardFunction.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSWildcardFunction.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSWildcardFunction.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSWildcardFunction.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSWildcardVisitor.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSWildcardVisitor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSWildcardVisitor.java rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSWildcardVisitor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/package.html b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/package.html similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/package.html rename to jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/package.html diff --git a/jaxws/src/share/jaxws_classes/org/relaxng/datatype/Datatype.java b/jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/Datatype.java similarity index 100% rename from jaxws/src/share/jaxws_classes/org/relaxng/datatype/Datatype.java rename to jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/Datatype.java diff --git a/jaxws/src/share/jaxws_classes/org/relaxng/datatype/DatatypeBuilder.java b/jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/DatatypeBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/org/relaxng/datatype/DatatypeBuilder.java rename to jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/DatatypeBuilder.java diff --git a/jaxws/src/share/jaxws_classes/org/relaxng/datatype/DatatypeException.java b/jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/DatatypeException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/org/relaxng/datatype/DatatypeException.java rename to jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/DatatypeException.java diff --git a/jaxws/src/share/jaxws_classes/org/relaxng/datatype/DatatypeLibrary.java b/jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/DatatypeLibrary.java similarity index 100% rename from jaxws/src/share/jaxws_classes/org/relaxng/datatype/DatatypeLibrary.java rename to jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/DatatypeLibrary.java diff --git a/jaxws/src/share/jaxws_classes/org/relaxng/datatype/DatatypeLibraryFactory.java b/jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/DatatypeLibraryFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/org/relaxng/datatype/DatatypeLibraryFactory.java rename to jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/DatatypeLibraryFactory.java diff --git a/jaxws/src/share/jaxws_classes/org/relaxng/datatype/DatatypeStreamingValidator.java b/jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/DatatypeStreamingValidator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/org/relaxng/datatype/DatatypeStreamingValidator.java rename to jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/DatatypeStreamingValidator.java diff --git a/jaxws/src/share/jaxws_classes/org/relaxng/datatype/ValidationContext.java b/jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/ValidationContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/org/relaxng/datatype/ValidationContext.java rename to jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/ValidationContext.java diff --git a/jaxws/src/share/jaxws_classes/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java b/jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java rename to jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java diff --git a/jaxws/src/share/jaxws_classes/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java b/jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java rename to jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java diff --git a/jaxws/src/share/jaxws_classes/org/relaxng/datatype/helpers/StreamingValidatorImpl.java b/jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/helpers/StreamingValidatorImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/org/relaxng/datatype/helpers/StreamingValidatorImpl.java rename to jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/helpers/StreamingValidatorImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin b/jaxws/src/jdk.xml.ws/share/classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin rename to jaxws/src/jdk.xml.ws/share/classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/Invoker.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/Invoker.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/Invoker.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/Invoker.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/ToolVersion.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/ToolVersion.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/ToolVersion.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/ToolVersion.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/WsGen.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/WsGen.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/WsGen.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/WsGen.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/WsImport.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/WsImport.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/WsImport.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/WsImport.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/api/TJavaGeneratorExtension.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/TJavaGeneratorExtension.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/api/TJavaGeneratorExtension.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/TJavaGeneratorExtension.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/api/WsgenExtension.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/WsgenExtension.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/api/WsgenExtension.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/WsgenExtension.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/api/WsgenProtocol.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/WsgenProtocol.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/api/WsgenProtocol.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/WsgenProtocol.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensible.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensible.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensible.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensible.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtension.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtension.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtension.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtension.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensionHandler.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensionHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensionHandler.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensionHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/api/wsdl/TWSDLOperation.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLOperation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/api/wsdl/TWSDLOperation.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLOperation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/api/wsdl/TWSDLParserContext.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLParserContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/api/wsdl/TWSDLParserContext.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLParserContext.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/package-info.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/package-info.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/ProcessorException.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/ProcessorException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/ProcessorException.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/ProcessorException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/CustomExceptionGenerator.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/CustomExceptionGenerator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/CustomExceptionGenerator.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/CustomExceptionGenerator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/GeneratorBase.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorBase.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/GeneratorBase.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorBase.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/GeneratorConstants.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorConstants.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/GeneratorConstants.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorConstants.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/GeneratorException.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/GeneratorException.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/GeneratorExtension.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorExtension.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/GeneratorExtension.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorExtension.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/GeneratorUtil.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorUtil.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/GeneratorUtil.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorUtil.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/JavaGeneratorExtensionFacade.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/JavaGeneratorExtensionFacade.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/JavaGeneratorExtensionFacade.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/JavaGeneratorExtensionFacade.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/JwsImplGenerator.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/JwsImplGenerator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/JwsImplGenerator.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/JwsImplGenerator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/Names.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/Names.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/Names.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/Names.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/SeiGenerator.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/SeiGenerator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/SeiGenerator.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/SeiGenerator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/ServiceGenerator.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/ServiceGenerator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/ServiceGenerator.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/ServiceGenerator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/W3CAddressingJavaGeneratorExtension.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/W3CAddressingJavaGeneratorExtension.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/W3CAddressingJavaGeneratorExtension.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/W3CAddressingJavaGeneratorExtension.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/AbstractType.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/AbstractType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/AbstractType.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/AbstractType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/AsyncOperation.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/AsyncOperation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/AsyncOperation.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/AsyncOperation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/AsyncOperationType.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/AsyncOperationType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/AsyncOperationType.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/AsyncOperationType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Block.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Block.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Block.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Block.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/ExtendedModelVisitor.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/ExtendedModelVisitor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/ExtendedModelVisitor.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/ExtendedModelVisitor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Fault.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Fault.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Fault.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Fault.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/HeaderFault.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/HeaderFault.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/HeaderFault.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/HeaderFault.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Message.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Message.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Model.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Model.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Model.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Model.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/ModelException.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/ModelException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/ModelException.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/ModelException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/ModelObject.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/ModelObject.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/ModelObject.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/ModelObject.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/ModelProperties.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/ModelProperties.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/ModelProperties.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/ModelProperties.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/ModelVisitor.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/ModelVisitor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/ModelVisitor.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/ModelVisitor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Operation.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Operation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Operation.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Operation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Parameter.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Parameter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Parameter.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Parameter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Port.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Port.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Port.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Port.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Request.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Request.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Request.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Request.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Response.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Response.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Response.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Response.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Service.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Service.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Service.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Service.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/exporter/ExternalObject.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/exporter/ExternalObject.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/exporter/ExternalObject.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/exporter/ExternalObject.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaArrayType.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaArrayType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaArrayType.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaArrayType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaException.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaException.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaInterface.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaInterface.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaInterface.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaInterface.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaMethod.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaMethod.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaMethod.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaMethod.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaParameter.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaParameter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaParameter.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaParameter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaSimpleType.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaSimpleType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaSimpleType.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaSimpleType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureMember.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureMember.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureMember.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureMember.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureType.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureType.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaType.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaType.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBElementMember.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBElementMember.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBElementMember.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBElementMember.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBMapping.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBMapping.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBMapping.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBMapping.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBModel.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBModel.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBModel.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBModel.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBProperty.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBProperty.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBProperty.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBProperty.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBStructuredType.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBStructuredType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBStructuredType.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBStructuredType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBType.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBType.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeAndAnnotation.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeAndAnnotation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeAndAnnotation.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeAndAnnotation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeVisitor.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeVisitor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeVisitor.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeVisitor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitMember.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitMember.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitMember.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitMember.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitStructure.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitStructure.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitStructure.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitStructure.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/Util.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/Util.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/Util.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/Util.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/JavaSimpleTypeCreator.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/JavaSimpleTypeCreator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/JavaSimpleTypeCreator.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/JavaSimpleTypeCreator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/Modeler.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/Modeler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/Modeler.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/Modeler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/ModelerConstants.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/ModelerConstants.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/ModelerConstants.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/ModelerConstants.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/ModelerException.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/ModelerException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/ModelerException.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/ModelerException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/AnnotationProcessorContext.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/AnnotationProcessorContext.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/AnnotationProcessorContext.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/AnnotationProcessorContext.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/FaultInfo.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/FaultInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/FaultInfo.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/FaultInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/MakeSafeTypeVisitor.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/MakeSafeTypeVisitor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/MakeSafeTypeVisitor.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/MakeSafeTypeVisitor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/MemberInfo.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/MemberInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/MemberInfo.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/MemberInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/ModelBuilder.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/ModelBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/ModelBuilder.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/ModelBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeModeler.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeModeler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeModeler.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeModeler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMoniker.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMoniker.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMoniker.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMoniker.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMonikerFactory.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMonikerFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMonikerFactory.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMonikerFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceAp.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceAp.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceAp.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceAp.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceConstants.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceConstants.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceConstants.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceConstants.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WrapperInfo.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WrapperInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WrapperInfo.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WrapperInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/AccessorElement.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/AccessorElement.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/AccessorElement.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/AccessorElement.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ClassNameAllocatorImpl.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ClassNameAllocatorImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ClassNameAllocatorImpl.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ClassNameAllocatorImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ConsoleErrorReporter.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ConsoleErrorReporter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ConsoleErrorReporter.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ConsoleErrorReporter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/JAXBModelBuilder.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/JAXBModelBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/JAXBModelBuilder.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/JAXBModelBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ModelerUtils.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ModelerUtils.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ModelerUtils.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ModelerUtils.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModelerBase.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModelerBase.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModelerBase.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModelerBase.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/util/ClassNameCollector.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/util/ClassNameCollector.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/util/ClassNameCollector.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/util/ClassNameCollector.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/util/DirectoryUtil.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/util/DirectoryUtil.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/util/DirectoryUtil.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/util/DirectoryUtil.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/util/IndentingWriter.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/util/IndentingWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/util/IndentingWriter.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/util/IndentingWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/ConfigurationMessages.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ConfigurationMessages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/ConfigurationMessages.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ConfigurationMessages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/GeneratorMessages.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/GeneratorMessages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/GeneratorMessages.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/GeneratorMessages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/JavacompilerMessages.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/JavacompilerMessages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/JavacompilerMessages.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/JavacompilerMessages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/ModelMessages.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ModelMessages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/ModelMessages.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ModelMessages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/ModelerMessages.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ModelerMessages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/ModelerMessages.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ModelerMessages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/ProcessorMessages.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ProcessorMessages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/ProcessorMessages.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ProcessorMessages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/UtilMessages.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/UtilMessages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/UtilMessages.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/UtilMessages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/WebserviceapMessages.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WebserviceapMessages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/WebserviceapMessages.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WebserviceapMessages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/WscompileMessages.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WscompileMessages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/WscompileMessages.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WscompileMessages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/WsdlMessages.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WsdlMessages.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/WsdlMessages.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WsdlMessages.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/configuration.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/configuration.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/configuration_de.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/configuration_de.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/configuration_es.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/configuration_es.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/configuration_fr.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/configuration_fr.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/configuration_it.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/configuration_it.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/configuration_ja.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/configuration_ja.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/configuration_ko.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/configuration_ko.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/configuration_pt_BR.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/configuration_pt_BR.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/configuration_zh_CN.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/configuration_zh_CN.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/configuration_zh_TW.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/configuration_zh_TW.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/generator.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/generator.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/generator_de.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/generator_de.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/generator_es.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/generator_es.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/generator_fr.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/generator_fr.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/generator_it.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/generator_it.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/generator_ja.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/generator_ja.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/generator_ko.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/generator_ko.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/generator_pt_BR.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/generator_pt_BR.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/generator_zh_CN.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/generator_zh_CN.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/generator_zh_TW.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/generator_zh_TW.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/javacompiler.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/javacompiler.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/javacompiler_de.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/javacompiler_de.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/javacompiler_es.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/javacompiler_es.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/javacompiler_fr.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/javacompiler_fr.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/javacompiler_it.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/javacompiler_it.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/javacompiler_ja.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/javacompiler_ja.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/javacompiler_ko.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/javacompiler_ko.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/javacompiler_pt_BR.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/javacompiler_pt_BR.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/javacompiler_zh_CN.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/javacompiler_zh_CN.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/javacompiler_zh_TW.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/javacompiler_zh_TW.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/model.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/model.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/model_de.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/model_de.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/model_es.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/model_es.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/model_fr.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/model_fr.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/model_it.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/model_it.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/model_ja.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/model_ja.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/model_ko.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/model_ko.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/model_pt_BR.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/model_pt_BR.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/model_zh_CN.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/model_zh_CN.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/model_zh_TW.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/model_zh_TW.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/modeler.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/modeler.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/modeler_de.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/modeler_de.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/modeler_es.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/modeler_es.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/modeler_fr.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/modeler_fr.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/modeler_it.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/modeler_it.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/modeler_ja.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/modeler_ja.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/modeler_ko.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/modeler_ko.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/modeler_pt_BR.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/modeler_pt_BR.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/modeler_zh_CN.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/modeler_zh_CN.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/modeler_zh_TW.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/modeler_zh_TW.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/processor.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/processor.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/processor_de.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/processor_de.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/processor_es.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/processor_es.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/processor_fr.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/processor_fr.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/processor_it.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/processor_it.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/processor_ja.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/processor_ja.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/processor_ko.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/processor_ko.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/processor_pt_BR.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/processor_pt_BR.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/processor_zh_CN.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/processor_zh_CN.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/processor_zh_TW.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/processor_zh_TW.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/util.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/util.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/util_de.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/util_de.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/util_es.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/util_es.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/util_fr.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/util_fr.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/util_it.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/util_it.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/util_ja.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/util_ja.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/util_ko.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/util_ko.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/util_pt_BR.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/util_pt_BR.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/util_zh_CN.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/util_zh_CN.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/util_zh_TW.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/util_zh_TW.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/webserviceap.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/webserviceap.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/webserviceap_de.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/webserviceap_de.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/webserviceap_es.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/webserviceap_es.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/webserviceap_fr.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/webserviceap_fr.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/webserviceap_it.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/webserviceap_it.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/webserviceap_ja.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/webserviceap_ja.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/webserviceap_ko.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/webserviceap_ko.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/webserviceap_pt_BR.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/webserviceap_pt_BR.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/webserviceap_zh_CN.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/webserviceap_zh_CN.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/webserviceap_zh_TW.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/webserviceap_zh_TW.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wscompile.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wscompile.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wscompile_de.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wscompile_de.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wscompile_es.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wscompile_es.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wscompile_fr.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wscompile_fr.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wscompile_it.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wscompile_it.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wscompile_ja.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wscompile_ja.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wscompile_ko.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wscompile_ko.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wscompile_pt_BR.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wscompile_pt_BR.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wscompile_zh_CN.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wscompile_zh_CN.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wscompile_zh_TW.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wscompile_zh_TW.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wsdl.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wsdl.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wsdl_de.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_de.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wsdl_de.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_de.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wsdl_es.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_es.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wsdl_es.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_es.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wsdl_fr.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_fr.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wsdl_fr.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_fr.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wsdl_it.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_it.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wsdl_it.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_it.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wsdl_ja.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_ja.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wsdl_ja.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_ja.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wsdl_ko.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_ko.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wsdl_ko.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_ko.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wsdl_pt_BR.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_pt_BR.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wsdl_pt_BR.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_pt_BR.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wsdl_zh_CN.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_zh_CN.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wsdl_zh_CN.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_zh_CN.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wsdl_zh_TW.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_zh_TW.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wsdl_zh_TW.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_zh_TW.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/spi/WSToolsObjectFactory.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/spi/WSToolsObjectFactory.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/spi/WSToolsObjectFactory.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/spi/WSToolsObjectFactory.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/spi/package-info.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/spi/package-info.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/spi/package-info.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/spi/package-info.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/util/ClassNameInfo.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/ClassNameInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/util/ClassNameInfo.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/ClassNameInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/util/ForkEntityResolver.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/ForkEntityResolver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/util/ForkEntityResolver.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/ForkEntityResolver.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/util/WSDLFetcher.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/WSDLFetcher.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/util/WSDLFetcher.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/WSDLFetcher.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/util/WSDLParseException.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/WSDLParseException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/util/WSDLParseException.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/WSDLParseException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/util/WSToolsObjectFactoryImpl.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/WSToolsObjectFactoryImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/util/WSToolsObjectFactoryImpl.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/WSToolsObjectFactoryImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/util/xml/XmlUtil.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/xml/XmlUtil.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/util/xml/XmlUtil.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/xml/XmlUtil.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/version.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/version.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/version.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/version.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/AbortException.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/AbortException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/AbortException.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/AbortException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/AuthInfo.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/AuthInfo.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/AuthInfo.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/AuthInfo.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/BadCommandLineException.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/BadCommandLineException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/BadCommandLineException.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/BadCommandLineException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/ErrorReceiver.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiver.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/ErrorReceiver.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiver.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/ErrorReceiverFilter.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiverFilter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/ErrorReceiverFilter.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiverFilter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/FilerCodeWriter.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/FilerCodeWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/FilerCodeWriter.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/FilerCodeWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/JavaCompilerHelper.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/JavaCompilerHelper.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/JavaCompilerHelper.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/JavaCompilerHelper.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/Options.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/Options.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/Options.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/Options.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/Plugin.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/Plugin.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/Plugin.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/Plugin.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WSCodeWriter.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WSCodeWriter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WSCodeWriter.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WSCodeWriter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsgenOptions.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsgenOptions.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsgenOptions.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsgenOptions.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsimportListener.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsimportListener.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsimportListener.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsimportListener.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsimportOptions.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsimportOptions.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsimportOptions.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsimportOptions.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/plugin/at_generated/PluginImpl.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/plugin/at_generated/PluginImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/plugin/at_generated/PluginImpl.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/plugin/at_generated/PluginImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Binding.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Binding.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Binding.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Binding.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/BindingFault.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingFault.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/BindingFault.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingFault.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/BindingInput.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingInput.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/BindingInput.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingInput.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/BindingOperation.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingOperation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/BindingOperation.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingOperation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/BindingOutput.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingOutput.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/BindingOutput.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingOutput.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Definitions.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Definitions.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Definitions.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Definitions.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Documentation.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Documentation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Documentation.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Documentation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Fault.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Fault.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Fault.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Fault.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Import.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Import.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Import.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Import.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Input.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Input.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Input.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Input.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Kinds.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Kinds.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Kinds.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Kinds.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Message.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Message.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Message.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Message.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/MessagePart.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/MessagePart.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/MessagePart.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/MessagePart.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Operation.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Operation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Operation.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Operation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/OperationStyle.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/OperationStyle.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/OperationStyle.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/OperationStyle.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Output.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Output.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Output.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Output.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Port.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Port.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Port.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Port.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/PortType.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/PortType.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/PortType.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/PortType.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Service.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Service.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Service.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Service.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Types.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Types.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Types.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Types.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/WSDLConstants.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLConstants.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/WSDLConstants.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLConstants.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocument.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocument.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocument.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocument.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitor.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitor.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitorBase.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitorBase.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitorBase.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitorBase.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPAddress.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPAddress.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPAddress.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPAddress.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPBinding.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPBinding.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPBinding.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPBinding.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPConstants.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPConstants.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPConstants.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPConstants.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPOperation.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPOperation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPOperation.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPOperation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlEncoded.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlEncoded.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlEncoded.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlEncoded.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlReplacement.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlReplacement.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlReplacement.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlReplacement.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/jaxws/CustomName.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/CustomName.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/jaxws/CustomName.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/CustomName.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/jaxws/Exception.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/Exception.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/jaxws/Exception.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/Exception.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBinding.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBinding.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBinding.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBinding.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBindingsConstants.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBindingsConstants.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBindingsConstants.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBindingsConstants.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/jaxws/Parameter.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/Parameter.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/jaxws/Parameter.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/Parameter.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEConstants.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEConstants.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEConstants.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEConstants.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEContent.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEContent.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEContent.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEContent.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEMultipartRelated.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEMultipartRelated.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEMultipartRelated.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEMultipartRelated.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEPart.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEPart.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEPart.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEPart.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEXml.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEXml.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEXml.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEXml.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaConstants.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaConstants.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaConstants.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaConstants.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaKinds.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaKinds.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaKinds.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaKinds.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Binding.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Binding.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Binding.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Binding.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Constants.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Constants.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Constants.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Constants.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPAddress.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPAddress.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPAddress.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPAddress.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBinding.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBinding.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBinding.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBinding.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBody.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBody.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBody.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBody.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPConstants.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPConstants.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPConstants.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPConstants.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPFault.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPFault.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPFault.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPFault.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeader.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeader.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeader.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeader.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeaderFault.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeaderFault.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeaderFault.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeaderFault.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPOperation.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPOperation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPOperation.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPOperation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPStyle.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPStyle.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPStyle.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPStyle.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPUse.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPUse.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPUse.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPUse.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/AbstractDocument.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/AbstractDocument.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/AbstractDocument.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/AbstractDocument.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/Defining.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/Defining.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/Defining.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/Defining.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/DuplicateEntityException.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/DuplicateEntityException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/DuplicateEntityException.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/DuplicateEntityException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/Elemental.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/Elemental.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/Elemental.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/Elemental.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/Entity.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/Entity.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/Entity.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/Entity.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/EntityAction.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityAction.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/EntityAction.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityAction.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceAction.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceAction.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceAction.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceAction.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceValidator.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceValidator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceValidator.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceValidator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/ExtensibilityHelper.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensibilityHelper.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/ExtensibilityHelper.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensibilityHelper.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionImpl.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionImpl.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitor.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitor.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitor.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitor.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitorBase.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitorBase.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitorBase.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitorBase.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/ExternalEntityReference.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExternalEntityReference.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/ExternalEntityReference.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExternalEntityReference.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/GlobalEntity.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/GlobalEntity.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/GlobalEntity.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/GlobalEntity.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/GloballyKnown.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/GloballyKnown.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/GloballyKnown.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/GloballyKnown.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/Identifiable.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/Identifiable.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/Identifiable.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/Identifiable.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/Kind.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/Kind.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/Kind.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/Kind.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/NoSuchEntityException.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/NoSuchEntityException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/NoSuchEntityException.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/NoSuchEntityException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/ParseException.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ParseException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/ParseException.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ParseException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/ParserListener.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ParserListener.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/ParserListener.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ParserListener.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/QNameAction.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/QNameAction.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/QNameAction.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/QNameAction.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/TWSDLParserContextImpl.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/TWSDLParserContextImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/TWSDLParserContextImpl.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/TWSDLParserContextImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/ValidationException.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ValidationException.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/ValidationException.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ValidationException.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/WSDLLocation.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/WSDLLocation.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/WSDLLocation.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/WSDLLocation.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/AbstractExtensionHandler.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/AbstractExtensionHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/AbstractExtensionHandler.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/AbstractExtensionHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/AbstractReferenceFinderImpl.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/AbstractReferenceFinderImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/AbstractReferenceFinderImpl.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/AbstractReferenceFinderImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/Constants.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/Constants.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/Constants.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/Constants.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/ContextClassloaderLocal.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/ContextClassloaderLocal.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/ContextClassloaderLocal.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/ContextClassloaderLocal.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/ContextClassloaderLocal.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/ContextClassloaderLocal.properties similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/ContextClassloaderLocal.properties rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/ContextClassloaderLocal.properties diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/DOMBuilder.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMBuilder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/DOMBuilder.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMBuilder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestParser.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestParser.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestParser.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestParser.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestScanner.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestScanner.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestScanner.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestScanner.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/HTTPExtensionHandler.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/HTTPExtensionHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/HTTPExtensionHandler.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/HTTPExtensionHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/InternalizationLogic.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/InternalizationLogic.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/InternalizationLogic.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/InternalizationLogic.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/JAXWSBindingExtensionHandler.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/JAXWSBindingExtensionHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/JAXWSBindingExtensionHandler.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/JAXWSBindingExtensionHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/MIMEExtensionHandler.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/MIMEExtensionHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/MIMEExtensionHandler.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/MIMEExtensionHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/MemberSubmissionAddressingExtensionHandler.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/MemberSubmissionAddressingExtensionHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/MemberSubmissionAddressingExtensionHandler.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/MemberSubmissionAddressingExtensionHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/MetadataFinder.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/MetadataFinder.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/MetadataFinder.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/MetadataFinder.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/NamespaceContextImpl.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/NamespaceContextImpl.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/NamespaceContextImpl.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/NamespaceContextImpl.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/Policy12ExtensionHandler.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/Policy12ExtensionHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/Policy12ExtensionHandler.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/Policy12ExtensionHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/Policy15ExtensionHandler.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/Policy15ExtensionHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/Policy15ExtensionHandler.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/Policy15ExtensionHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/SOAP12ExtensionHandler.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAP12ExtensionHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/SOAP12ExtensionHandler.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAP12ExtensionHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/SOAPEntityReferenceValidator.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAPEntityReferenceValidator.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/SOAPEntityReferenceValidator.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAPEntityReferenceValidator.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/SOAPExtensionHandler.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAPExtensionHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/SOAPExtensionHandler.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAPExtensionHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/Util.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/Util.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/Util.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/Util.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/VersionChecker.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/VersionChecker.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/VersionChecker.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/VersionChecker.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingExtensionHandler.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingExtensionHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingExtensionHandler.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingExtensionHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingMetadataExtensionHandler.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingMetadataExtensionHandler.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingMetadataExtensionHandler.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingMetadataExtensionHandler.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/WSDLInternalizationLogic.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLInternalizationLogic.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/WSDLInternalizationLogic.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLInternalizationLogic.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/WSDLParser.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLParser.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/WSDLParser.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLParser.java diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/WhitespaceStripper.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/WhitespaceStripper.java similarity index 100% rename from jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/WhitespaceStripper.java rename to jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/WhitespaceStripper.java diff --git a/jdk/.hgtags b/jdk/.hgtags index d5928939618..9b0360a42ef 100644 --- a/jdk/.hgtags +++ b/jdk/.hgtags @@ -268,3 +268,4 @@ f87c5be90e01a7ffb47947108eb3e0b0b1920880 jdk9-b20 9febf9dbc0a4b15323f2dbd29931cfbf086332b4 jdk9-b23 875450e7ef8dde8f59db662ec1351ea30b8cb35d jdk9-b24 a31efe49556a7c12f9ea2c9ee8b4fae8aa67723a jdk9-b25 +dde9f5cfde5f46e62ceb5fab81151578e5277aef jdk9-b26 diff --git a/jdk/make/BuildJdk.gmk b/jdk/make/BuildJdk.gmk deleted file mode 100644 index ac6d919689f..00000000000 --- a/jdk/make/BuildJdk.gmk +++ /dev/null @@ -1,142 +0,0 @@ -# -# Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# This must be the first rule -default: all - -# Inclusion of this pseudo-target will cause make to execute this file -# serially, regardless of -j. Recursively called makefiles will not be -# affected, however. This is required for correct dependency management. -.NOTPARALLEL: - -include $(SPEC) -include MakeBase.gmk -include JavaCompilation.gmk -include NativeCompilation.gmk - -# Setup the java compilers for the JDK build. -include Setup.gmk - -# Include Profile information -include ProfileNames.gmk - -# Hook to include the corresponding custom file, if present. -$(eval $(call IncludeCustomExtension, jdk, BuildJdk.gmk)) - -import: import-only -import-only: - # Import (corba jaxp jaxws langtools hotspot) - +$(MAKE) -f Import.gmk - -gensrc: import gensrc-only -gensrc-only: - +$(MAKE) -f GenerateSources.gmk - # Ok, now gensrc is fully populated. - -gendata: gensrc gendata-only -gendata-only: - +$(MAKE) -f GenerateData.gmk - -classes: gendata classes-only -classes-only: - +$(MAKE) -f CompileJavaClasses.gmk - # The classes are now built and - # any javah files have now been generated. - -libs: classes libs-only -libs-only: - +$(MAKE) -f CompileNativeLibraries.gmk - -launchers: libs launchers-only -launchers-only: - # Finally compile the launchers. - +$(MAKE) -f CompileLaunchers.gmk - -genclasses: launchers genclasses-only -genclasses-only: - # Generate classes that have other sources. Needs - # to execute launchers. - +$(MAKE) -f GenerateClasses.gmk - -securityjars: genclasses securityjars-only -securityjars-only: - +$(MAKE) -f CreateSecurityJars.gmk - -jdk: securityjars - # Now we have a complete jdk, which you can run. - # It is not yet wrapped up as an installed image. - -demos: - # The demos are compiled against this jdk. - +$(MAKE) -f CompileDemos.gmk - # Now copy the sample sources into the jdk. - +$(MAKE) -f CopySamples.gmk - -# Create the final jdk and jre images, to be wrapped up -# into packages, or installed. Ensure PROFILE is not set -# in these cases. -images: - +$(MAKE) PROFILE="" -f CreateJars.gmk - +$(MAKE) PROFILE="" -f Images.gmk - ifeq ($(OPENJDK_TARGET_OS), macosx) - +$(MAKE) -f Bundles.gmk - endif - -overlay-images: - +$(MAKE) -f CompileLaunchers.gmk OVERLAY_IMAGES=true - +$(MAKE) -f Images.gmk overlay-images - -# Create Compact Profile images -$(ALL_PROFILES): - +$(MAKE) PROFILE=$@ -f CreateJars.gmk - +$(MAKE) PROFILE=$@ JRE_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/j2re-$(word $(call profile_number,$@),$(PROFILE_NAMES))-image -f Images.gmk profile-image - -profiles: $(ALL_PROFILES) - -sign-jars: - +$(MAKE) -f SignJars.gmk - -BINARIES := $(notdir $(wildcard $(JDK_IMAGE_DIR)/bin/*)) -INSTALLDIR := openjdk-$(RELEASE) - -# Install the jdk image, in a very crude way. Not taking into -# account, how to install properly on macosx or windows etc. -install: - echo Installing jdk image into $(INSTALL_PREFIX)/jvm/$(INSTALLDIR) - echo and creating $(words $(BINARIES)) links from $(INSTALL_PREFIX)/bin into the jdk. - $(MKDIR) -p $(INSTALL_PREFIX)/jvm/$(INSTALLDIR) - $(RM) -r $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)/* - $(CP) -rp $(JDK_IMAGE_DIR)/* $(INSTALL_PREFIX)/jvm/$(INSTALLDIR) - $(MKDIR) -p $(INSTALL_PREFIX)/bin - $(RM) $(addprefix $(INSTALL_PREFIX)/bin/, $(BINARIES)) - $(foreach b, $(BINARIES), $(LN) -s $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)/bin/$b $(INSTALL_PREFIX)/bin/$b &&) true - -# The all target builds the JDK, but not the images -all: jdk - -.PHONY: import gensrc gendata classes libs launchers genclasses -.PHONY: import-only gensrc-only gendata-only classes-only libs-only launchers-only genclasses-only -.PHONY: all jdk demos images overlay-images bundles install -.PHONY: profiles $(ALL_PROFILES) diff --git a/jdk/make/Bundles.gmk b/jdk/make/Bundles.gmk index f6139ab6932..57ab08784cf 100644 --- a/jdk/make/Bundles.gmk +++ b/jdk/make/Bundles.gmk @@ -35,7 +35,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) # JDK_BUNDLE_DIR and JRE_BUNDLE_DIR are defined in SPEC. - MACOSX_SRC := $(JDK_TOPDIR)/src/macosx + MACOSX_PLIST_SRC := $(JDK_TOPDIR)/make/bundle # All these OPENJDK checks are needed since there is no coherency between # these values in open and closed. Should probably be fixed. @@ -106,7 +106,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) -e "s/@@PLATFORM_VERSION@@/$(BUNDLE_PLATFORM_VERSION)/g" \ -e "s/@@VERSION@@/$(BUNDLE_VERSION)/g" \ -e "s/@@VENDOR@@/$(BUNDLE_VENDOR)/g" \ - < $(MACOSX_SRC)/bundle/JDK-Info.plist > $@ + < $(MACOSX_PLIST_SRC)/JDK-Info.plist > $@ $(JRE_BUNDLE_DIR)/Info.plist: $(SPEC) $(ECHO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@) @@ -117,7 +117,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) -e "s/@@PLATFORM_VERSION@@/$(BUNDLE_PLATFORM_VERSION)/g" \ -e "s/@@VERSION@@/$(BUNDLE_VERSION)/g" \ -e "s/@@VENDOR@@/$(BUNDLE_VENDOR)/g" \ - < $(MACOSX_SRC)/bundle/JRE-Info.plist > $@ + < $(MACOSX_PLIST_SRC)/JRE-Info.plist > $@ jdk-bundle: $(JDK_TARGET_LIST) $(JDK_BUNDLE_DIR)/MacOS/libjli.dylib \ $(JDK_BUNDLE_DIR)/Info.plist diff --git a/jdk/make/CompileDemos.gmk b/jdk/make/CompileDemos.gmk index 2cdf72211e0..531e61765a2 100644 --- a/jdk/make/CompileDemos.gmk +++ b/jdk/make/CompileDemos.gmk @@ -31,9 +31,9 @@ include JavaCompilation.gmk include NativeCompilation.gmk # Setup the java compilers for the JDK build. -include Setup.gmk +include SetupJava.gmk -# Prepare the find cache. Only used if running on windows. +# Prepare the find cache. $(eval $(call FillCacheFind, $(JDK_TOPDIR)/src)) # Append demo goals to this variable. @@ -43,12 +43,18 @@ BUILD_DEMOS = # Now every other demo has its own quirks where to put the # READMEs and other files. +DEMO_SHARE_SRC := $(JDK_TOPDIR)/src/demo/share +DEMO_CLOSED_SHARE_SRC := $(JDK_TOPDIR)/src/closed/demo/share +DEMO_SOLARIS_SRC := $(JDK_TOPDIR)/src/demo/solaris +DEMO_OS_API_SRC := $(JDK_TOPDIR)/src/demo/$(OPENJDK_TARGET_OS_API_DIR) +VERSION_INFO_RESOURCE := $(JDK_TOPDIR)/src/java.base/windows/native/common/version.rc + ################################################################################################## define SetupAppletDemo $$(eval $$(call SetupJavaCompilation,BUILD_DEMO_APPLET_$1, \ SETUP := GENERATE_USINGJDKBYTECODE, \ - SRC := $(JDK_TOPDIR)/src/$3share/demo/applets/$1, \ + SRC := $(JDK_TOPDIR)/src/$3demo/share/applets/$1, \ BIN := $(JDK_OUTPUTDIR)/demo/applets/$1, \ COPY := .html .java .xyz .obj .au .gif, \ DISABLE_SJAVAC := $2)) @@ -96,10 +102,11 @@ define SetupDemo # Param 11 = Extra manifest attribute # Param 12 = Suffix for compiler setup name + $1_SRC_BASE := $(JDK_TOPDIR)/src/$6demo/share/$2/$1 # In some demos the source is found in a subdir called src. - $1_MAIN_SRC := $$(wildcard $(JDK_TOPDIR)/src/$6share/demo/$2/$1/src) + $1_MAIN_SRC := $$(wildcard $$($1_SRC_BASE)/src) ifeq ($$($1_MAIN_SRC), ) - $1_MAIN_SRC := $(JDK_TOPDIR)/src/$6share/demo/$2/$1 + $1_MAIN_SRC := $$($1_SRC_BASE) endif ifneq ($8, ) @@ -129,11 +136,11 @@ define SetupDemo endif # Copy files. - $1_COPY_TARGETS := $$(patsubst $(JDK_TOPDIR)/src/$6share/demo/$2/$1/%, \ + $1_COPY_TARGETS := $$(patsubst $$($1_SRC_BASE)/%, \ $(JDK_OUTPUTDIR)/demo/$2/$1/%, \ - $$(wildcard $$(addprefix $(JDK_TOPDIR)/src/$6share/demo/$2/$1/, $7))) + $$(wildcard $$(addprefix $$($1_SRC_BASE)/, $7))) ifneq ($7, ) - $(JDK_OUTPUTDIR)/demo/$2/$1/%: $(JDK_TOPDIR)/src/$6share/demo/$2/$1/% + $(JDK_OUTPUTDIR)/demo/$2/$1/%: $$($1_SRC_BASE)/% $$(call install-file) $(CHMOD) -f ug+w $$@ @@ -145,10 +152,10 @@ endef $(eval $(call SetupDemo,CodePointIM,jfc,,CodePointIM,,,*.html)) $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/_the.services: \ $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/CodePointIM.jar \ - $(JDK_TOPDIR)/src/share/demo/jfc/CodePointIM/java.awt.im.spi.InputMethodDescriptor + $(DEMO_SHARE_SRC)/jfc/CodePointIM/java.awt.im.spi.InputMethodDescriptor (cd $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM && \ $(MKDIR) -p _the.tmp/META-INF/services && \ - $(CP) $(JDK_TOPDIR)/src/share/demo/jfc/CodePointIM/java.awt.im.spi.InputMethodDescriptor _the.tmp/META-INF/services && \ + $(CP) $(DEMO_SHARE_SRC)/jfc/CodePointIM/java.awt.im.spi.InputMethodDescriptor _the.tmp/META-INF/services && \ cd _the.tmp && \ $(JAR) uf $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/CodePointIM.jar META-INF/services/java.awt.im.spi.InputMethodDescriptor && \ cd META-INF/services && \ @@ -182,15 +189,15 @@ ifndef OPENJDK $(eval $(call SetupDemo,Java2D,jfc,,java2d.Java2Demo,,closed/,*.html README*,Java2Demo)) $(eval $(call SetupDemo,Stylepad,jfc,,Stylepad, \ - $(JDK_TOPDIR)/src/share/demo/jfc/Notepad,closed/,*.txt,,$(JDK_TOPDIR)/src/share/demo/jfc/Notepad/README.txt)) + $(DEMO_SHARE_SRC)/jfc/Notepad,closed/,*.txt,,$(DEMO_SHARE_SRC)/jfc/Notepad/README.txt)) $(eval $(call SetupDemo,SwingSet2,jfc,,SwingSet2,,closed/,README* *.html,,,.java COPYRIGHT, \ SplashScreen-Image: resources/images/splash.png,true)) - BUILD_DEMOS += $(patsubst $(JDK_TOPDIR)/src/closed/share/demo/nbproject/%, \ + BUILD_DEMOS += $(patsubst $(DEMO_CLOSED_SHARE_SRC)/nbproject/%, \ $(JDK_OUTPUTDIR)/demo/nbproject/%, \ - $(call CacheFind, $(JDK_TOPDIR)/src/closed/share/demo/nbproject)) + $(call CacheFind, $(DEMO_CLOSED_SHARE_SRC)/nbproject)) - $(JDK_OUTPUTDIR)/demo/nbproject/%: $(JDK_TOPDIR)/src/closed/share/demo/nbproject/% + $(JDK_OUTPUTDIR)/demo/nbproject/%: $(DEMO_CLOSED_SHARE_SRC)/nbproject/% $(call install-file) $(CHMOD) -f ug+w $@ endif @@ -215,12 +222,12 @@ define SetupJVMTIDemo # Param 8 = libs for linux # Param 9 = extra directories with required sources BUILD_DEMO_JVMTI_$1_EXTRA_SRC := \ - $$(wildcard $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/demo/jvmti/$1) \ - $$(wildcard $$(addprefix $(JDK_TOPDIR)/src/share/demo/jvmti/, $2)) \ + $$(wildcard $(DEMO_OS_API_SRC)/jvmti/$1) \ + $$(wildcard $$(addprefix $(DEMO_SHARE_SRC)/jvmti/, $2)) \ $9 BUILD_DEMO_JVMTI_$1_EXTRA_SRC_EXCLUDE := \ - $$(wildcard $$(addprefix $(JDK_TOPDIR)/src/share/demo/jvmti/, $2)/README.txt) \ - $$(wildcard $$(addprefix $(JDK_TOPDIR)/src/share/demo/jvmti/, $2)/sample.makefile.txt) + $$(wildcard $$(patsubst %, $(DEMO_SHARE_SRC)/jvmti/%/README.txt, $2)) \ + $$(wildcard $$(patsubst %, $(DEMO_SHARE_SRC)/jvmti/%/sample.makefile.txt, $2)) BUILD_DEMO_JVMTI_$1_EXTRA_INC := $$(addprefix -I, $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC)) BUILD_DEMO_JVMTI_$1_LANG := C ifneq (, $4) @@ -230,7 +237,7 @@ define SetupJVMTIDemo $1_EXTRA_CXX := $(LDFLAGS_CXX_JDK) $(LIBCXX) endif - $1_CXXFLAGS := $(CXXFLAGS_JDKLIB) -I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 \ + $1_CXXFLAGS := $(CXXFLAGS_JDKLIB) -I$(DEMO_SHARE_SRC)/jvmti/$1 \ $$(BUILD_DEMO_JVMTI_$1_EXTRA_INC) $3 \ $(CXXFLAGS_DEBUG_SYMBOLS) ifeq ($1-$(OPENJDK_TARGET_CPU_ARCH), waiters-sparc) @@ -241,11 +248,11 @@ define SetupJVMTIDemo # Workaround for CFLAGS_JDKLIB containing ',' on solaris. If this is added as 'CFLAGS' to the # eval call below, the comma gets expanded too early. BUILD_DEMO_JVMTI_$1_CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_DEBUG_SYMBOLS) \ - -I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_INC) $3 + -I$(DEMO_SHARE_SRC)/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_INC) $3 # Remove the -incremental:no setting to get .ilk-files like in the old build. $$(eval $$(call SetupNativeCompilation,BUILD_DEMO_JVMTI_$1, \ - SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC), \ + SRC := $(DEMO_SHARE_SRC)/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC), \ LANG := $$(BUILD_DEMO_JVMTI_$1_LANG), \ OPTIMIZATION := LOW, \ CXXFLAGS := $$($1_CXXFLAGS), \ @@ -256,7 +263,7 @@ define SetupJVMTIDemo LDFLAGS_SUFFIX_windows := $6, \ LDFLAGS_SUFFIX_solaris := $7 -lc, \ LDFLAGS_SUFFIX_linux := $8, \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ + VERSIONINFO_RESOURCE := $(VERSION_INFO_RESOURCE), \ RC_FLAGS := $$(RC_FLAGS) \ -D "JDK_FNAME=$1.dll" \ -D "JDK_INTERNAL_NAME=$1" \ @@ -266,18 +273,18 @@ define SetupJVMTIDemo LIBRARY := $1)) $$(eval $$(call SetupZipArchive,BUILD_DEMO_JVMTI_SRC_$1, \ - SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC), \ + SRC := $(DEMO_SHARE_SRC)/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC), \ EXCLUDE_FILES := $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC_EXCLUDE), \ ZIP := $(JDK_OUTPUTDIR)/demo/jvmti/$1/src.zip)) - $(JDK_OUTPUTDIR)/demo/jvmti/$1/README.txt: $(JDK_TOPDIR)/src/share/demo/jvmti/$1/README.txt + $(JDK_OUTPUTDIR)/demo/jvmti/$1/README.txt: $(DEMO_SHARE_SRC)/jvmti/$1/README.txt $$(call install-file) $(CHMOD) -f ug+w $$@ - ifneq (, $$(wildcard $(JDK_TOPDIR)/src/share/demo/jvmti/$1/*.java)) + ifneq (, $$(wildcard $(DEMO_SHARE_SRC)/jvmti/$1/*.java)) $$(eval $$(call SetupJavaCompilation,BUILD_DEMO_JVMTI_$1_JAVA, \ SETUP := GENERATE_USINGJDKBYTECODE, \ - SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/$1, \ + SRC := $(DEMO_SHARE_SRC)/jvmti/$1, \ BIN := $(JDK_OUTPUTDIR)/democlasses/jvmti/$1, \ COPY := $(PATTERNS_TO_COPY), \ JAR := $(JDK_OUTPUTDIR)/demo/jvmti/$1/$1.jar, \ @@ -329,40 +336,39 @@ $(eval $(call SetupJVMTIDemo,versionCheck, agent_util)) ################################################################################################## -# The jpda demo (com/sun/tools/example) is oddly enough stored in src/share/classes. -# At least, we do not need to compile the jpda demo, just jar/zip up the sources. -JPDA_SOURCES := $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/tools/example) -# The number of files are few enough so that we can use echo safely below to list them. -JPDA_FILES := $(subst $(JDK_TOPDIR)/src/share/classes/,,$(JPDA_SOURCES)) - -$(JDK_OUTPUTDIR)/demo/jpda/src.zip: $(JPDA_SOURCES) - $(MKDIR) -p $(@D) - (cd $(JDK_TOPDIR)/src/share/classes && $(ZIP) -qru $@ com -i "com/sun/tools/example/*") - -$(JDK_OUTPUTDIR)/demo/jpda/examples.jar: $(JPDA_SOURCES) - $(MKDIR) -p $(@D) - $(RM) $(@D)/_the.sources - $(call ListPathsSafely,JPDA_FILES,\n, >> $(@D)/_the.sources) - $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \ - -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" $(JDK_TOPDIR)/make/data/mainmanifest/manifest.mf > $(@D)/_the.manifest - $(ECHO) "Main-Class: " >> $(@D)/_the.manifest - (cd $(JDK_TOPDIR)/src/share/classes && $(JAR) cfm $@ $(@D)/_the.manifest @$(@D)/_the.sources) - (cd $(JDK_TOPDIR)/src/share/classes/com/sun/tools/example && $(JAR) uf $@ README) - -$(JDK_OUTPUTDIR)/demo/jpda/com/sun/tools/example/README: $(JDK_TOPDIR)/src/share/classes/com/sun/tools/example/README +$(JDK_OUTPUTDIR)/demo/jpda/com/sun/tools/example/README: \ + $(JDK_TOPDIR)/src/demo/share/jpda/com/sun/tools/example/README $(call install-file) $(CHMOD) -f ug+w $@ -BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jpda/src.zip $(JDK_OUTPUTDIR)/demo/jpda/examples.jar \ - $(JDK_OUTPUTDIR)/demo/jpda/com/sun/tools/example/README +$(eval $(call SetupArchive,JPDA_JAR, \ + $(JDK_OUTPUTDIR)/demo/jpda/com/sun/tools/example/README, \ + SRCS := $(JDK_TOPDIR)/src/demo/share/jpda \ + $(JDK_TOPDIR)/src/jdk.jdi/share/classes \ + $(JDK_OUTPUTDIR)/demo/jpda/com/sun/tools/example, \ + INCLUDES := com/sun/tools/example README, \ + SUFFIXES := .java .html .jj README, \ + JAR := $(JDK_OUTPUTDIR)/demo/jpda/examples.jar, \ + MANIFEST := $(JDK_TOPDIR)/make/data/mainmanifest/manifest.mf, \ + EXTRA_MANIFEST_ATTR := Main-Class:$$(SPACE), \ + SKIP_METAINF := true)) + +$(eval $(call SetupZipArchive,JPDA_ZIP, \ + SRC := $(JDK_TOPDIR)/src/demo/share/jpda \ + $(JDK_TOPDIR)/src/jdk.jdi/share/classes, \ + INCLUDES := com/sun/tools/example, \ + SUFFIXES := .java .html .jj README, \ + ZIP := $(JDK_OUTPUTDIR)/demo/jpda/src.zip)) + +BUILD_DEMOS += $(JPDA_JAR) $(JPDA_ZIP) ################################################################################################## -$(JDK_OUTPUTDIR)/demo/management/index.html: $(JDK_TOPDIR)/src/share/demo/management/index.html +$(JDK_OUTPUTDIR)/demo/management/index.html: $(DEMO_SHARE_SRC)/management/index.html $(call install-file) $(CHMOD) -f ug+w $@ -$(JDK_OUTPUTDIR)/demo/jvmti/index.html: $(JDK_TOPDIR)/src/share/demo/jvmti/index.html +$(JDK_OUTPUTDIR)/demo/jvmti/index.html: $(DEMO_SHARE_SRC)/jvmti/index.html $(call install-file) $(CHMOD) -f ug+w $@ @@ -373,23 +379,23 @@ BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/management/index.html \ # The netbeans project files are copied into the demo directory. ifeq ($(OPENJDK_TARGET_OS), solaris) - BUILD_DEMOS += $(patsubst $(JDK_TOPDIR)/src/share/demo/nbproject/%, \ + BUILD_DEMOS += $(patsubst $(DEMO_SHARE_SRC)/nbproject/%, \ $(JDK_OUTPUTDIR)/demo/nbproject/%, \ - $(filter-out $(JDK_TOPDIR)/src/share/demo/nbproject/jfc/SwingApplet%, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/demo/nbproject))) + $(filter-out $(DEMO_SHARE_SRC)/nbproject/jfc/SwingApplet%, \ + $(call CacheFind, $(DEMO_SHARE_SRC)/nbproject))) else - BUILD_DEMOS += $(patsubst $(JDK_TOPDIR)/src/share/demo/nbproject/%, \ + BUILD_DEMOS += $(patsubst $(DEMO_SHARE_SRC)/nbproject/%, \ $(JDK_OUTPUTDIR)/demo/nbproject/%, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/demo/nbproject)) + $(call CacheFind, $(DEMO_SHARE_SRC)/nbproject)) endif -$(JDK_OUTPUTDIR)/demo/nbproject/%: $(JDK_TOPDIR)/src/share/demo/nbproject/% +$(JDK_OUTPUTDIR)/demo/nbproject/%: $(DEMO_SHARE_SRC)/nbproject/% $(call install-file) $(CHMOD) -f ug+w $@ ################################################################################################## -$(JDK_OUTPUTDIR)/demo/README: $(JDK_TOPDIR)/src/share/demo/README +$(JDK_OUTPUTDIR)/demo/README: $(DEMO_SHARE_SRC)/README $(call install-file) BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/README @@ -398,11 +404,11 @@ BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/README ifeq ($(OPENJDK_TARGET_OS), solaris) - $(JDK_OUTPUTDIR)/democlasses/jni/Poller/%: $(JDK_TOPDIR)/src/solaris/demo/jni/Poller/% + $(JDK_OUTPUTDIR)/democlasses/jni/Poller/%: $(DEMO_SOLARIS_SRC)/jni/Poller/% $(call install-file) $(CHMOD) -f ug+w $@ - $(JDK_OUTPUTDIR)/demo/jni/Poller/README.txt: $(JDK_TOPDIR)/src/solaris/demo/jni/Poller/README.txt + $(JDK_OUTPUTDIR)/demo/jni/Poller/README.txt: $(DEMO_SOLARIS_SRC)/jni/Poller/README.txt $(call install-file) $(CHMOD) -f ug+w $@ @@ -411,7 +417,7 @@ ifeq ($(OPENJDK_TARGET_OS), solaris) $(eval $(call SetupJavaCompilation,BUILD_DEMO_POLLER_JAR, \ SETUP := GENERATE_USINGJDKBYTECODE, \ - SRC := $(JDK_TOPDIR)/src/solaris/demo/jni/Poller, \ + SRC := $(DEMO_SOLARIS_SRC)/jni/Poller, \ BIN := $(JDK_OUTPUTDIR)/democlasses/jni/Poller, \ HEADERS := $(JDK_OUTPUTDIR)/democlasses/jni/Poller, \ JAR := $(JDK_OUTPUTDIR)/demo/jni/Poller/Poller.jar, \ @@ -426,7 +432,7 @@ ifeq ($(OPENJDK_TARGET_OS), solaris) $(JDK_OUTPUTDIR)/demo/jni/Poller/README.txt $(eval $(call SetupNativeCompilation,BUILD_LIBPOLLER, \ - SRC := $(JDK_TOPDIR)/src/solaris/demo/jni/Poller, \ + SRC := $(DEMO_SOLARIS_SRC)/jni/Poller, \ LANG := C, \ OPTIMIZATION := LOW, \ CFLAGS := $(CFLAGS_JDKLIB) $(SHARED_LIBRARY_FLAGS) \ @@ -453,7 +459,8 @@ endif ################################################################################################## ifndef OPENJDK - DB_DEMO_ZIPFILE := $(wildcard $(JDK_TOPDIR)/src/closed/share/db/*.zip) + DB_ZIP_DIR := $(wildcard $(JDK_TOPDIR)/src/closed/db) + DB_DEMO_ZIPFILE := $(wildcard $(DB_ZIP_DIR)/*.zip) $(JDK_OUTPUTDIR)/demo/_the.db.unzipped: $(DB_DEMO_ZIPFILE) $(MKDIR) -p $(@D) @@ -465,10 +472,10 @@ ifndef OPENJDK # Copy this after the unzip above to avoid race with directory creation and mv command. $(JDK_OUTPUTDIR)/demo/db/README-JDK-DEMOS.html: \ - $(JDK_TOPDIR)/src/closed/share/db/README-JDK-DEMOS.html \ + $(DB_ZIP_DIR)/README-JDK-DEMOS.html \ | $(JDK_OUTPUTDIR)/demo/_the.db.unzipped $(MKDIR) -p $(@D) - $(CAT) $< | $(SED) "s/XXXX/$(shell cat $(JDK_TOPDIR)/src/closed/share/db/COPYRIGHTYEAR)/" > $@ + $(CAT) $< | $(SED) "s/XXXX/$(shell cat $(DB_ZIP_DIR)/COPYRIGHTYEAR)/" > $@ BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/_the.db.unzipped $(JDK_OUTPUTDIR)/demo/db/README-JDK-DEMOS.html endif diff --git a/jaxp/make/BuildJaxp.gmk b/jdk/make/CompileInterimRmic.gmk similarity index 54% rename from jaxp/make/BuildJaxp.gmk rename to jdk/make/CompileInterimRmic.gmk index 4efd49f4921..74f789dfa61 100644 --- a/jaxp/make/BuildJaxp.gmk +++ b/jdk/make/CompileInterimRmic.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -23,33 +23,32 @@ # questions. # -# This must be the first rule default: all --include $(SPEC) +include $(SPEC) include MakeBase.gmk include JavaCompilation.gmk +include SetupJava.gmk -DISABLE_JAXP_WARNINGS := -Xlint:all,-deprecation,-unchecked,-rawtypes,-cast,-serial,-dep-ann,-static,-fallthrough +########################################################################################## -# The generate new bytecode uses the new compiler for to generate bytecode -# for the new jdk that is being built. The code compiled by this setup -# cannot necessarily be run with the boot jdk. -$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE, \ - JVM := $(JAVA), \ - JAVAC := $(NEW_JAVAC), \ - FLAGS := -XDignore.symbol.file=true $(DISABLE_JAXP_WARNINGS), \ - SERVER_DIR := $(SJAVAC_SERVER_DIR), \ - SERVER_JVM := $(SJAVAC_SERVER_JAVA))) +RMIC_PKGS := \ + sun/rmi/rmic \ + sun/tools/asm \ + sun/tools/java \ + sun/tools/javac \ + sun/tools/tree \ + sun/tools/util \ + # -$(eval $(call SetupJavaCompilation,BUILD_JAXP, \ - SETUP := GENERATE_NEWBYTECODE, \ - SRC := $(JAXP_TOPDIR)/src, \ - CLEAN := .properties, \ - BIN := $(JAXP_OUTPUTDIR)/classes, \ - SRCZIP := $(JAXP_OUTPUTDIR)/dist/lib/src.zip, \ - JAR := $(JAXP_OUTPUTDIR)/dist/lib/classes.jar)) +$(eval $(call SetupJavaCompilation,BUILD_INTERIM_RMIC, \ + SETUP := GENERATE_OLDBYTECODE, \ + SRC := $(JDK_TOPDIR)/src/jdk.rmic/share/classes, \ + INCLUDES := $(RMIC_PKGS), \ + BIN := $(JDK_OUTPUTDIR)/interim_rmic_classes, \ + COPY := .properties, \ + JAVAC_SOURCE_PATH_OVERRIDE := $(addprefix $(JDK_TOPDIR)/src/jdk.rmic/share/classes/, $(RMIC_PKGS)))) -all: $(BUILD_JAXP) +########################################################################################## -.PHONY: default all +all: $(BUILD_INTERIM_RMIC) diff --git a/jdk/make/CompileJavaClasses.gmk b/jdk/make/CompileJavaClasses.gmk deleted file mode 100644 index 67e8b6d4812..00000000000 --- a/jdk/make/CompileJavaClasses.gmk +++ /dev/null @@ -1,411 +0,0 @@ -# -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -default: all - -include $(SPEC) -include MakeBase.gmk -include JavaCompilation.gmk - -# Setup the java compilers for the JDK build. -include Setup.gmk - -JARS := -EXFILES := -EXCLUDES := - -########################################################################################## - -EXCLUDES += \ - com/sun/tools/example/trace \ - com/sun/tools/example/debug/bdi \ - com/sun/tools/example/debug/event \ - com/sun/tools/example/debug/gui - -ifeq ($(RMICONNECTOR_IIOP), false) - EXCLUDES += com/sun/jmx/remote/protocol/iiop -endif - -ifdef OPENJDK - EXCLUDES += sun/dc \ - com/sun/jmx/snmp \ - sun/management/snmp \ - com/sun/script -endif - -ifndef OPENJDK - # There exists two versions of this file... - EXFILES := $(JDK_TOPDIR)/src/share/classes/javax/crypto/JarVerifier.java - - ifeq ($(OPENJDK_TARGET_OS), windows) - # This gets built on unix platforms implicitly in the old build even though - # it's excluded in the closed build. - EXCLUDES += sun/java2d/pisces - - # AccessBridge is compiled separately below. - EXFILES += AccessBridge.java \ - AccessBridgeLoader.java \ - com/sun/java/accessibility/util/java/awt/ChoiceTranslator.java - # This seems to never be built - EXCLUDES += com/sun/java/accessibility/extensions - endif - -endif - -ifneq ($(OPENJDK_TARGET_OS), solaris) - # Exclude Solaris nio and two security related files in src/share/classes - EXFILES += SolarisAclFileAttributeView.java \ - SolarisFileStore.java \ - SolarisFileSystem.java \ - SolarisFileSystemProvider.java \ - SolarisNativeDispatcher.java \ - SolarisUserDefinedFileAttributeView.java \ - SolarisWatchService.java \ - SolarisAclFileAttributeView.java \ - sun/nio/ch/DevPollArrayWrapper.java \ - sun/nio/ch/DevPollSelectorImpl.java \ - sun/nio/ch/DevPollSelectorProvider.java \ - sun/nio/ch/EventPortSelectorImpl.java \ - sun/nio/ch/EventPortSelectorProvider.java \ - sun/nio/ch/EventPortWrapper.java \ - sun/nio/ch/SolarisAsynchronousChannelProvider.java \ - sun/nio/ch/SolarisEventPort.java \ - sun/tools/attach/SolarisAttachProvider.java \ - sun/tools/attach/SolarisVirtualMachine.java - - EXCLUDES += com/oracle/security -endif - -ifeq ($(OPENJDK_TARGET_OS), windows) - # Don't build GTK L&F on Windows - EXCLUDES += com/sun/java/swing/plaf/gtk -endif - -ifneq ($(OPENJDK_TARGET_OS), linux) - EXFILES += sun/tools/attach/LinuxAttachProvider.java \ - sun/tools/attach/LinuxVirtualMachine.java \ - sun/nio/ch/EPoll.java \ - sun/nio/ch/EPollArrayWrapper.java \ - sun/nio/ch/EPollPort.java \ - sun/nio/ch/EPollSelectorImpl.java \ - sun/nio/ch/EPollSelectorProvider.java \ - sun/nio/ch/LinuxAsynchronousChannelProvider.java \ - sun/nio/fs/LinuxDosFileAttributeView.java \ - sun/nio/fs/LinuxFileStore.java \ - sun/nio/fs/LinuxFileSystem.java \ - sun/nio/fs/LinuxFileSystemProvider.java \ - sun/nio/fs/MagicFileTypeDetector.java \ - sun/nio/fs/LinuxNativeDispatcher.java \ - sun/nio/fs/LinuxUserDefinedFileAttributeView.java \ - sun/nio/fs/LinuxWatchService.java -endif - -ifneq ($(OPENJDK_TARGET_OS), macosx) - EXFILES += sun/nio/ch/BsdAsynchronousChannelProvider.java \ - sun/nio/ch/KQueue.java \ - sun/nio/ch/KQueuePort.java \ - sun/nio/fs/BsdFileStore.java \ - sun/nio/fs/BsdFileSystem.java \ - sun/nio/fs/BsdFileSystemProvider.java \ - sun/nio/fs/BsdNativeDispatcher.java \ - sun/nio/fs/MacOSXFileSystemProvider.java \ - sun/nio/fs/MacOSXFileSystem.java \ - sun/nio/fs/MacOSXNativeDispatcher.java \ - sun/tools/attach/BsdAttachProvider.java \ - sun/tools/attach/BsdVirtualMachine.java -endif - -ifneq ($(OPENJDK_TARGET_OS),aix) - EXFILES+=sun/nio/ch/AixAsynchronousChannelProvider.java \ - sun/nio/ch/AixPollPort.java \ - sun/nio/fs/AixFileStore.java \ - sun/nio/fs/AixFileSystem.java \ - sun/nio/fs/AixFileSystemProvider.java \ - sun/nio/fs/AixNativeDispatcher.java \ - sun/tools/attach/AixAttachProvider.java \ - sun/tools/attach/AixVirtualMachine.java -endif - -# Exclude BreakIterator classes that are just used in compile process to generate -# data files and shouldn't go in the product -EXFILES += sun/text/resources/BreakIteratorRules.java \ - sun/text/resources/BreakIteratorRules_th.java - -# TODO: Add BUILD_HEADLESS_ONLY to configure? -ifdef BUILD_HEADLESS_ONLY - EXCLUDES += sun/applet -endif - -ifdef OPENJDK - EXCLUDES += sun/java2d/cmm/kcms -endif - -# Used on windows and macosx -ifeq (, $(filter $(OPENJDK_TARGET_OS), windows macosx)) - EXFILES += sun/awt/AWTCharset.java -endif - -ifeq ($(OPENJDK_TARGET_OS), macosx) - # exclude all X11 on Mac, we can't exclude some like below or we'll have compilation errors - EXCLUDES += sun/awt/X11 -else - # TBD: figure out how to eliminate this long list - EXFILES += sun/awt/X11/ScreenFormat.java \ - sun/awt/X11/XArc.java \ - sun/awt/X11/XChar2b.java \ - sun/awt/X11/XCharStruct.java \ - sun/awt/X11/XClassHint.java \ - sun/awt/X11/XComposeStatus.java \ - sun/awt/X11/XExtCodes.java \ - sun/awt/X11/XFontProp.java \ - sun/awt/X11/XFontSetExtents.java \ - sun/awt/X11/XFontStruct.java \ - sun/awt/X11/XGCValues.java \ - sun/awt/X11/XHostAddress.java \ - sun/awt/X11/XIMCallback.java \ - sun/awt/X11/XIMHotKeyTrigger.java \ - sun/awt/X11/XIMHotKeyTriggers.java \ - sun/awt/X11/XIMPreeditCaretCallbackStruct.java \ - sun/awt/X11/XIMPreeditDrawCallbackStruct.java \ - sun/awt/X11/XIMPreeditStateNotifyCallbackStruct.java \ - sun/awt/X11/XIMStatusDrawCallbackStruct.java \ - sun/awt/X11/XIMStringConversionCallbackStruct.java \ - sun/awt/X11/XIMStringConversionText.java \ - sun/awt/X11/XIMStyles.java \ - sun/awt/X11/XIMText.java \ - sun/awt/X11/XIMValuesList.java \ - sun/awt/X11/XImage.java \ - sun/awt/X11/XKeyboardControl.java \ - sun/awt/X11/XKeyboardState.java \ - sun/awt/X11/XOMCharSetList.java \ - sun/awt/X11/XOMFontInfo.java \ - sun/awt/X11/XOMOrientation.java \ - sun/awt/X11/XPoint.java \ - sun/awt/X11/XRectangle.java \ - sun/awt/X11/XSegment.java \ - sun/awt/X11/XStandardColormap.java \ - sun/awt/X11/XTextItem.java \ - sun/awt/X11/XTextItem16.java \ - sun/awt/X11/XTextProperty.java \ - sun/awt/X11/XTimeCoord.java \ - sun/awt/X11/XWindowChanges.java \ - sun/awt/X11/XdbeSwapInfo.java \ - sun/awt/X11/XmbTextItem.java \ - sun/awt/X11/XwcTextItem.java -endif - -# Exclude another implicitly not included file. -EXFILES += sun/util/locale/AsciiUtil.java - -ifeq (, $(filter $(OPENJDK_TARGET_OS), solaris macosx aix)) - # - # only solaris, macosx and aix - # - EXFILES += sun/nio/fs/PollingWatchService.java -endif - -ifeq ($(OPENJDK_TARGET_OS), windows) - EXFILES += sun/nio/ch/AbstractPollSelectorImpl.java \ - sun/nio/ch/PollSelectorProvider.java \ - sun/nio/ch/SimpleAsynchronousFileChannelImpl.java -endif - -# These files do not appear in the build result of the old build. This -# is because they are generated sources, but the AUTO_JAVA_FILES won't -# pick them up since they aren't generated when the source dirs are -# searched and they aren't referenced by any other classes so they won't -# be picked up by implicit compilation. On a rebuild, they are picked up -# and compiled. Exclude them here to produce the same rt.jar as the old -# build does when building just once. -EXFILES += javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \ - javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \ - javax/swing/plaf/nimbus/ScrollBarPainter.java \ - javax/swing/plaf/nimbus/SliderPainter.java \ - javax/swing/plaf/nimbus/SpinnerPainter.java \ - javax/swing/plaf/nimbus/SplitPanePainter.java \ - javax/swing/plaf/nimbus/TabbedPanePainter.java - -# Acquire a list of files that should be copied straight over to the classes. -include CopyIntoClasses.gmk -# Now we have COPY_PATTERNS, COPY_FILES and COPY_EXTRA - -ifndef OPENJDK - CLOSED_SRC_DIRS := $(JDK_TOPDIR)/src/closed/share/classes \ - $(JDK_TOPDIR)/src/closed/$(OPENJDK_TARGET_OS_API_DIR)/classes -endif - -# No SCTP implementation on Mac OS X or AIX. These classes should be excluded. -SCTP_IMPL_CLASSES = \ - $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/AssociationChange.java\ - $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/AssociationImpl.java \ - $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/PeerAddrChange.java \ - $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/ResultContainer.java \ - $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpChannelImpl.java \ - $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java \ - $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpNet.java \ - $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpNotification.java \ - $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java \ - $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SendFailed.java \ - $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/Shutdown.java - -MACOSX_SRC_DIRS := -ifeq ($(OPENJDK_TARGET_OS), macosx) - MACOSX_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/classes - - # this files are duplicated in MACOSX_SRC_DIRS - EXFILES += $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java \ - $(JDK_TOPDIR)/src/solaris/classes/sun/java2d/BackBufferCapsProvider.java \ - $(JDK_TOPDIR)/src/solaris/classes/java/net/DefaultInterface.java \ - $(JDK_TOPDIR)/src/solaris/classes/java/lang/ClassLoaderHelper.java \ - $(JDK_TOPDIR)/src/solaris/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java \ - $(JDK_TOPDIR)/src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java \ - EXFILES += $(SCTP_IMPL_CLASSES) - -endif - -# The security classes should not end up in the classes directory as that will prevent them -# from working when running the exploded jdk image. Compile them separately to a different -# directory from where the jars can be created. -SECURITY_PKGS := \ - com/oracle/security/ucrypto \ - com/sun/crypto/provider \ - javax/crypto \ - sun/security/ec \ - sun/security/internal \ - sun/security/mscapi \ - sun/security/pkcs11 \ - # - -AIX_SRC_DIRS := -ifeq ($(OPENJDK_TARGET_OS),aix) - AIX_SRC_DIRS += $(JDK_TOPDIR)/src/aix/classes - - # these files are duplicated in AIX_SRC_DIRS - EXFILES += $(SCTP_IMPL_CLASSES) -endif - -# The JDK_USER_DEFINED_FILTER is a poor man's incremental build: by specifying -# JDK_FILTER at the make command line, only a subset of the JDK java files will -# be recompiled. If multiple paths are separated by comma, convert that into a -# space separated list. -JDK_USER_DEFINED_FILTER := $(strip $(subst $(COMMA),$(SPACE), $(JDK_FILTER))) - -ifeq ($(ENABLE_SJAVAC),yes) - # With sjavac enabled, excluded sources are not even considered for linking. - # Explicitly add the security sources to sourcepath for linking. - BUILD_JDK_SOURCEPATH:=$(patsubst %,-i$(SPACE)%/*,$(SECURITY_PKGS)) \ - -sourcepath $(JDK_TOPDIR)/src/share/classes -endif - -$(eval $(call SetupJavaCompilation,BUILD_JDK,\ - SETUP:=GENERATE_JDKBYTECODE,\ - SRC:=$(JDK_TOPDIR)/src/share/classes \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes \ - $(MACOSX_SRC_DIRS) \ - $(AIX_SRC_DIRS) \ - $(JDK_OUTPUTDIR)/gensrc \ - $(JDK_OUTPUTDIR)/gensrc_no_srczip \ - $(CLOSED_SRC_DIRS),\ - INCLUDES:=$(JDK_USER_DEFINED_FILTER),\ - EXCLUDES:=$(EXCLUDES) $(SECURITY_PKGS),\ - EXCLUDE_FILES:=$(EXFILES),\ - BIN:=$(JDK_OUTPUTDIR)/classes,\ - COPY:=$(COPY_PATTERNS),\ - COPY_FILES:=$(COPY_FILES),\ - CLEAN_FILES:=$(CLEAN_FILES),\ - HEADERS:=$(JDK_OUTPUTDIR)/gensrc_headers,\ - ADD_JAVAC_FLAGS:=$(BUILD_JDK_SOURCEPATH))) - -########################################################################################## - -$(eval $(call SetupJavaCompilation,BUILD_SECURITY, \ - SETUP := GENERATE_JDKBYTECODE, \ - SRC := $(JDK_TOPDIR)/src/share/classes \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes \ - $(MACOSX_SRC_DIRS) \ - $(CLOSED_SRC_DIRS), \ - INCLUDES := $(SECURITY_PKGS), \ - EXCLUDES := $(EXCLUDES), \ - EXCLUDE_FILES := $(EXFILES), \ - BIN := $(JDK_OUTPUTDIR)/classes_security, \ - HEADERS := $(JDK_OUTPUTDIR)/gensrc_headers)) - -$(BUILD_SECURITY): $(BUILD_JDK) - -########################################################################################## - -$(JDK_OUTPUTDIR)/classes/META-INF/services/com.sun.tools.xjc.Plugin: - $(MKDIR) -p $(@D) - $(TOUCH) $@ - -########################################################################################## - - -########################################################################################## - -ifndef OPENJDK - ifeq ($(OPENJDK_TARGET_OS), windows) - ifeq ($(OPENJDK_TARGET_CPU_BITS), 32) - $(eval $(call SetupJavaCompilation,BUILD_ACCESSBRIDGE_32, \ - SETUP := GENERATE_JDKBYTECODE, \ - JAVAC_FLAGS := -cp $(JDK_OUTPUTDIR)/classes, \ - SRC := $(JDK_OUTPUTDIR)/gensrc_ab/32bit, \ - BIN := $(JDK_OUTPUTDIR)/classes_ab/32bit, \ - HEADERS := $(JDK_OUTPUTDIR)/gensrc_headers_ab/32)) - - $(BUILD_ACCESSBRIDGE_32): $(BUILD_JDK) - - $(eval $(call SetupJavaCompilation,BUILD_ACCESSBRIDGE_LEGACY, \ - SETUP := GENERATE_JDKBYTECODE, \ - JAVAC_FLAGS := -cp $(JDK_OUTPUTDIR)/classes, \ - SRC := $(JDK_OUTPUTDIR)/gensrc_ab/legacy, \ - BIN := $(JDK_OUTPUTDIR)/classes_ab/legacy, \ - HEADERS := $(JDK_OUTPUTDIR)/gensrc_headers_ab/legacy)) - - $(BUILD_ACCESSBRIDGE_LEGACY): $(BUILD_JDK) - - else - - $(eval $(call SetupJavaCompilation,BUILD_ACCESSBRIDGE_64, \ - SETUP := GENERATE_JDKBYTECODE, \ - JAVAC_FLAGS := -cp $(JDK_OUTPUTDIR)/classes, \ - SRC := $(JDK_OUTPUTDIR)/gensrc_ab/64bit, \ - BIN := $(JDK_OUTPUTDIR)/classes_ab/64bit, \ - HEADERS := $(JDK_OUTPUTDIR)/gensrc_headers_ab/64)) - - $(BUILD_ACCESSBRIDGE_64): $(BUILD_JDK) - - endif - endif -endif - -########################################################################################## - -all: $(BUILD_JDK) $(BUILD_SECURITY) $(COPY_EXTRA) \ - $(JDK_OUTPUTDIR)/classes/META-INF/services/com.sun.tools.xjc.Plugin \ - $(BUILD_ACCESSBRIDGE_32) $(BUILD_ACCESSBRIDGE_64) \ - $(BUILD_ACCESSBRIDGE_LEGACY) - -.PHONY: all diff --git a/jdk/make/CompileLaunchers.gmk b/jdk/make/CompileLaunchers.gmk deleted file mode 100644 index bb995d8a6ab..00000000000 --- a/jdk/make/CompileLaunchers.gmk +++ /dev/null @@ -1,694 +0,0 @@ -# -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -default: all - -include $(SPEC) -include MakeBase.gmk -include NativeCompilation.gmk - -# Setup the java compilers for the JDK build. -include Setup.gmk - -# Prepare the find cache. -$(eval $(call FillCacheFind, $(JDK_TOPDIR)/src/share/bin)) - -# Build tools -include Tools.gmk - -BUILD_LAUNCHERS = - -# When building a legacy overlay image (on solaris 64 bit), the launchers -# need to be built with a different rpath and a different output dir. -ifeq ($(OVERLAY_IMAGES), true) - ORIGIN_ROOT := /../.. - OUTPUT_SUBDIR := $(OPENJDK_TARGET_CPU_ISADIR) -else - ORIGIN_ROOT := /.. -endif - -ifeq ($(OPENJDK_TARGET_OS), macosx) - ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN) -else - ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli) -endif - -# -# Applications expect to be able to link against libjawt without invoking -# System.loadLibrary("jawt") first. This was the behaviour described in the -# devloper documentation of JAWT and what worked with OpenJDK6. -# -ifneq ($(findstring $(OPENJDK_TARGET_OS), linux solaris), ) - ORIGIN_ARG += $(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)) -endif - -define SetupLauncher - # TODO: Fix mapfile on solaris. Won't work with ld as linker. - # Parameter 1 is the name of the launcher (java, javac, jar...) - # Parameter 2 is extra CFLAGS - # Parameter 3 is extra LDFLAGS - # Parameter 4 is extra LDFLAGS_SUFFIX_posix - # Parameter 5 is extra LDFLAGS_SUFFIX_windows - # Parameter 6 is optional Windows JLI library (full path) - # Parameter 7 is optional Windows resource (RC) flags - # Parameter 8 is optional Windows version resource file (.rc) - # Parameter 9 is different output dir - # Parameter 10 if set, link statically with c runtime on windows. - # Parameter 11 if set, override plist file on macosx. - - $1_WINDOWS_JLI_LIB := $(JDK_OUTPUTDIR)/objs/libjli/jli.lib - ifneq ($6, ) - $1_WINDOWS_JLI_LIB := $6 - endif - $1_VERSION_INFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc - ifneq ($8, ) - $1_VERSION_INFO_RESOURCE := $8 - endif - - $1_LDFLAGS := $3 - $1_LDFLAGS_SUFFIX := - ifeq ($(OPENJDK_TARGET_OS), macosx) - $1_PLIST_FILE := Info-cmdline.plist - ifneq ($(11), ) - $1_PLIST_FILE := $(11) - ifneq ($$(findstring privileged, $$($1_PLIST_FILE)), ) - $1_CODESIGN := true - endif - endif - - $1_LDFLAGS += -Wl,-all_load $(JDK_OUTPUTDIR)/objs/libjli_static.a \ - -framework Cocoa -framework Security -framework ApplicationServices \ - -sectcreate __TEXT __info_plist $(JDK_TOPDIR)/src/macosx/lib/$$($1_PLIST_FILE) - $1_LDFLAGS_SUFFIX += -pthread - endif - - ifeq ($(OPENJDK_TARGET_OS), aix) - $1_LDFLAGS_SUFFIX += -L$(JDK_OUTPUTDIR)/objs -ljli_static - endif - - ifeq ($(USE_EXTERNAL_LIBZ), true) - $1_LDFLAGS_SUFFIX += -lz - endif - - $1_OUTPUT_DIR_ARG := $9 - ifeq (, $$($1_OUTPUT_DIR_ARG)) - $1_OUTPUT_DIR_ARG := $(JDK_OUTPUTDIR)/bin - endif - - # TODO: maybe it's better to move this if-statement out of this function - ifeq ($1, java) - $1_OPTIMIZATION_ARG := HIGH - $1_LDFLAGS_solaris := -R$(OPENWIN_HOME)/lib$(OPENJDK_TARGET_CPU_ISADIR) - else - $1_OPTIMIZATION_ARG := LOW - endif - - $1_CFLAGS := $(CFLAGS_JDKEXE) - ifeq ($(10), true) - $1_CFLAGS := $(filter-out -MD, $(CFLAGS_JDKEXE)) - endif - - # The linker on older SuSE distros (e.g. on SLES 10) complains with: - # "Invalid version tag `SUNWprivate_1.1'. Only anonymous version tag is allowed in executable." - # if feeded with a version script which contains named tags. - ifeq ($(USING_BROKEN_SUSE_LD),yes) - ifneq ($(wildcard $(JDK_TOPDIR)/make/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU).anonymous), ) - $1_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU).anonymous - else - $1_MAPFILE := - endif - else - ifneq ($(wildcard $(JDK_TOPDIR)/make/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU)), ) - $1_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU) - else - $1_MAPFILE := - endif - endif - - $(call SetupNativeCompilation,BUILD_LAUNCHER_$1, \ - SRC := $(JDK_TOPDIR)/src/share/bin, \ - INCLUDE_FILES := main.c, \ - LANG := C, \ - OPTIMIZATION := $$($1_OPTIMIZATION_ARG), \ - CFLAGS := $$($1_CFLAGS) \ - -I$(JDK_TOPDIR)/src/share/bin \ - -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin \ - -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS)/bin \ - -DFULL_VERSION='"$(FULL_VERSION)"' \ - -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \ - -DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"' \ - -DLAUNCHER_NAME='"$(LAUNCHER_NAME)"' \ - -DPROGNAME='"$1"' $(DPACKAGEPATH) \ - $2, \ - CFLAGS_linux := -fPIC, \ - CFLAGS_solaris := -KPIC -DHAVE_GETHRTIME, \ - LDFLAGS := $(LDFLAGS_JDKEXE) \ - $(ORIGIN_ARG) \ - $$($1_LDFLAGS), \ - LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_NAME,$1), \ - LDFLAGS_linux := -lpthread \ - $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \ - LDFLAGS_solaris := $$($1_LDFLAGS_solaris) \ - $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \ - MAPFILE := $$($1_MAPFILE), \ - LDFLAGS_SUFFIX := $(LDFLAGS_JDKEXE_SUFFIX) $$($1_LDFLAGS_SUFFIX), \ - LDFLAGS_SUFFIX_posix := $4, \ - LDFLAGS_SUFFIX_windows := $$($1_WINDOWS_JLI_LIB) \ - $(JDK_OUTPUTDIR)/objs/libjava/java.lib advapi32.lib $5, \ - LDFLAGS_SUFFIX_linux := -L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli $(LIBDL) -lc, \ - LDFLAGS_SUFFIX_solaris := -L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli -lthread $(LIBDL) -lc, \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/$1_objs$(OUTPUT_SUBDIR), \ - OUTPUT_DIR := $$($1_OUTPUT_DIR_ARG)$(OUTPUT_SUBDIR), \ - PROGRAM := $1, \ - DEBUG_SYMBOLS := true, \ - VERSIONINFO_RESOURCE := $$($1_VERSION_INFO_RESOURCE), \ - RC_FLAGS := $(RC_FLAGS) \ - -D "JDK_FNAME=$1$(EXE_SUFFIX)" \ - -D "JDK_INTERNAL_NAME=$1" \ - -D "JDK_FTYPE=0x1L" \ - $7, \ - MANIFEST := $(JDK_TOPDIR)/src/windows/resource/java.manifest, \ - CODESIGN := $$($1_CODESIGN)) - - BUILD_LAUNCHERS += $$(BUILD_LAUNCHER_$1) - - ifneq (,$(filter $(OPENJDK_TARGET_OS), macosx aix)) - $$(BUILD_LAUNCHER_$1): $(JDK_OUTPUTDIR)/objs/libjli_static.a - endif - - ifeq ($(OPENJDK_TARGET_OS), windows) - $$(BUILD_LAUNCHER_$1): $(JDK_OUTPUTDIR)/objs/libjava/java.lib \ - $$($1_WINDOWS_JLI_LIB) - endif -endef - -########################################################################################## - -XLIBS := $(X_LIBS) -lX11 -ifeq ($(OPENJDK_TARGET_OS), macosx) - DPACKAGEPATH := -DPACKAGE_PATH='"$(PACKAGE_PATH)"' - XLIBS := -endif - -ifdef OPENJDK - JAVA_RC_FLAGS += -i "$(JDK_TOPDIR)/src/windows/resource/icons" -else - JAVA_RC_FLAGS += -i "$(JDK_TOPDIR)/src/closed/windows/native/sun/windows" -endif - -# On windows, the debuginfo files get the same name as for java.dll. Build -# into another dir and copy selectively so debuginfo for java.dll isn't -# overwritten. -$(eval $(call SetupLauncher,java, \ - -DEXPAND_CLASSPATH_WILDCARDS,,,user32.lib comctl32.lib, \ - $(JDK_OUTPUTDIR)/objs/jli_static.lib, $(JAVA_RC_FLAGS), \ - $(JDK_TOPDIR)/src/windows/resource/java.rc, $(JDK_OUTPUTDIR)/objs/java_objs,true)) - -$(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/java$(EXE_SUFFIX): $(BUILD_LAUNCHER_java) - $(MKDIR) -p $(@D) - $(RM) $@ - $(CP) $(JDK_OUTPUTDIR)/objs/java_objs$(OUTPUT_SUBDIR)/java$(EXE_SUFFIX) $@ - -BUILD_LAUNCHERS += $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/java$(EXE_SUFFIX) - -ifeq ($(OPENJDK_TARGET_OS), windows) - $(eval $(call SetupLauncher,javaw, \ - -DJAVAW -DEXPAND_CLASSPATH_WILDCARDS,,,user32.lib comctl32.lib, \ - $(JDK_OUTPUTDIR)/objs/jli_static.lib, $(JAVA_RC_FLAGS), \ - $(JDK_TOPDIR)/src/windows/resource/java.rc,,true)) -endif - - -ifndef BUILD_HEADLESS_ONLY - $(eval $(call SetupLauncher,appletviewer, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.applet.Main"$(COMMA) }',, \ - $(XLIBS))) -endif - -$(eval $(call SetupLauncher,extcheck, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.extcheck.Main"$(COMMA) }')) - -$(eval $(call SetupLauncher,idlj, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.corba.se.idl.toJavaPortable.Compile"$(COMMA) }')) - -$(eval $(call SetupLauncher,jar, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jar.Main"$(COMMA) }')) - -$(eval $(call SetupLauncher,jarsigner, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.jarsigner.Main"$(COMMA) }')) - -$(eval $(call SetupLauncher,javac, \ - -DEXPAND_CLASSPATH_WILDCARDS \ - -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javac.Main"$(COMMA) }')) - -ifeq ($(ENABLE_SJAVAC), yes) - $(eval $(call SetupLauncher,sjavac, \ - -DEXPAND_CLASSPATH_WILDCARDS \ - -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.sjavac.Main"$(COMMA) }')) -endif - -$(eval $(call SetupLauncher,javadoc, \ - -DEXPAND_CLASSPATH_WILDCARDS \ - -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javadoc.Main"$(COMMA) }')) - -$(eval $(call SetupLauncher,javah, \ - -DEXPAND_CLASSPATH_WILDCARDS \ - -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javah.Main"$(COMMA) }')) - -$(eval $(call SetupLauncher,javap, \ - -DEXPAND_CLASSPATH_WILDCARDS \ - -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javap.Main"$(COMMA) }')) - -$(eval $(call SetupLauncher,jdeps, \ - -DEXPAND_CLASSPATH_WILDCARDS \ - -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.jdeps.Main"$(COMMA) }')) - -BUILD_LAUNCHER_jconsole_CFLAGS_windows := -DJAVAW -BUILD_LAUNCHER_jconsole_LDFLAGS_windows := user32.lib - -$(eval $(call SetupLauncher,jconsole, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "-J-Djconsole.showOutputViewer"$(COMMA) "sun.tools.jconsole.JConsole"$(COMMA) }' \ - -DAPP_CLASSPATH='{ "/lib/jconsole.jar"$(COMMA) "/lib/tools.jar"$(COMMA) "/classes" }')) - -$(eval $(call SetupLauncher,jdb, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.example.debug.tty.TTY"$(COMMA) }' \ - -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }')) - -$(eval $(call SetupLauncher,jhat, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.hat.Main"$(COMMA) }')) - -$(eval $(call SetupLauncher,jinfo, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \ - "-J-Dsun.jvm.hotspot.debugger.useProcDebugger"$(COMMA) \ - "-J-Dsun.jvm.hotspot.debugger.useWindbgDebugger"$(COMMA) \ - "sun.tools.jinfo.JInfo"$(COMMA) }' \ - -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \ - ,,,,,,,,,Info-privileged.plist)) - -$(eval $(call SetupLauncher,jmap, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \ - "-J-Dsun.jvm.hotspot.debugger.useProcDebugger"$(COMMA) \ - "-J-Dsun.jvm.hotspot.debugger.useWindbgDebugger"$(COMMA) \ - "sun.tools.jmap.JMap"$(COMMA) }' \ - -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \ - ,,,,,,,,,Info-privileged.plist)) - -$(eval $(call SetupLauncher,jps, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jps.Jps"$(COMMA) }')) - -$(eval $(call SetupLauncher,jrunscript, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.script.shell.Main"$(COMMA) }')) - -$(eval $(call SetupLauncher,jjs, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "jdk.nashorn.tools.Shell"$(COMMA) }')) - -$(eval $(call SetupLauncher,jsadebugd, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.jvm.hotspot.jdi.SADebugServer"$(COMMA) }' \ - -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \ - ,,,,,,,,,Info-privileged.plist)) - -$(eval $(call SetupLauncher,jstack, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \ - "-J-Dsun.jvm.hotspot.debugger.useProcDebugger"$(COMMA) \ - "-J-Dsun.jvm.hotspot.debugger.useWindbgDebugger"$(COMMA) \ - "sun.tools.jstack.JStack"$(COMMA) }' \ - -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \ - ,,,,,,,,,Info-privileged.plist)) - -$(eval $(call SetupLauncher,jstat, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jstat.Jstat"$(COMMA) }')) - -$(eval $(call SetupLauncher,jstatd, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jstatd.Jstatd"$(COMMA) }')) - -$(eval $(call SetupLauncher,keytool, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.keytool.Main"$(COMMA) }')) - -$(eval $(call SetupLauncher,native2ascii, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.native2ascii.Main"$(COMMA) }')) - -ifndef BUILD_HEADLESS_ONLY - $(eval $(call SetupLauncher,policytool, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.policytool.PolicyTool"$(COMMA) }',, \ - $(XLIBS))) -endif - -$(eval $(call SetupLauncher,rmic, \ - -DEXPAND_CLASSPATH_WILDCARDS \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.rmi.rmic.Main"$(COMMA) }')) - -$(eval $(call SetupLauncher,schemagen, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.internal.jxc.SchemaGenerator"$(COMMA) }')) - -$(eval $(call SetupLauncher,serialver, \ - -DEXPAND_CLASSPATH_WILDCARDS \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.serialver.SerialVer"$(COMMA) }')) - -$(eval $(call SetupLauncher,xjc, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.internal.xjc.Driver"$(COMMA) }')) - -$(eval $(call SetupLauncher,wsgen, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.internal.ws.WsGen"$(COMMA) }')) - -$(eval $(call SetupLauncher,wsimport, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.internal.ws.WsImport"$(COMMA) }')) - -$(eval $(call SetupLauncher,orbd, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \ - "-J-Dcom.sun.CORBA.activation.DbDir=./orb.db"$(COMMA) \ - "-J-Dcom.sun.CORBA.activation.Port=1049"$(COMMA) \ - "-J-Dcom.sun.CORBA.POA.ORBServerId=1"$(COMMA) \ - "com.sun.corba.se.impl.activation.ORBD"$(COMMA) }')) - -$(eval $(call SetupLauncher,servertool, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.corba.se.impl.activation.ServerTool"$(COMMA) }')) - -$(eval $(call SetupLauncher,tnameserv, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \ - "-J-Dcom.sun.CORBA.activation.DbDir=./orb.db"$(COMMA) \ - "-J-Djava.util.logging.LoggingPermission=contol"$(COMMA) \ - "-J-Dcom.sun.CORBA.POA.ORBServerId=1"$(COMMA) \ - "com.sun.corba.se.impl.naming.cosnaming.TransientNameServer"$(COMMA) }')) - -$(eval $(call SetupLauncher,pack200, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.java.util.jar.pack.Driver"$(COMMA) }')) - -$(eval $(call SetupLauncher,rmid, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.rmi.server.Activation"$(COMMA) }')) - -$(eval $(call SetupLauncher,rmiregistry, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.rmi.registry.RegistryImpl"$(COMMA) }')) - -$(eval $(call SetupLauncher,jcmd, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jcmd.JCmd"$(COMMA) }')) - -ifeq ($(OPENJDK_TARGET_OS), windows) - $(eval $(call SetupLauncher,kinit, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.krb5.internal.tools.Kinit"$(COMMA) }')) - - $(eval $(call SetupLauncher,klist, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.krb5.internal.tools.Klist"$(COMMA) }')) - - $(eval $(call SetupLauncher,ktab, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.krb5.internal.tools.Ktab"$(COMMA) }')) -endif - -########################################################################################## -# The order of the object files on the link command line affects the size of the resulting -# binary (at least on linux) which causes the size to differ between old and new build. -ifeq ($(USE_EXTERNAL_LIBZ), true) - UNPACKEXE_CFLAGS := -DSYSTEM_ZLIB - UNPACKEXE_ZIPOBJS := -lz -else - UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.8 - UNPACKEXE_ZIPOBJS := $(JDK_OUTPUTDIR)/objs/libzip/zcrc32$(OBJ_SUFFIX) \ - $(JDK_OUTPUTDIR)/objs/libzip/deflate$(OBJ_SUFFIX) \ - $(JDK_OUTPUTDIR)/objs/libzip/trees$(OBJ_SUFFIX) \ - $(JDK_OUTPUTDIR)/objs/libzip/zadler32$(OBJ_SUFFIX) \ - $(JDK_OUTPUTDIR)/objs/libzip/compress$(OBJ_SUFFIX) \ - $(JDK_OUTPUTDIR)/objs/libzip/zutil$(OBJ_SUFFIX) \ - $(JDK_OUTPUTDIR)/objs/libzip/inflate$(OBJ_SUFFIX) \ - $(JDK_OUTPUTDIR)/objs/libzip/infback$(OBJ_SUFFIX) \ - $(JDK_OUTPUTDIR)/objs/libzip/inftrees$(OBJ_SUFFIX) \ - $(JDK_OUTPUTDIR)/objs/libzip/inffast$(OBJ_SUFFIX) - -endif - -UNPACKEXE_LANG := C -ifeq ($(OPENJDK_TARGET_OS), solaris) - UNPACKEXE_LANG := C++ -endif -UNPACKEXE_DEBUG_SYMBOLS := true -# On windows, unpack200 is linked completely differently to all other -# executables, using the compiler with the compiler arguments. -# It's also linked incrementally, producing a .ilk file that needs to -# be kept away. -ifeq ($(OPENJDK_TARGET_OS), windows) - BUILD_UNPACKEXE_LDEXE := $(CC) - EXE_OUT_OPTION_save := $(EXE_OUT_OPTION) - EXE_OUT_OPTION := -Fe - # With the current way unpack200 is built, debug symbols aren't supported - # anyway. - UNPACKEXE_DEBUG_SYMBOLS := -endif - -# The linker on older SuSE distros (e.g. on SLES 10) complains with: -# "Invalid version tag `SUNWprivate_1.1'. Only anonymous version tag is allowed in executable." -# if feeded with a version script which contains named tags. -ifeq ($(USING_BROKEN_SUSE_LD), yes) - UNPACK_MAPFILE = $(JDK_TOPDIR)/make/mapfiles/libunpack/mapfile-vers-unpack200.anonymous -else - UNPACK_MAPFILE = $(JDK_TOPDIR)/make/mapfiles/libunpack/mapfile-vers-unpack200 -endif - -$(eval $(call SetupNativeCompilation,BUILD_UNPACKEXE, \ - SRC := $(JDK_TOPDIR)/src/share/native/com/sun/java/util/jar/pack, \ - EXCLUDE_FILES := jni.cpp, \ - LANG := $(UNPACKEXE_LANG), \ - OPTIMIZATION := LOW, \ - CFLAGS := $(UNPACKEXE_CFLAGS) $(CXXFLAGS_JDKEXE) \ - -DFULL, \ - CFLAGS_release := -DPRODUCT, \ - CFLAGS_linux := -fPIC, \ - CFLAGS_solaris := -KPIC, \ - CFLAGS_macosx := -fPIC, \ - MAPFILE := $(UNPACK_MAPFILE),\ - LDFLAGS := $(UNPACKEXE_ZIPOBJS), \ - LDFLAGS_windows := $(CXXFLAGS_JDKEXE), \ - LDFLAGS_posix := $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \ - $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)unpack$(SHARED_LIBRARY_SUFFIX)) \ - $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_linux := -lc, \ - LDFLAGS_solaris := $(UNPACKEXE_LDFLAGS_solaris) -lc, \ - LDFLAGS_SUFFIX := $(LIBCXX), \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \ - OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \ - PROGRAM := unpack200, \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ - RC_FLAGS := $(RC_FLAGS) \ - -D "JDK_FNAME=unpack200.exe" \ - -D "JDK_INTERNAL_NAME=unpack200" \ - -D "JDK_FTYPE=0x1L", \ - DEBUG_SYMBOLS := $(UNPACKEXE_DEBUG_SYMBOLS), \ - MANIFEST := $(JDK_TOPDIR)/src/windows/resource/unpack200_proto.exe.manifest)) - -ifeq ($(OPENJDK_TARGET_OS), windows) - EXE_OUT_OPTION := $(EXE_OUT_OPTION_save) -endif - -ifneq ($(USE_EXTERNAL_LIBZ), true) - - $(BUILD_UNPACKEXE): $(UNPACKEXE_ZIPOBJS) - -endif - -# Build into object dir and copy executable afterwards to avoid .ilk file in -# image. The real fix would be clean up linking of unpack200 using -# -link -incremental:no -# like all other launchers. -$(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/unpack200$(EXE_SUFFIX): $(BUILD_UNPACKEXE) - $(call install-file) - -BUILD_LAUNCHERS += $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/unpack200$(EXE_SUFFIX) - -########################################################################################## - - -BUILD_JEXEC := -BUILD_JEXEC_SRC := -BUILD_JEXEC_INC := -BUILD_JEXEC_DST_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR) - -# -# UNHANDLED: -# - COMPILE_APPROACH = normal -# - -# -# jdk/make/java/Makefile -# -ifeq ($(OPENJDK_TARGET_OS), solaris) - ifeq ($(OPENJDK_TARGET_CPU_BITS), 32) - BUILD_JEXEC := 1 - endif -endif - -ifeq ($(OPENJDK_TARGET_OS), linux) - BUILD_JEXEC := 1 -endif # OPENJDK_TARGET_OS - -# -# jdk/make/java/jexec/Makefile -# -ifeq ($(BUILD_JEXEC), 1) - - ifeq ($(OPENJDK_TARGET_OS), windows) - else ifeq ($(OPENJDK_TARGET_OS), macosx) - BUILD_JEXEC_SRC := $(JDK_TOPDIR)/src/macosx/bin - else - BUILD_JEXEC_SRC := $(JDK_TOPDIR)/src/solaris/bin - endif - - ifeq ($(OPENJDK_TARGET_OS), linux) - BUILD_JEXEC_DST_DIR := $(JDK_OUTPUTDIR)/lib - BUILD_JEXEC_INC += -I$(JDK_TOPDIR)/src/share/bin - endif -endif - -# -# Note that the two Makefile's seems to contradict each other, -# and that src/macosx/bin/jexec.c seems unused -# -ifneq ($(BUILD_JEXEC_SRC), ) - $(eval $(call SetupNativeCompilation,BUILD_JEXEC, \ - SRC := $(BUILD_JEXEC_SRC), \ - INCLUDE_FILES := jexec.c, \ - LANG := C, \ - OPTIMIZATION := LOW, \ - CFLAGS := $(CFLAGS_JDKEXE) \ - $(BUILD_JEXEC_INC), \ - CFLAGS_linux := -fPIC, \ - CFLAGS_solaris := -KPIC, \ - LDFLAGS := $(LDFLAGS_JDKEXE) \ - $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/jexec_obj, \ - OUTPUT_DIR := $(BUILD_JEXEC_DST_DIR), \ - DEBUG_SYMBOLS := true, \ - PROGRAM := jexec)) - - BUILD_LAUNCHERS += $(BUILD_JEXEC) -endif - -########################################################################################## - -# -# The java-rmi.cgi script in bin/ only gets delivered in certain situations -# -JAVA_RMI_CGI := $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/java-rmi.cgi -ifeq ($(OPENJDK_TARGET_OS), linux) - BUILD_LAUNCHERS += $(JAVA_RMI_CGI) -endif -ifeq ($(OPENJDK_TARGET_OS), solaris) - BUILD_LAUNCHERS += $(JAVA_RMI_CGI) -endif - -# TODO: -# On windows java-rmi.cgi shouldn't be bundled since Java 1.2, but has been built all -# this time anyway. Since jdk6, it has been built from the wrong source and resulted -# in a (almost) copy of the standard java launcher named "java-rmi.exe" ending up in -# the final images bin dir. This weird behavior is mimicked here in the converted -# makefiles for now. Should probably just be deleted. -# http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6512052 -ifeq ($(OPENJDK_TARGET_OS), windows) - $(eval $(call SetupLauncher,java-rmi, , \ - $(call SET_SHARED_LIBRARY_MAPFILE,$(JDK_TOPDIR)/make/java/main/java/mapfile-$(OPENJDK_TARGET_CPU)))) -else - $(JAVA_RMI_CGI): $(JDK_TOPDIR)/src/solaris/bin/java-rmi.cgi.sh - $(call install-file) - $(CHMOD) a+x $@ -endif - -########################################################################################## - -BUILD_JSPAWNHELPER := -BUILD_JSPAWNHELPER_SRC := $(JDK_TOPDIR)/src/solaris/native/java/lang -BUILD_JSPAWNHELPER_DST_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR) -LINK_JSPAWNHELPER_OBJECTS := $(JDK_OUTPUTDIR)/objs/libjava/childproc.o -LINK_JSPAWNHELPER_FLAGS := - -ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx solaris aix), ) - BUILD_JSPAWNHELPER := 1 -endif - -ifeq ($(OPENJDK_TARGET_OS), macosx) - BUILD_JSPAWNHELPER_DST_DIR := $(JDK_OUTPUTDIR)/lib -endif - -ifeq ($(OPENJDK_TARGET_CPU_BITS), 64) - LINK_JSPAWNHELPER_FLAGS += $(COMPILER_TARGET_BITS_FLAG)64 -endif - -ifeq ($(BUILD_JSPAWNHELPER), 1) - $(eval $(call SetupNativeCompilation,BUILD_JSPAWNHELPER, \ - SRC := $(BUILD_JSPAWNHELPER_SRC), \ - INCLUDE_FILES := jspawnhelper.c, \ - LANG := C, \ - OPTIMIZATION := LOW, \ - CFLAGS := $(CFLAGS_JDKEXE), \ - LDFLAGS := $(LDFLAGS_JDKEXE) $(LINK_JSPAWNHELPER_FLAGS), \ - LDFLAGS_SUFFIX := $(LINK_JSPAWNHELPER_OBJECTS), \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/jspawnhelper, \ - OUTPUT_DIR := $(BUILD_JSPAWNHELPER_DST_DIR), \ - PROGRAM := jspawnhelper)) - - $(BUILD_JSPAWNHELPER): $(LINK_JSPAWNHELPER_OBJECTS) - - BUILD_LAUNCHERS += $(BUILD_JSPAWNHELPER) -endif - -########################################################################################## -# jabswitch - -ifndef OPENJDK - ifeq ($(OPENJDK_TARGET_OS), windows) - - $(eval $(call SetupNativeCompilation,BUILD_JABSWITCH, \ - SRC := $(JDK_TOPDIR)/src/closed/windows/native/sun/bridge, \ - INCLUDE_FILES := jabswitch.cpp, \ - LANG := C++, \ - CFLAGS := $(filter-out -Zc:wchar_t-, $(CFLAGS_JDKEXE)) -Zc:wchar_t \ - -analyze- -Od -Gd -D_WINDOWS \ - -D_UNICODE -DUNICODE -RTC1 -EHsc, \ - LDFLAGS := $(LDFLAGS_JDKEXE) \ - Advapi32.lib Version.lib User32.lib, \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/jabswitch, \ - OUTPUT_DIR := $(JDK_OUTPUTDIR)/bin, \ - PROGRAM := jabswitch, \ - DEBUG_SYMBOLS := true, \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/AccessBridgeStatusWindow.rc, \ - RC_FLAGS := $(RC_FLAGS) \ - -D "JDK_FNAME=jabswitch.exe" \ - -D "JDK_INTERNAL_NAME=jabswitch" \ - -D "JDK_FTYPE=0x01L", \ - MANIFEST := $(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/jabswitch.manifest)) - - BUILD_LAUNCHERS += $(BUILD_JABSWITCH) - - endif -endif - -########################################################################################## - -$(BUILD_LAUNCHERS): $(JDK_TOPDIR)/make/CompileLaunchers.gmk - -all: $(BUILD_LAUNCHERS) - -.PHONY: all diff --git a/jdk/make/CopyFiles.gmk b/jdk/make/CopyFiles.gmk deleted file mode 100644 index 7666fcd2dd5..00000000000 --- a/jdk/make/CopyFiles.gmk +++ /dev/null @@ -1,564 +0,0 @@ -# -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -INCLUDEDIR = $(JDK_OUTPUTDIR)/include - -OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/$(OPENJDK_TARGET_OS) - -ifeq ($(OPENJDK_TARGET_OS), windows) - OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/win32 -else ifeq ($(OPENJDK_TARGET_OS), macosx) - OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/darwin -endif - -# -# Copy exported header files to outputdir. -# -H_TARGET_FILES = $(INCLUDEDIR)/jdwpTransport.h \ - $(INCLUDEDIR)/jni.h \ - $(INCLUDEDIR)/jvmti.h \ - $(INCLUDEDIR)/jvmticmlr.h \ - $(INCLUDEDIR)/classfile_constants.h \ - $(INCLUDEDIR)/jawt.h \ - $(OPENJDK_TARGET_OS_INCLUDE)/jni_md.h \ - $(OPENJDK_TARGET_OS_INCLUDE)/jawt_md.h - -$(INCLUDEDIR)/%.h: $(JDK_TOPDIR)/src/share/javavm/export/%.h - $(call install-file) - -$(OPENJDK_TARGET_OS_INCLUDE)/%.h: $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_EXPORT_DIR)/javavm/export/%.h - $(call install-file) - -COPY_FILES = $(H_TARGET_FILES) - -########################################################################################## - -ifndef OPENJDK - ifeq ($(OPENJDK_TARGET_OS), windows) - COPY_FILES += $(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgeCallbacks.h \ - $(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgeCalls.h \ - $(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgePackages.h \ - $(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgeCalls.c \ - $(JDK_OUTPUTDIR)/lib/accessibility.properties - - $(OPENJDK_TARGET_OS_INCLUDE)/bridge/%: \ - $(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/% - $(install-file) - - $(JDK_OUTPUTDIR)/lib/accessibility.properties: \ - $(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/accessibility.properties - $(install-file) - - endif -endif - -########################################################################################## - -LIBDIR = $(JDK_OUTPUTDIR)/lib - -MGMT_LIBDIR = $(LIBDIR)/management -MGMT_LIB_SRC = $(JDK_TOPDIR)/src/share/lib/management -MGMT_SRC_FILES = $(wildcard $(MGMT_LIB_SRC)/*) -MGMT_TARGET_FILES = $(subst $(MGMT_LIB_SRC),$(MGMT_LIBDIR),$(MGMT_SRC_FILES)) - -$(MGMT_LIBDIR)/management.properties: $(MGMT_LIB_SRC)/management.properties - $(call install-file) - $(CHMOD) 644 $@ - -# this file has different permissions...don't know why... -$(MGMT_LIBDIR)/jmxremote.access: $(MGMT_LIB_SRC)/jmxremote.access - $(call install-file) - $(CHMOD) 644 $@ - -$(MGMT_LIBDIR)/%: $(MGMT_LIB_SRC)/% - $(call install-file) - $(CHMOD) 444 $@ - -COPY_FILES += $(MGMT_TARGET_FILES) - -########################################################################################## - -LOGGING_LIB_SRC = $(JDK_TOPDIR)/src/share/lib - -$(LIBDIR)/logging.properties: $(LOGGING_LIB_SRC)/logging.properties - $(call install-file) - -COPY_FILES += $(LIBDIR)/logging.properties - -########################################################################################## -# -# Copy property files from sun/print to LIBDIR -# -PSFONTPROPFILE_SRC_DIR = $(JDK_TOPDIR)/src/share/classes/sun/print -PSFONTPROPFILE_SRCS = $(wildcard $(PSFONTPROPFILE_SRC_DIR)/*.properties*) -PSFONTPROPFILE_TARGET_FILES = $(subst $(PSFONTPROPFILE_SRC_DIR),$(LIBDIR),$(PSFONTPROPFILE_SRCS)) - -$(LIBDIR)/%: $(PSFONTPROPFILE_SRC_DIR)/% - $(call install-file) - -COPY_FILES += $(PSFONTPROPFILE_TARGET_FILES) - -########################################################################################## -# -# Copy cursor.properties and cursors gif files to LIBDIR -# -ifneq ($(OPENJDK_TARGET_OS), macosx) - OPENJDK_TARGET_OS_LIB_SRC = $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/lib -else - OPENJDK_TARGET_OS_LIB_SRC = $(JDK_TOPDIR)/src/macosx/lib -endif - -CURSORS_DEST_DIR = $(LIBDIR)/images/cursors -CURSORS_OPENJDK_TARGET_OS_LIB_SRC = $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/lib/images/cursors - -$(CURSORS_DEST_DIR)/cursors.properties: $(CURSORS_OPENJDK_TARGET_OS_LIB_SRC)/cursors.properties - $(call install-file) - -COPY_FILES += $(CURSORS_DEST_DIR)/cursors.properties - -CURSORS_LIB_SRC = $(JDK_TOPDIR)/src/share/lib/images/cursors -ifeq ($(OPENJDK_TARGET_OS), windows) - CURSORS_SRC_FILES = $(CURSORS_LIB_SRC)/invalid32x32.gif $(wildcard $(CURSORS_LIB_SRC)/win32_*.gif) -else # OPENJDK_TARGET_OS - CURSORS_SRC_FILES = $(CURSORS_LIB_SRC)/invalid32x32.gif $(wildcard $(CURSORS_LIB_SRC)/motif_*.gif) -endif # OPENJDK_TARGET_OS -CURSORS_TARGET_FILES = $(subst $(CURSORS_LIB_SRC),$(CURSORS_DEST_DIR),$(CURSORS_SRC_FILES)) - -$(CURSORS_DEST_DIR)/%: $(CURSORS_LIB_SRC)/% - $(call install-file) - -COPY_FILES += $(CURSORS_TARGET_FILES) - -########################################################################################## - -CALENDARS_SRC := $(JDK_TOPDIR)/src/share/lib - -$(LIBDIR)/calendars.properties: $(CALENDARS_SRC)/calendars.properties - $(call install-file) - -COPY_FILES += $(LIBDIR)/calendars.properties - -$(LIBDIR)/hijrah-config-umalqura.properties: $(CALENDARS_SRC)/hijrah-config-umalqura.properties - $(MKDIR) -p $(@D) - $(RM) $@ - $(CP) $< $@ - -COPY_FILES += $(LIBDIR)/hijrah-config-umalqura.properties - -########################################################################################## - -ifneq ($(findstring $(OPENJDK_TARGET_OS), windows aix),) - - TZMAPPINGS_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS)/lib - - $(LIBDIR)/tzmappings: $(TZMAPPINGS_SRC)/tzmappings - $(call install-file) - - COPY_FILES += $(LIBDIR)/tzmappings - -endif - -########################################################################################## - -ICCPROFILE_DEST_DIR := $(LIBDIR)/cmm - -ifdef OPENJDK - ICCPROFILE_SRC_DIR := $(JDK_TOPDIR)/src/share/lib/cmm/lcms -else - ICCPROFILE_SRC_DIR := $(JDK_TOPDIR)/src/closed/share/lib/cmm/kcms -endif - -ICCPROFILE_SRCS := $(wildcard $(ICCPROFILE_SRC_DIR)/*.pf) -ICCPROFILE_TARGET_FILES := $(subst $(ICCPROFILE_SRC_DIR),$(ICCPROFILE_DEST_DIR),$(ICCPROFILE_SRCS)) - -$(ICCPROFILE_DEST_DIR)%.pf: $(ICCPROFILE_SRC_DIR)%.pf - $(call install-file) - $(CHMOD) 444 $@ - -COPY_FILES += $(ICCPROFILE_TARGET_FILES) - -########################################################################################## - -ifneq ($(FREETYPE_BUNDLE_LIB_PATH), ) - # We need to bundle the freetype library, so it will be available at runtime as well as link time. - # - # NB: Default freetype build system uses -h linker option and - # result .so contains hardcoded library name that is later - # used for adding dependencies to other objects - # (e.g. libfontmanager.so). - # - # It is not obvious how to extract that hardcoded name (libfreetype.so.6) - # without overcomplicating logic here. - # To workaround this we hardcode .6 suffix for now. - # - # Note that .so.6 library will not be found by System.loadLibrary() - # but fortunately we need to load FreeType library explicitly - # on windows only - # - #TODO: rework this to avoid hardcoding library name in the makefile - # - ifeq ($(OPENJDK_TARGET_OS), windows) - FREETYPE_TARGET_LIB = $(JDK_OUTPUTDIR)/bin/$(call SHARED_LIBRARY,freetype) - else - FREETYPE_TARGET_LIB = $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/$(call SHARED_LIBRARY,freetype).6 - endif - - $(FREETYPE_TARGET_LIB): $(FREETYPE_BUNDLE_LIB_PATH)/$(call SHARED_LIBRARY,freetype) - $(CP) $(FREETYPE_BUNDLE_LIB_PATH)/$(call SHARED_LIBRARY,freetype) $@ - ifeq ($(OPENJDK_BUILD_OS), windows) - $(CHMOD) +rx $@ - endif - - COPY_FILES += $(FREETYPE_TARGET_LIB) -endif - -########################################################################################## - -# Copy msvcrXX.dll on windows - -ifeq ($(OPENJDK_TARGET_OS), windows) - MSVCR_TARGET := $(JDK_OUTPUTDIR)/bin/$(notdir $(MSVCR_DLL)) - # Chmod to avoid permission issues if bundles are unpacked on unix platforms. - $(MSVCR_TARGET): $(MSVCR_DLL) - $(call install-file) - $(CHMOD) a+rx $@ - - COPY_FILES += $(MSVCR_TARGET) -endif - -########################################################################################## - -HPROF_SRC = $(JDK_TOPDIR)/src/share/demo/jvmti/hprof/jvm.hprof.txt - -$(LIBDIR)/jvm.hprof.txt: $(HPROF_SRC) - $(call install-file) - -COPY_FILES += $(LIBDIR)/jvm.hprof.txt - -########################################################################################## - -# -# How to install jvm.cfg. -# -ifeq ($(JVM_VARIANT_ZERO), true) - JVMCFG_ARCH := zero -else - JVMCFG_ARCH := $(OPENJDK_TARGET_CPU_LEGACY) -endif - -ifeq ($(OPENJDK_TARGET_OS), macosx) - JVMCFG_SRC := $(JDK_TOPDIR)/src/macosx/bin/$(JVMCFG_ARCH)/jvm.cfg -else - JVMCFG_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/$(JVMCFG_ARCH)/jvm.cfg -endif -JVMCFG_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR) -JVMCFG := $(JVMCFG_DIR)/jvm.cfg - -# To do: should this also support -zeroshark? - -ifeq ($(OPENJDK_TARGET_CPU_BITS), 64) - COPY_JVM_CFG_FILE := true -else - # On 32-bit machines we have three potential VMs: client, server and minimal. - # Historically we usually have both client and server and so that is what the - # committed jvm.cfg expects (including platform specific ergonomics switches - # to decide whether to use client or server by default). So when we have anything - # other than client and server we need to define a new jvm.cfg file. - # The main problem is deciding whether to use aliases for the VMs that are not - # present and the current position is that we add aliases for client and server, but - # not for minimal. - CLIENT_AND_SERVER := $(and $(findstring true, $(JVM_VARIANT_SERVER)), $(findstring true, $(JVM_VARIANT_CLIENT))) - ifeq ($(CLIENT_AND_SERVER), true) - COPY_JVM_CFG_FILE := true - else - # For zero, the default jvm.cfg file is sufficient - ifeq ($(JVM_VARIANT_ZERO), true) - COPY_JVM_CFG_FILE := true - endif - endif -endif - -ifeq ($(COPY_JVM_CFG_FILE), true) - $(JVMCFG): $(JVMCFG_SRC) - $(call install-file) -else - $(JVMCFG): - $(MKDIR) -p $(@D) - $(RM) $(@) - # Now check for other permutations - ifeq ($(JVM_VARIANT_SERVER), true) - $(PRINTF) "-server KNOWN\n">>$(@) - $(PRINTF) "-client ALIASED_TO -server\n">>$(@) - ifeq ($(JVM_VARIANT_MINIMAL1), true) - $(PRINTF) "-minimal KNOWN\n">>$(@) - endif - else - ifeq ($(JVM_VARIANT_CLIENT), true) - $(PRINTF) "-client KNOWN\n">>$(@) - $(PRINTF) "-server ALIASED_TO -client\n">>$(@) - ifeq ($(JVM_VARIANT_MINIMAL1), true) - $(PRINTF) "-minimal KNOWN\n">>$(@) - endif - else - ifeq ($(JVM_VARIANT_MINIMAL1), true) - $(PRINTF) "-minimal KNOWN\n">>$(@) - $(PRINTF) "-server ALIASED_TO -minimal\n">>$(@) - $(PRINTF) "-client ALIASED_TO -minimal\n">>$(@) - endif - endif - endif -endif - -COPY_FILES += $(JVMCFG) - -########################################################################################## - -PROPS_SRC := $(JDK_TOPDIR)/src/share/lib/security/java.security-$(OPENJDK_TARGET_OS) -PROPS_DST := $(JDK_OUTPUTDIR)/lib/security/java.security - -ifndef OPENJDK - -RESTRICTED_PKGS_SRC := $(JDK_TOPDIR)/src/closed/share/lib/security/restricted.pkgs -RESTRICTED_PKGS := $(shell $(CAT) $(RESTRICTED_PKGS_SRC) | $(TR) "\n" " ") - -$(PROPS_DST): $(PROPS_SRC) - $(MKDIR) -p $(@D) - $(TOOL_ADDTORESTRICTEDPKGS) $^ $@.tmp $(RESTRICTED_PKGS) - $(MV) $@.tmp $@ - -else - -$(PROPS_DST): $(PROPS_SRC) - $(call install-file) - -endif - -COPY_FILES += $(PROPS_DST) - -########################################################################################## - -POLICY_SRC := $(JDK_TOPDIR)/src/share/lib/security/java.policy -POLICY_DST := $(JDK_OUTPUTDIR)/lib/security/java.policy - -POLICY_SRC_LIST := - -ifeq ($(OPENJDK_TARGET_OS), windows) - POLICY_SRC_LIST += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS)/lib/security/java.policy -endif -ifndef OPENJDK - ifeq ($(OPENJDK_TARGET_OS), windows) - ifeq ($(OPENJDK_TARGET_CPU_BITS), 32) - POLICY_SRC_LIST += $(JDK_TOPDIR)/src/closed/$(OPENJDK_TARGET_OS)/lib/security/java.policy-win32 - else - POLICY_SRC_LIST += $(JDK_TOPDIR)/src/closed/$(OPENJDK_TARGET_OS)/lib/security/java.policy-win64 - endif - endif - ifeq ($(OPENJDK_TARGET_OS), solaris) - POLICY_SRC_LIST += $(JDK_TOPDIR)/src/closed/$(OPENJDK_TARGET_OS)/lib/security/java.policy - endif -endif - -POLICY_SRC_LIST += $(POLICY_SRC) - -$(POLICY_DST): $(POLICY_SRC_LIST) - $(MKDIR) -p $(@D) - $(RM) $@ $@.tmp - $(foreach f,$(POLICY_SRC_LIST),$(CAT) $(f) >> $@.tmp;) - $(MV) $@.tmp $@ - -COPY_FILES += $(POLICY_DST) - -########################################################################################## - -CACERTS_SRC := $(CACERTS_FILE) -CACERTS_DST := $(JDK_OUTPUTDIR)/lib/security/cacerts - -$(CACERTS_DST): $(CACERTS_SRC) - $(call install-file) - -COPY_FILES += $(CACERTS_DST) - -########################################################################################## - -ifndef OPENJDK - - BLACKLIST_SRC := $(JDK_TOPDIR)/src/closed/share/lib/security/blacklist - BLACKLIST_DST := $(JDK_OUTPUTDIR)/lib/security/blacklist - - TRUSTEDLIBS_SRC := $(JDK_TOPDIR)/src/closed/share/lib/security/trusted.libraries - TRUSTEDLIBS_DST := $(JDK_OUTPUTDIR)/lib/security/trusted.libraries - - $(BLACKLIST_DST): $(BLACKLIST_SRC) - $(call install-file) - - COPY_FILES += $(BLACKLIST_DST) - - $(TRUSTEDLIBS_DST): $(TRUSTEDLIBS_SRC) - $(call install-file) - - COPY_FILES += $(TRUSTEDLIBS_DST) - -endif - -########################################################################################## - -ifndef OPENJDK - - SHARED_FONTS_SRC_DIR := $(JDK_TOPDIR)/src/closed/share/lib/fonts - SHARED_FONTS_DST_DIR := $(JDK_OUTPUTDIR)/lib/fonts - SHARED_FONTS_FILES := \ - LucidaTypewriterRegular.ttf \ - LucidaTypewriterBold.ttf \ - LucidaBrightRegular.ttf \ - LucidaBrightDemiBold.ttf \ - LucidaBrightItalic.ttf \ - LucidaBrightDemiItalic.ttf \ - LucidaSansRegular.ttf \ - LucidaSansDemiBold.ttf \ - - SHARED_FONTS_SRC := $(foreach F, $(SHARED_FONTS_FILES), $(SHARED_FONTS_SRC_DIR)/$(F)) - SHARED_FONTS_DST := $(foreach F, $(SHARED_FONTS_FILES), $(SHARED_FONTS_DST_DIR)/$(F)) - - $(SHARED_FONTS_DST_DIR)/%.ttf: $(SHARED_FONTS_SRC_DIR)/%.ttf - $(call install-file) - - $(SHARED_FONTS_DST_DIR)/fonts.dir: $(JDK_TOPDIR)/src/solaris/classes/sun/awt/motif/java.fonts.dir - $(call install-file) - - COPY_FILES += $(SHARED_FONTS_DST) - - ifneq ($(OPENJDK_TARGET_OS), windows) - COPY_FILES += $(SHARED_FONTS_DST_DIR)/fonts.dir - endif - - ifeq ($(OPENJDK_TARGET_OS), linux) - - # The oblique fonts are only needed/wanted on Linux. - - OBL_FONTS_SRC_DIR := $(JDK_TOPDIR)/src/closed/share/lib/fonts/oblique - OBL_FONTS_DST_DIR := $(JDK_OUTPUTDIR)/lib/oblique-fonts - OBL_FONTS_FILES := LucidaTypewriterOblique.ttf LucidaTypewriterBoldOblique.ttf \ - LucidaSansOblique.ttf LucidaSansDemiOblique.ttf - - OBL_FONTS_SRC := $(foreach F, $(OBL_FONTS_FILES), $(OBL_FONTS_SRC_DIR)/$(F)) - OBL_FONTS_DST := $(foreach F, $(OBL_FONTS_FILES), $(OBL_FONTS_DST_DIR)/$(F)) - - $(OBL_FONTS_DST_DIR)/%.ttf: $(OBL_FONTS_SRC_DIR)/%.ttf - $(call install-file) - - $(OBL_FONTS_DST_DIR)/fonts.dir: $(JDK_TOPDIR)/src/solaris/classes/sun/awt/motif/java.oblique-fonts.dir - $(call install-file) - - COPY_FILES += $(OBL_FONTS_DST) $(OBL_FONTS_DST_DIR)/fonts.dir - - endif # linux -endif # OPENJDK - -########################################################################################## - -ifndef OPENJDK - - # - # Solaris X11 Direct Graphics Access library - # - - _DGALIBS_sparc = \ - libxinerama.so \ - libjdgaSUNWcg6.so \ - libjdgaSUNWffb.so \ - libjdgaSUNWm64.so \ - libjdgaSUNWafb.so - - _DGALIBS_sparcv9 = \ - libxinerama.so \ - libjdgaSUNWcg6.so \ - libjdgaSUNWffb.so \ - libjdgaSUNWm64.so \ - libjdgaSUNWafb.so - - _DGALIBS_i586 = # no i586 library yet - - _DGALIBS_amd64 = # no amd64 library yet - - DGALIBS = $(_DGALIBS_$(OPENJDK_TARGET_CPU_LEGACY):%=$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/%) - - $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libxinerama.so: $(JDK_TOPDIR)/src/closed/solaris/lib/$(OPENJDK_TARGET_CPU_LEGACY)/libxinerama.so - $(call install-file) - $(CHMOD) 755 $@ - - $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjdgaSUNW%.so: $(JDK_TOPDIR)/src/closed/solaris/lib/$(OPENJDK_TARGET_CPU_LEGACY)/libjdgaSUNW%.so - $(call install-file) - $(CHMOD) 755 $@ - - $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjdgaSUNWafb.so: $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjdgaSUNWffb.so - $(MKDIR) -p $(@D) - $(RM) $@ - $(LN) -s $( $@.tmp ifneq ($(PROFILE), ) - # # Add back classes from excluded packages (fixing the $ substitution in the process) + # Add back classes from excluded packages (fixing the $ substitution in the process) + # This currently won't work with modular build layout, but there currently are no + # types needing to be re added. for type in $(subst \$$,\, $(RT_JAR_INCLUDE_TYPES)) ; do \ $(ECHO) $$type >> $@.tmp ; \ done @@ -277,16 +290,17 @@ $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar.contents: $(IMAGES_OUTPUTDI $(MKDIR) -p $(@D) $(RM) $@ $@.tmp $(GREP) -v -e '\.class$$' \ - -e '/_the\.*' -e '^_the\.*' -e '\\_the\.*' -e 'javac_state' \ + -e '/_the\.' -e '^_the\.' -e '\\_the\.' -e ' _the\.' -e 'javac_state' \ $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents > $@.tmp ifneq ($(PROFILE), ) - # # Strip out all META-INF/services/ entries + # Strip out all META-INF/services/ entries $(GREP) -v -e 'META-INF/services/' $@.tmp > $@.tmp2 - # # Add back the required services - # # FIXME: On Solaris if PROFILE_INCLUDE_METAINF_SERVICES is not defined - # # we get a syntax error from sh. That doesn't happen on linux + # Add back the required services + # FIXME: On Solaris if PROFILE_INCLUDE_METAINF_SERVICES is not defined + # we get a syntax error from sh. That doesn't happen on linux + # Preserve any -C part of the original include line. for service in $(PROFILE_INCLUDE_METAINF_SERVICES) ; do \ - $(ECHO) $$service >> $@.tmp2; \ + $(GREP) -e "$$service" $@.tmp >> $@.tmp2; \ done $(MV) $@.tmp2 $@.tmp endif @@ -313,7 +327,7 @@ $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/rt.jar: $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the $(ECHO) Creating rt.jar $(PROFILE) Compressed=$(COMPRESS_JARS) $(MKDIR) -p $(@D) $(RM) $@ $@.tmp - $(CD) $(JDK_OUTPUTDIR)/classes && \ + $(CD) $(JDK_OUTPUTDIR)/modules && \ $(JAR) $(RT_JAR_CREATE_OPTIONS) $@.tmp $(RT_JAR_MANIFEST_FILE) \ @$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.rt.jar.contents && \ if [ -f $(CLASS_FILE) ]; then \ @@ -328,7 +342,7 @@ $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/resources.jar: $(IMAGES_OUTPUTDIR)/lib$(PROFIL $(ECHO) Creating resources.jar $(MKDIR) -p $(@D) $(RM) $@ $@.tmp - $(CD) $(JDK_OUTPUTDIR)/classes && \ + $(CD) $(JDK_OUTPUTDIR)/modules && \ $(JAR) $(RT_JAR_CREATE_OPTIONS) $@.tmp $(RESOURCE_JAR_MANIFEST_FILE) \ @$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar.contents $(MV) $@.tmp $@ @@ -337,17 +351,17 @@ $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/resources.jar: $(IMAGES_OUTPUTDIR)/lib$(PROFIL ifneq ($(OPENJDK_TARGET_OS), windows) CHARSETS_EXTRA_FILES := sun/awt/motif/X11GBK.class \ - sun/awt/motif/X11GB2312\$$$$Decoder.class \ + sun/awt/motif/X11GB2312$$$$Decoder.class \ sun/awt/motif/X11GB2312.class \ - sun/awt/motif/X11KSC5601\$$$$Decoder.class \ - sun/awt/motif/X11KSC5601\$$$$Encoder.class \ - sun/awt/motif/X11GB2312\$$$$Encoder.class \ - sun/awt/motif/X11GBK\$$$$Encoder.class \ + sun/awt/motif/X11KSC5601$$$$Decoder.class \ + sun/awt/motif/X11KSC5601$$$$Encoder.class \ + sun/awt/motif/X11GB2312$$$$Encoder.class \ + sun/awt/motif/X11GBK$$$$Encoder.class \ sun/awt/motif/X11KSC5601.class endif $(eval $(call SetupArchive,BUILD_CHARSETS_JAR, , \ - SRCS := $(JDK_OUTPUTDIR)/classes, \ + SRCS := $(JDK_OUT_CLASSES), \ SUFFIXES := .class .dat, \ INCLUDES := sun/nio/cs/ext, \ EXTRA_FILES := sun/awt/HKSCS.class \ @@ -359,7 +373,7 @@ $(eval $(call SetupArchive,BUILD_CHARSETS_JAR, , \ ########################################################################################## $(eval $(call SetupArchive,BUILD_ZIPFS_JAR, , \ - SRCS := $(JDK_OUTPUTDIR)/classes, \ + SRCS := $(JDK_OUT_CLASSES), \ INCLUDES := jdk/nio/zipfs, \ EXTRA_FILES := META-INF/services/java.nio.file.spi.FileSystemProvider, \ JAR := $(IMAGES_OUTPUTDIR)/lib/ext/zipfs.jar, \ @@ -371,7 +385,7 @@ $(eval $(call SetupArchive,BUILD_ZIPFS_JAR, , \ ifndef OPENJDK ifeq ($(ENABLE_JFR), true) $(eval $(call SetupArchive,BUILD_JFR_JAR, , \ - SRCS := $(JDK_OUTPUTDIR)/classes, \ + SRCS := $(JDK_OUTPUTDIR)/modules/jdk.jfr, \ SUFFIXES := .class .jfc .xsd, \ INCLUDES := com/oracle/jrockit/jfr \ oracle/jrockit/jfr \ @@ -387,7 +401,7 @@ endif ########################################################################################## $(eval $(call SetupArchive,BUILD_JSSE_JAR, , \ - SRCS := $(JDK_OUTPUTDIR)/classes, \ + SRCS := $(JDK_OUT_CLASSES), \ INCLUDES := sun/security/provider/Sun.class \ sun/security/rsa/SunRsaSign.class \ sun/security/ssl \ @@ -400,7 +414,7 @@ $(eval $(call SetupArchive,BUILD_JSSE_JAR, , \ ########################################################################################## $(eval $(call SetupArchive,BUILD_SWINGBEANS_JAR, , \ - SRCS := $(JDK_OUTPUTDIR)/classes, \ + SRCS := $(JDK_OUTPUTDIR)/modules/java.desktop, \ SUFFIXES := BeanInfo.class .gif, \ INCLUDES := javax/swing sun/swing, \ EXCLUDES := javax/swing/plaf, \ @@ -416,12 +430,12 @@ include gensrc/GensrcCLDR.gmk CLDRDATA_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/cldrdata.jar $(eval $(call SetupArchive,BUILD_CLDRDATA_JAR, , \ - SRCS := $(JDK_OUTPUTDIR)/classes, \ + SRCS := $(JDK_OUTPUTDIR)/modules/jdk.localedata \ + $(JDK_OUTPUTDIR)/modules/java.base, \ SUFFIXES := .class, \ INCLUDES := sun/text/resources/cldr \ - sun/util/cldr \ + sun/util/cldr/CLDRLocaleDataMetaInfo.class \ sun/util/resources/cldr, \ - EXCLUDES := sun/util/cldr/CLDRLocaleProviderAdapter, \ JAR := $(CLDRDATA_JAR_DST), \ EXTRA_MANIFEST_ATTR := CLDR-Version: $(CLDRVERSION), \ SKIP_METAINF := true)) @@ -484,13 +498,33 @@ TOOLS_JAR_INCLUDES := \ # The sjavac tools is not ready for public consumption. TOOLS_JAR_EXCLUDES = com/sun/tools/sjavac +TOOLS_JAR_SRC := $(addprefix $(JDK_OUTPUTDIR)/modules/,\ + java.corba \ + java.desktop \ + jdk.attach \ + jdk.compiler \ + jdk.dev \ + jdk.javadoc \ + jdk.jconsole \ + jdk.jcmd \ + jdk.jdi \ + jdk.jvmstat \ + jdk.rmic \ + jdk.runtime \ + jdk.xml.bind \ + jdk.xml.ws \ + ) + # + $(eval $(call SetupArchive,BUILD_TOOLS_JAR, , \ - SRCS := $(JDK_OUTPUTDIR)/classes, \ + SRCS := $(TOOLS_JAR_SRC), \ SUFFIXES := .class .prp .gif .properties .xml .css .xsd .js .html .txt .java \ Tool aliasmap options, \ INCLUDES := $(TOOLS_JAR_INCLUDES), \ EXCLUDES := $(TOOLS_JAR_EXCLUDES), \ - EXTRA_FILES := META-INF/services/com.sun.jdi.connect.Connector \ + EXTRA_FILES := \ + $(JDK_OUTPUTDIR)/modules/jdk.jdi/META-INF/services/com.sun.jdi.connect.Connector \ + $(JDK_OUTPUTDIR)/classes/META-INF/services/com.sun.jdi.connect.Connector \ META-INF/services/com.sun.jdi.connect.spi.TransportService \ META-INF/services/com.sun.tools.attach.spi.AttachProvider \ META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \ @@ -533,7 +567,7 @@ $(IMAGES_OUTPUTDIR)/symbols/_the.symbols: $(IMAGES_OUTPUTDIR)/lib/rt.jar $(RM) -r $(IMAGES_OUTPUTDIR)/symbols/META-INF/sym $(MKDIR) -p $(IMAGES_OUTPUTDIR)/symbols/META-INF/sym $(JAVA) $(NEW_JAVAC) \ - -bootclasspath $(JDK_OUTPUTDIR)/classes \ + -bootclasspath "$(IMAGES_OUTPUTDIR)/lib/rt.jar" \ -XDprocess.packages -proc:only \ -processor com.sun.tools.javac.sym.CreateSymbols \ -Acom.sun.tools.javac.sym.Jar=$(IMAGES_OUTPUTDIR)/lib/rt.jar \ @@ -600,27 +634,35 @@ else SRC_ZIP_EXCLUDES = javax/swing/beaninfo endif -SRC_ZIP_SRCS = $(JDK_TOPDIR)/src/share/classes $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes -SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/gensrc -SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/impsrc -SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/gendocsrc_rmic +SRC_ZIP_SRCS := $(wildcard \ + $(JDK_TOPDIR)/src/*/share/classes \ + $(JDK_TOPDIR)/src/*/$(OPENJDK_TARGET_OS)/classes \ + $(JDK_TOPDIR)/src/*/$(OPENJDK_TARGET_OS_API_DIR)/classes \ + $(LANGTOOLS_TOPDIR)/src/*/share/classes \ + $(CORBA_TOPDIR)/src/*/share/classes \ + $(JAXP_TOPDIR)/src/*/share/classes \ + $(JAXWS_TOPDIR)/src/*/share/classes \ + $(JDK_OUTPUTDIR)/gensrc/j* \ + $(JDK_OUTPUTDIR)/gendocsrc_rmic \ + $(CORBA_OUTPUTDIR)/gensrc/j* \ + ) \ + # ifndef OPENJDK - SRC_ZIP_SRCS += $(JDK_TOPDIR)/src/closed/share/classes + SRC_ZIP_SRCS += $(wildcard $(JDK_TOPDIR)/src/closed/*/share/classes) endif # Need to copy launcher src files into desired directory structure # before zipping the sources. -LAUNCHER_SRC_FILES := $(wildcard $(JDK_TOPDIR)/src/share/bin/*) \ - $(wildcard $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/java_md*) -LAUNCHER_ZIP_SRC := $(patsubst $(JDK_TOPDIR)/src/share/bin/%, $(IMAGES_OUTPUTDIR)/src/launcher/%, \ - $(patsubst $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/%, $(IMAGES_OUTPUTDIR)/src/launcher/%, \ - $(LAUNCHER_SRC_FILES))) +$(eval $(call SetupCopyFiles,COPY_LAUNCHER_SRC, \ + SRC := $(JDK_TOPDIR)/src/java.base, \ + DEST := $(IMAGES_OUTPUTDIR)/src/launcher, \ + FLATTEN := true, \ + FILES := $(wildcard \ + $(JDK_TOPDIR)/src/java.base/share/native/launcher/* \ + $(JDK_TOPDIR)/src/java.base/share/native/libjli/* \ + $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjli/java_md*))) -$(IMAGES_OUTPUTDIR)/src/launcher/%: $(JDK_TOPDIR)/src/share/bin/% - $(install-file) - -$(IMAGES_OUTPUTDIR)/src/launcher/%: $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/% - $(install-file) +LAUNCHER_ZIP_SRC := $(COPY_LAUNCHER_SRC) $(IMAGES_OUTPUTDIR)/src.zip: $(LAUNCHER_ZIP_SRC) @@ -636,50 +678,10 @@ $(eval $(call SetupZipArchive,BUILD_SRC_ZIP, \ ########################################################################################## -ifndef OPENJDK - ifeq ($(OPENJDK_TARGET_OS), windows) - - $(eval $(call SetupArchive,BUILD_JACCESS_JAR, , \ - SRCS := $(JDK_OUTPUTDIR)/classes, \ - INCLUDES := com/sun/java/accessibility/util, \ - JAR := $(IMAGES_OUTPUTDIR)/lib/ext/jaccess.jar, \ - SKIP_METAINF := true)) - - JARS += $(IMAGES_OUTPUTDIR)/lib/ext/jaccess.jar - - ifeq ($(OPENJDK_TARGET_CPU_BITS), 32) - $(eval $(call SetupArchive,BUILD_ACCESSBRIDGE_32_JAR, , \ - SRCS := $(JDK_OUTPUTDIR)/classes_ab/32bit, \ - INCLUDES := com/sun/java/accessibility, \ - JAR := $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-32.jar, \ - SKIP_METAINF := true)) - - $(eval $(call SetupArchive,BUILD_ACCESSBRIDGE_LEGACY_JAR, , \ - SRCS := $(JDK_OUTPUTDIR)/classes_ab/legacy, \ - INCLUDES := com/sun/java/accessibility, \ - JAR := $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge.jar, \ - SKIP_METAINF := true)) - - JARS += $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-32.jar \ - $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge.jar - else - $(eval $(call SetupArchive,BUILD_ACCESSBRIDGE_64_JAR, , \ - SRCS := $(JDK_OUTPUTDIR)/classes_ab/64bit, \ - INCLUDES := com/sun/java/accessibility, \ - JAR := $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-64.jar, \ - SKIP_METAINF := true)) - - JARS += $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-64.jar - endif - endif -endif - -########################################################################################## - # This file is imported from hotspot in Import.gmk. Copying it into images/lib so that # all jars can be found in one place when creating images in Images.gmk. It needs to be # done here so that clean targets can be simple and accurate. -$(IMAGES_OUTPUTDIR)/lib/sa-jdi.jar: $(JDK_OUTPUTDIR)/lib/sa-jdi.jar +$(IMAGES_OUTPUTDIR)/lib/sa-jdi.jar: $(HOTSPOT_DIST)/lib/sa-jdi.jar $(install-file) ########################################################################################## @@ -688,22 +690,22 @@ $(IMAGES_OUTPUTDIR)/lib/sa-jdi.jar: $(JDK_OUTPUTDIR)/lib/sa-jdi.jar # $(eval $(call SetupZipArchive,BUILD_SEC_BIN_ZIP, \ SRC := $(JDK_OUTPUTDIR), \ - INCLUDES := classes/javax/net \ - classes/javax/security/cert \ - classes/com/sun/net/ssl \ - classes/com/sun/security/cert \ - classes/sun/net/www/protocol/https \ - classes/sun/security/pkcs12 \ - classes/sun/security/ssl \ - classes/sun/security/krb5 \ - classes/sun/security/krb5/internal \ - classes/sun/security/krb5/internal/ccache \ - classes/sun/security/krb5/internal/crypto \ - classes/sun/security/krb5/internal/ktab \ - classes/sun/security/krb5/internal/rcache \ - classes/sun/security/krb5/internal/util, \ - INCLUDE_FILES := classes/sun/security/jgss/spi/GSSContextSpi.class, \ - EXCLUDES := classes/sun/security/krb5/internal/tools, \ + INCLUDES := modules/java.base/javax/net \ + modules/java.base/javax/security/cert \ + modules/java.base/com/sun/net/ssl \ + modules/java.base/com/sun/security/cert \ + modules/java.base/sun/net/www/protocol/https \ + modules/java.base/sun/security/pkcs12 \ + modules/java.base/sun/security/ssl \ + modules/java.security.jgss/sun/security/krb5 \ + modules/java.security.jgss/sun/security/krb5/internal \ + modules/java.security.jgss/sun/security/krb5/internal/ccache \ + modules/java.security.jgss/sun/security/krb5/internal/crypto \ + modules/java.security.jgss/sun/security/krb5/internal/ktab \ + modules/java.security.jgss/sun/security/krb5/internal/rcache \ + modules/java.security.jgss/sun/security/krb5/internal/util, \ + INCLUDE_FILES := modules/java.security.jgss/sun/security/jgss/spi/GSSContextSpi.class, \ + EXCLUDES := modules/java.security.jgss/sun/security/krb5/internal/tools, \ ZIP := $(IMAGES_OUTPUTDIR)/sec-bin.zip)) JARS += $(IMAGES_OUTPUTDIR)/sec-bin.zip @@ -716,7 +718,7 @@ ifeq ($(OPENJDK_TARGET_OS), windows) # sec-windows-bin.zip is used by builds where the corresponding sources are not available $(eval $(call SetupZipArchive,BUILD_SEC_WINDOWS_BIN_ZIP, \ SRC := $(JDK_OUTPUTDIR), \ - INCLUDES := classes/sun/security/krb5/internal/tools, \ + INCLUDES := modules/java.security.jgss/sun/security/krb5/internal/tools, \ ZIP := $(IMAGES_OUTPUTDIR)/sec-windows-bin.zip)) JARS += $(IMAGES_OUTPUTDIR)/sec-windows-bin.zip diff --git a/jdk/make/CreatePolicyJars.gmk b/jdk/make/CreatePolicyJars.gmk new file mode 100644 index 00000000000..1e29acdf0e9 --- /dev/null +++ b/jdk/make/CreatePolicyJars.gmk @@ -0,0 +1,169 @@ +# +# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +default: all + +include $(SPEC) +include MakeBase.gmk +include JavaCompilation.gmk + + +################################################################################ + +US_EXPORT_POLICY_JAR_DST := $(JDK_OUTPUTDIR)/lib/security/US_export_policy.jar + +ifneq ($(BUILD_CRYPTO), no) + + US_EXPORT_POLICY_JAR_LIMITED_UNSIGNED := \ + $(JDK_OUTPUTDIR)/jce/unsigned/policy/limited/US_export_policy.jar + US_EXPORT_POLICY_JAR_UNLIMITED_UNSIGNED := \ + $(JDK_OUTPUTDIR)/jce/unsigned/policy/unlimited/US_export_policy.jar + + # + # TODO fix so that SetupArchive does not write files into SRCS + # then we don't need this extra copying + # + # NOTE: We currently do not place restrictions on our limited export + # policy. This was not a typo. This means we are shipping the same file + # for both limimted and unlimited US_export_policy.jar. + # + US_EXPORT_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/data/cryptopolicy/unlimited + US_EXPORT_POLICY_JAR_TMP := \ + $(JDK_OUTPUTDIR)/jce/unsigned/policy/unlimited/US_export_policy_jar.tmp + + $(US_EXPORT_POLICY_JAR_TMP)/%: $(US_EXPORT_POLICY_JAR_SRC_DIR)/% + $(install-file) + + US_EXPORT_POLICY_JAR_DEPS := $(US_EXPORT_POLICY_JAR_TMP)/default_US_export.policy + + $(eval $(call SetupArchive,BUILD_US_EXPORT_POLICY_JAR, $(US_EXPORT_POLICY_JAR_DEPS), \ + SRCS := $(US_EXPORT_POLICY_JAR_TMP), \ + SUFFIXES := .policy, \ + JAR := $(US_EXPORT_POLICY_JAR_UNLIMITED_UNSIGNED), \ + EXTRA_MANIFEST_ATTR := Crypto-Strength: unlimited, \ + SKIP_METAINF := true)) + + $(US_EXPORT_POLICY_JAR_LIMITED_UNSIGNED): $(US_EXPORT_POLICY_JAR_UNLIMITED_UNSIGNED) + $(ECHO) $(LOG_INFO) Copying unlimited $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(install-file) + + TARGETS += $(US_EXPORT_POLICY_JAR_LIMITED_UNSIGNED) \ + $(US_EXPORT_POLICY_JAR_UNLIMITED_UNSIGNED) +endif + +ifndef OPENJDK + ifeq ($(UNLIMITED_CRYPTO), true) + $(error No prebuilt unlimited crypto jars available) + endif + $(US_EXPORT_POLICY_JAR_DST): $(JDK_TOPDIR)/make/closed/tools/crypto/jce/US_export_policy.jar + $(ECHO) $(LOG_INFO) Copying prebuilt $(@F) + $(install-file) +else + ifeq ($(UNLIMITED_CRYPTO), true) + $(US_EXPORT_POLICY_JAR_DST): $(US_EXPORT_POLICY_JAR_UNLIMITED_UNSIGNED) + $(install-file) + else + $(US_EXPORT_POLICY_JAR_DST): $(US_EXPORT_POLICY_JAR_LIMITED_UNSIGNED) + $(install-file) + endif +endif + +POLICY_JARS += $(US_EXPORT_POLICY_JAR_DST) + +################################################################################ + +LOCAL_POLICY_JAR_DST := $(JDK_OUTPUTDIR)/lib/security/local_policy.jar + +ifneq ($(BUILD_CRYPTO), no) + + LOCAL_POLICY_JAR_LIMITED_UNSIGNED := \ + $(JDK_OUTPUTDIR)/jce/unsigned/policy/limited/local_policy.jar + LOCAL_POLICY_JAR_UNLIMITED_UNSIGNED := \ + $(JDK_OUTPUTDIR)/jce/unsigned/policy/unlimited/local_policy.jar + + # + # TODO fix so that SetupArchive does not write files into SRCS + # then we don't need this extra copying + # + LOCAL_POLICY_JAR_LIMITED_TMP := \ + $(JDK_OUTPUTDIR)/jce/unsigned/policy/limited/local_policy_jar.tmp + LOCAL_POLICY_JAR_UNLIMITED_TMP := \ + $(JDK_OUTPUTDIR)/jce/unsigned/policy/unlimited/local_policy_jar.tmp + + $(LOCAL_POLICY_JAR_LIMITED_TMP)/%: $(JDK_TOPDIR)/make/data/cryptopolicy/limited/% + $(install-file) + + $(LOCAL_POLICY_JAR_UNLIMITED_TMP)/%: $(JDK_TOPDIR)/make/data/cryptopolicy/unlimited/% + $(install-file) + + $(eval $(call SetupArchive,BUILD_LOCAL_POLICY_JAR_LIMITED, \ + $(LOCAL_POLICY_JAR_LIMITED_TMP)/exempt_local.policy \ + $(LOCAL_POLICY_JAR_LIMITED_TMP)/default_local.policy, \ + SRCS := $(LOCAL_POLICY_JAR_LIMITED_TMP), \ + SUFFIXES := .policy, \ + JAR := $(LOCAL_POLICY_JAR_LIMITED_UNSIGNED), \ + EXTRA_MANIFEST_ATTR := Crypto-Strength: limited, \ + SKIP_METAINF := true)) + + $(eval $(call SetupArchive,BUILD_LOCAL_POLICY_JAR_UNLIMITED, \ + $(LOCAL_POLICY_JAR_UNLIMITED_TMP)/default_local.policy, \ + SRCS := $(LOCAL_POLICY_JAR_UNLIMITED_TMP), \ + SUFFIXES := .policy, \ + JAR := $(LOCAL_POLICY_JAR_UNLIMITED_UNSIGNED), \ + EXTRA_MANIFEST_ATTR := Crypto-Strength: unlimited, \ + SKIP_METAINF := true)) + + TARGETS += $(LOCAL_POLICY_JAR_LIMITED_UNSIGNED) $(LOCAL_POLICY_JAR_UNLIMITED_UNSIGNED) + + ifndef OPENJDK + $(JDK_OUTPUTDIR)/jce/unsigned/policy/unlimited/README.txt: \ + $(JDK_TOPDIR)/make/closed/javax/crypto/doc/README.txt + $(install-file) + + TARGETS += $(JDK_OUTPUTDIR)/jce/unsigned/policy/unlimited/README.txt + endif +endif + +ifndef OPENJDK + $(LOCAL_POLICY_JAR_DST): $(JDK_TOPDIR)/make/closed/tools/crypto/jce/local_policy.jar + $(ECHO) $(LOG_INFO) Copying prebuilt $(@F) + $(install-file) +else + ifeq ($(UNLIMITED_CRYPTO), true) + $(LOCAL_POLICY_JAR_DST): $(LOCAL_POLICY_JAR_UNLIMITED_UNSIGNED) + $(install-file) + else + $(LOCAL_POLICY_JAR_DST): $(LOCAL_POLICY_JAR_LIMITED_UNSIGNED) + $(install-file) + endif +endif + +POLICY_JARS += $(LOCAL_POLICY_JAR_DST) +TARGETS += $(POLICY_JARS) + +################################################################################ + +all: $(TARGETS) + diff --git a/jdk/make/CreateSecurityJars.gmk b/jdk/make/CreateSecurityJars.gmk index d5b3b8ea54b..1a3d3343c53 100644 --- a/jdk/make/CreateSecurityJars.gmk +++ b/jdk/make/CreateSecurityJars.gmk @@ -28,11 +28,12 @@ default: all include $(SPEC) include MakeBase.gmk include JavaCompilation.gmk -include Setup.gmk # The jars created in this file are required for the exploded jdk image to function and # cannot wait to be built in the images target. +SECURITY_CLASSES_SUBDIR := modules + ########################################################################################## # Create manifest for security jars # @@ -66,7 +67,7 @@ SUNPKCS11_JAR_DST := $(JDK_OUTPUTDIR)/lib/ext/sunpkcs11.jar SUNPKCS11_JAR_UNSIGNED := $(JDK_OUTPUTDIR)/jce/unsigned/sunpkcs11.jar $(eval $(call SetupArchive,BUILD_SUNPKCS11_JAR, , \ - SRCS := $(JDK_OUTPUTDIR)/classes_security, \ + SRCS := $(JDK_OUTPUTDIR)/$(SECURITY_CLASSES_SUBDIR)/jdk.crypto.pkcs11, \ SUFFIXES := .class, \ INCLUDES := sun/security/pkcs11, \ JAR := $(SUNPKCS11_JAR_UNSIGNED), \ @@ -93,7 +94,7 @@ SUNEC_JAR_DST := $(JDK_OUTPUTDIR)/lib/ext/sunec.jar SUNEC_JAR_UNSIGNED := $(JDK_OUTPUTDIR)/jce/unsigned/sunec.jar $(eval $(call SetupArchive,BUILD_SUNEC_JAR, , \ - SRCS := $(JDK_OUTPUTDIR)/classes_security, \ + SRCS := $(JDK_OUTPUTDIR)/$(SECURITY_CLASSES_SUBDIR)/jdk.crypto.ec, \ SUFFIXES := .class, \ INCLUDES := sun/security/ec, \ JAR := $(SUNEC_JAR_UNSIGNED), \ @@ -121,7 +122,7 @@ SUNJCE_PROVIDER_JAR_UNSIGNED := $(JDK_OUTPUTDIR)/jce/unsigned/sunjce_provider.ja ifneq ($(BUILD_CRYPTO), no) $(eval $(call SetupArchive,BUILD_SUNJCE_PROVIDER_JAR, , \ - SRCS := $(JDK_OUTPUTDIR)/classes_security, \ + SRCS := $(JDK_OUTPUTDIR)/$(SECURITY_CLASSES_SUBDIR)/java.base, \ SUFFIXES := .class, \ INCLUDES := com/sun/crypto/provider, \ JAR := $(SUNJCE_PROVIDER_JAR_UNSIGNED), \ @@ -152,7 +153,7 @@ JCE_JAR_UNSIGNED := $(JDK_OUTPUTDIR)/jce/unsigned/jce.jar ifneq ($(BUILD_CRYPTO), no) $(eval $(call SetupArchive,BUILD_JCE_JAR, , \ - SRCS := $(JDK_OUTPUTDIR)/classes_security, \ + SRCS := $(JDK_OUTPUTDIR)/$(SECURITY_CLASSES_SUBDIR)/java.base, \ SUFFIXES := .class, \ INCLUDES := javax/crypto sun/security/internal, \ JAR := $(JCE_JAR_UNSIGNED), \ @@ -178,145 +179,13 @@ TARGETS += $(JCE_JAR_DST) ########################################################################################## -US_EXPORT_POLICY_JAR_DST := $(JDK_OUTPUTDIR)/lib/security/US_export_policy.jar - -ifneq ($(BUILD_CRYPTO), no) - - US_EXPORT_POLICY_JAR_LIMITED_UNSIGNED := \ - $(JDK_OUTPUTDIR)/jce/unsigned/policy/limited/US_export_policy.jar - US_EXPORT_POLICY_JAR_UNLIMITED_UNSIGNED := \ - $(JDK_OUTPUTDIR)/jce/unsigned/policy/unlimited/US_export_policy.jar - - # - # TODO fix so that SetupArchive does not write files into SRCS - # then we don't need this extra copying - # - # NOTE: We currently do not place restrictions on our limited export - # policy. This was not a typo. This means we are shipping the same file - # for both limimted and unlimited US_export_policy.jar. - # - US_EXPORT_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/data/cryptopolicy/unlimited - US_EXPORT_POLICY_JAR_TMP := \ - $(JDK_OUTPUTDIR)/jce/unsigned/policy/unlimited/US_export_policy_jar.tmp - - $(US_EXPORT_POLICY_JAR_TMP)/%: $(US_EXPORT_POLICY_JAR_SRC_DIR)/% - $(install-file) - - US_EXPORT_POLICY_JAR_DEPS := $(US_EXPORT_POLICY_JAR_TMP)/default_US_export.policy - - $(eval $(call SetupArchive,BUILD_US_EXPORT_POLICY_JAR, $(US_EXPORT_POLICY_JAR_DEPS), \ - SRCS := $(US_EXPORT_POLICY_JAR_TMP), \ - SUFFIXES := .policy, \ - JAR := $(US_EXPORT_POLICY_JAR_UNLIMITED_UNSIGNED), \ - EXTRA_MANIFEST_ATTR := Crypto-Strength: unlimited, \ - SKIP_METAINF := true)) - - $(US_EXPORT_POLICY_JAR_LIMITED_UNSIGNED): $(US_EXPORT_POLICY_JAR_UNLIMITED_UNSIGNED) - $(ECHO) $(LOG_INFO) Copying unlimited $(patsubst $(OUTPUT_ROOT)/%,%,$@) - $(install-file) - - TARGETS += $(US_EXPORT_POLICY_JAR_LIMITED_UNSIGNED) \ - $(US_EXPORT_POLICY_JAR_UNLIMITED_UNSIGNED) -endif - -ifndef OPENJDK - ifeq ($(UNLIMITED_CRYPTO), true) - $(error No prebuilt unlimited crypto jars available) - endif - $(US_EXPORT_POLICY_JAR_DST): $(JDK_TOPDIR)/make/closed/tools/crypto/jce/US_export_policy.jar - $(ECHO) $(LOG_INFO) Copying prebuilt $(@F) - $(install-file) -else - ifeq ($(UNLIMITED_CRYPTO), true) - $(US_EXPORT_POLICY_JAR_DST): $(US_EXPORT_POLICY_JAR_UNLIMITED_UNSIGNED) - $(install-file) - else - $(US_EXPORT_POLICY_JAR_DST): $(US_EXPORT_POLICY_JAR_LIMITED_UNSIGNED) - $(install-file) - endif -endif - -TARGETS += $(US_EXPORT_POLICY_JAR_DST) - -########################################################################################## - -LOCAL_POLICY_JAR_DST := $(JDK_OUTPUTDIR)/lib/security/local_policy.jar - -ifneq ($(BUILD_CRYPTO), no) - - LOCAL_POLICY_JAR_LIMITED_UNSIGNED := \ - $(JDK_OUTPUTDIR)/jce/unsigned/policy/limited/local_policy.jar - LOCAL_POLICY_JAR_UNLIMITED_UNSIGNED := \ - $(JDK_OUTPUTDIR)/jce/unsigned/policy/unlimited/local_policy.jar - - # - # TODO fix so that SetupArchive does not write files into SRCS - # then we don't need this extra copying - # - LOCAL_POLICY_JAR_LIMITED_TMP := \ - $(JDK_OUTPUTDIR)/jce/unsigned/policy/limited/local_policy_jar.tmp - LOCAL_POLICY_JAR_UNLIMITED_TMP := \ - $(JDK_OUTPUTDIR)/jce/unsigned/policy/unlimited/local_policy_jar.tmp - - $(LOCAL_POLICY_JAR_LIMITED_TMP)/%: $(JDK_TOPDIR)/make/data/cryptopolicy/limited/% - $(install-file) - - $(LOCAL_POLICY_JAR_UNLIMITED_TMP)/%: $(JDK_TOPDIR)/make/data/cryptopolicy/unlimited/% - $(install-file) - - $(eval $(call SetupArchive,BUILD_LOCAL_POLICY_JAR_LIMITED, \ - $(LOCAL_POLICY_JAR_LIMITED_TMP)/exempt_local.policy \ - $(LOCAL_POLICY_JAR_LIMITED_TMP)/default_local.policy, \ - SRCS := $(LOCAL_POLICY_JAR_LIMITED_TMP), \ - SUFFIXES := .policy, \ - JAR := $(LOCAL_POLICY_JAR_LIMITED_UNSIGNED), \ - EXTRA_MANIFEST_ATTR := Crypto-Strength: limited, \ - SKIP_METAINF := true)) - - $(eval $(call SetupArchive,BUILD_LOCAL_POLICY_JAR_UNLIMITED, \ - $(LOCAL_POLICY_JAR_UNLIMITED_TMP)/default_local.policy, \ - SRCS := $(LOCAL_POLICY_JAR_UNLIMITED_TMP), \ - SUFFIXES := .policy, \ - JAR := $(LOCAL_POLICY_JAR_UNLIMITED_UNSIGNED), \ - EXTRA_MANIFEST_ATTR := Crypto-Strength: unlimited, \ - SKIP_METAINF := true)) - - TARGETS += $(LOCAL_POLICY_JAR_LIMITED_UNSIGNED) $(LOCAL_POLICY_JAR_UNLIMITED_UNSIGNED) - - ifndef OPENJDK - $(JDK_OUTPUTDIR)/jce/unsigned/policy/unlimited/README.txt: \ - $(JDK_TOPDIR)/make/closed/javax/crypto/doc/README.txt - $(install-file) - - TARGETS += $(JDK_OUTPUTDIR)/jce/unsigned/policy/unlimited/README.txt - endif -endif - -ifndef OPENJDK - $(LOCAL_POLICY_JAR_DST): $(JDK_TOPDIR)/make/closed/tools/crypto/jce/local_policy.jar - $(ECHO) $(LOG_INFO) Copying prebuilt $(@F) - $(install-file) -else - ifeq ($(UNLIMITED_CRYPTO), true) - $(LOCAL_POLICY_JAR_DST): $(LOCAL_POLICY_JAR_UNLIMITED_UNSIGNED) - $(install-file) - else - $(LOCAL_POLICY_JAR_DST): $(LOCAL_POLICY_JAR_LIMITED_UNSIGNED) - $(install-file) - endif -endif - -TARGETS += $(LOCAL_POLICY_JAR_DST) - -########################################################################################## - ifeq ($(OPENJDK_TARGET_OS), windows) SUNMSCAPI_JAR_DST := $(JDK_OUTPUTDIR)/lib/ext/sunmscapi.jar SUNMSCAPI_JAR_UNSIGNED := $(JDK_OUTPUTDIR)/jce/unsigned/sunmscapi.jar $(eval $(call SetupArchive,BUILD_SUNMSCAPI_JAR, , \ - SRCS := $(JDK_OUTPUTDIR)/classes_security, \ + SRCS := $(JDK_OUTPUTDIR)/$(SECURITY_CLASSES_SUBDIR)/jdk.crypto.mscapi, \ SUFFIXES := .class, \ INCLUDES := sun/security/mscapi, \ JAR := $(SUNMSCAPI_JAR_UNSIGNED), \ @@ -349,7 +218,7 @@ ifeq ($(OPENJDK_TARGET_OS), solaris) UCRYPTO_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/ucrypto/ucrypto.jar $(eval $(call SetupArchive,BUILD_UCRYPTO_JAR, , \ - SRCS := $(JDK_OUTPUTDIR)/classes_security, \ + SRCS := $(JDK_OUTPUTDIR)/$(SECURITY_CLASSES_SUBDIR)/jdk.crypto.ucrypto, \ SUFFIXES := .class, \ INCLUDES := com/oracle/security/ucrypto, \ JAR := $(UCRYPTO_JAR_UNSIGNED), \ diff --git a/jdk/make/GenerateSources.gmk b/jdk/make/GenerateSources.gmk deleted file mode 100644 index 732c0c83f8a..00000000000 --- a/jdk/make/GenerateSources.gmk +++ /dev/null @@ -1,94 +0,0 @@ -# -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -default: all - -include $(SPEC) -include MakeBase.gmk -include JavaCompilation.gmk -include NativeCompilation.gmk -include TextFileProcessing.gmk - -# Setup the java compilers for the JDK build. -include Setup.gmk -# We need the tools. -include Tools.gmk - -# Now include all the rules that generate Java sources. -# The Java sources are written into the gensrc_.... directories. - -include gensrc/GensrcProperties.gmk -GENSRC += $(GENSRC_PROPERTIES) - -include gensrc/GensrcLocaleDataMetaInfo.gmk -GENSRC += $(GENSRC_LOCALEDATAMETAINFO) - -include gensrc/GensrcCharacterData.gmk -GENSRC += $(GENSRC_CHARACTERDATA) - -include gensrc/GensrcJDWP.gmk -GENSRC += $(GENSRC_JDWP) - -include gensrc/GensrcMisc.gmk -GENSRC += $(GENSRC_MISC) - -include gensrc/GensrcCharsetMapping.gmk -GENSRC += $(GENSRC_CHARSETMAPPING) - -include gensrc/GensrcCharsetCoder.gmk -GENSRC += $(GENSRC_CHARSETCODER) - -include gensrc/GensrcBuffer.gmk -GENSRC += $(GENSRC_BUFFER) - -include gensrc/GensrcExceptions.gmk -GENSRC += $(GENSRC_EXCEPTIONS) - -ifneq ($(OPENJDK_TARGET_OS), windows) - include gensrc/GensrcIcons.gmk - GENSRC += $(GENSRC_AWT_ICONS) - - ifeq ($(OPENJDK_TARGET_OS), macosx) - GENSRC += $(GENSRC_OSX_ICONS) - endif - - ifneq ($(OPENJDK_TARGET_OS), macosx) - include gensrc/GensrcX11Wrappers.gmk - GENSRC += $(GENSRC_X11WRAPPERS) - endif -endif - -include gensrc/GensrcCLDR.gmk -GENSRC += $(GENSRC_CLDR) - -include gensrc/GensrcSwing.gmk -GENSRC += $(GENSRC_SWING_BEANINFO) $(GENSRC_SWING_NIMBUS) - -$(GENSRC): $(BUILD_TOOLS) - -all: $(GENSRC) - - -.PHONY: all diff --git a/jdk/make/Images.gmk b/jdk/make/Images.gmk index 5a3aa249114..d2a2ece1eac 100644 --- a/jdk/make/Images.gmk +++ b/jdk/make/Images.gmk @@ -26,7 +26,6 @@ include $(SPEC) include MakeBase.gmk include JavaCompilation.gmk -include Setup.gmk default: images @@ -523,26 +522,29 @@ $(foreach f,$(call CacheFind,$(JDK_OUTPUTDIR)/sample), \ # /db dir ifndef OPENJDK - $(IMAGES_OUTPUTDIR)/_unzip/%.unzipped: $(JDK_TOPDIR)/src/closed/share/db/% + DB_ZIP_DIR := $(wildcard $(JDK_TOPDIR)/src/closed/db) + + $(IMAGES_OUTPUTDIR)/_unzip/%.unzipped: $(DB_ZIP_DIR)/% $(ECHO) Unzipping $(patsubst $(SRC_ROOT)/%,%,$<) + $(RM) -r $(JDK_IMAGE_DIR)/db $(MKDIR) -p $(JDK_IMAGE_DIR)/db cd $(JDK_IMAGE_DIR)/db && $(UNZIP) -q -o $< -x */index.html */KEYS */test/* *javadoc/* */docs/* */demo/* 2> /dev/null cd $(JDK_IMAGE_DIR)/db && $(MV) db-derby-*-bin/* . && $(RM) -r db-derby-*-bin $(MKDIR) -p $(@D) $(TOUCH) $@ - $(JDK_IMAGE_DIR)/db/README-JDK.html: $(JDK_TOPDIR)/src/closed/share/db/README-JDK.html + $(JDK_IMAGE_DIR)/db/README-JDK.html: $(DB_ZIP_DIR)/README-JDK.html $(ECHO) $(LOG_INFO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)' $(MKDIR) -p $(@D) - $(CAT) $< | $(SED) "s/XXXX/$(shell cat $(JDK_TOPDIR)/src/closed/share/db/COPYRIGHTYEAR)/" > $@ + $(CAT) $< | $(SED) "s/XXXX/$(shell cat $(DB_ZIP_DIR)/COPYRIGHTYEAR)/" > $@ - $(JDK_IMAGE_DIR)/db/3RDPARTY: $(JDK_TOPDIR)/src/closed/share/db/3RDPARTY + $(JDK_IMAGE_DIR)/db/3RDPARTY: $(DB_ZIP_DIR)/3RDPARTY $(ECHO) $(LOG_INFO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)' $(MKDIR) -p $(@D) - $(CAT) $< | $(SED) "s/XXXX/$(shell cat $(JDK_TOPDIR)/src/closed/share/db/COPYRIGHTYEAR)/" > $@ + $(CAT) $< | $(SED) "s/XXXX/$(shell cat $(DB_ZIP_DIR)/COPYRIGHTYEAR)/" > $@ - JDK_DB_TARGETS := $(patsubst $(JDK_TOPDIR)/src/closed/share/db/%, $(IMAGES_OUTPUTDIR)/_unzip/%.unzipped, \ - $(wildcard $(JDK_TOPDIR)/src/closed/share/db/*.zip)) \ + JDK_DB_TARGETS := $(patsubst $(DB_ZIP_DIR)/%, $(IMAGES_OUTPUTDIR)/_unzip/%.unzipped, \ + $(wildcard $(DB_ZIP_DIR)/*.zip)) \ $(JDK_IMAGE_DIR)/db/README-JDK.html $(JDK_IMAGE_DIR)/db/3RDPARTY endif @@ -570,8 +572,8 @@ else JRE_DOC_FILES += README endif JDK_DOC_FILES += demo/DEMOS_LICENSE sample/SAMPLES_LICENSE - JRE_DOC_LOCATION := $(JDK_TOPDIR)/src/closed/share/doc/jre - JDK_DOC_LOCATION := $(JDK_TOPDIR)/src/closed/share/doc/jdk + JRE_DOC_LOCATION := $(JDK_TOPDIR)/src/closed/doc/jre + JDK_DOC_LOCATION := $(JDK_TOPDIR)/src/closed/doc/jdk endif JRE_DOC_TARGETS := $(addprefix $(JRE_IMAGE_DIR)/, $(JRE_DOC_FILES)) JDKJRE_DOC_TARGETS := $(addprefix $(JDK_IMAGE_DIR)/jre/, $(JRE_DOC_FILES)) diff --git a/jdk/make/Import.gmk b/jdk/make/Import.gmk index 92d4d1d26d1..5bf9437da7f 100644 --- a/jdk/make/Import.gmk +++ b/jdk/make/Import.gmk @@ -28,16 +28,7 @@ default: all include $(SPEC) include MakeBase.gmk -####### - -IMPORT_TARGET_FILES := - -IMPORT_CLASSES := CORBA JAXP JAXWS LANGTOOLS -IMPORT_SOURCES := CORBA JAXP JAXWS LANGTOOLS -# Only Corba has binaries -IMPORT_BINARIES := CORBA - -####### +################################################################################ # Put the libraries here. Different locations for different target apis. ifeq ($(OPENJDK_TARGET_OS_API), posix) @@ -48,68 +39,18 @@ else HOTSPOT_LIB_DIR := $(HOTSPOT_DIST)/jre/bin endif -####### - -# -# jar xf/unzip fails when executing them all in parallel -# introduce artificial dependency (_DEP) buuhhh - -define ImportClasses - $1_CLASSES_DEP := $$(IMPORT_TARGET_CLASSES) - IMPORT_TARGET_CLASSES += $(JDK_OUTPUTDIR)/classes/_the.$1.classes.imported - - $(JDK_OUTPUTDIR)/classes/_the.$1.classes.imported: $$($1_DIST)/lib/classes.jar $$($1_CLASSES_DEP) - $(ECHO) Importing $1 classes.jar - $(MKDIR) -p $$(@D) - $(RM) $$@ $$@.tmp - ($(CD) $$(@D) && $(JAR) xvf $$< > $$@.tmp) - $(MV) $$@.tmp $$@ -endef - -define ImportSources - $1_SOURCES_DEP := $$(IMPORT_TARGET_SOURCES) - IMPORT_TARGET_SOURCES += $(JDK_OUTPUTDIR)/impsrc/_the.$1.src.imported - - $(JDK_OUTPUTDIR)/impsrc/_the.$1.src.imported: $$($1_DIST)/lib/src.zip $$($1_SOURCES_DEP) - $(ECHO) Importing $1 src.zip - $(MKDIR) -p $$(@D) - $(RM) $$@ $$@.tmp - ($(CD) $$(@D) && $(JAR) xvf $$< > $$@.tmp) - $(MV) $$@.tmp $$@ -endef - -define ImportBinaries - $1_BINARIES_DEP := $$(IMPORT_TARGET_BINARIES) - IMPORT_TARGET_BINARIES += $(JDK_OUTPUTDIR)/_the.$1.binaries.imported - - $(JDK_OUTPUTDIR)/_the.$1.binaries.imported: $$($1_DIST)/lib/bin.zip $$($1_BINARIES_DEP) - $(ECHO) Importing $1 bin.zip - $(MKDIR) -p $$(@D) - $(RM) $$@ $$@.tmp - ($(CD) $$(@D) && $(JAR) xvf $$< > $$@.tmp) - $(MV) $$@.tmp $$@ -endef - -####### - -$(foreach I, $(IMPORT_CLASSES), $(eval $(call ImportClasses,$I))) -$(foreach I, $(IMPORT_SOURCES), $(eval $(call ImportSources,$I))) -$(foreach I, $(IMPORT_BINARIES), $(eval $(call ImportBinaries,$I))) - -IMPORT_TARGET_FILES += $(IMPORT_TARGET_CLASSES) $(IMPORT_TARGET_SOURCES) $(IMPORT_TARGET_BINARIES) - -####### +################################################################################ define CopyDir $1_SRC_FILES := $(shell $(FIND) $2 -type f -a \( -name DUMMY $(addprefix -o$(SPACE)-name$(SPACE),$4) \)) $1_DST_FILES := $$(patsubst $2/%,$3/%,$$($1_SRC_FILES)) - IMPORT_TARGET_FILES += $$($1_DST_FILES) + HOTSPOT_IMPORT_TARGET_FILES += $$($1_DST_FILES) $3/%: $2/% $(ECHO) $(LOG_INFO) Copying $$(@F) $$(install-file) endef -####### +################################################################################ # # Import hotspot @@ -129,22 +70,22 @@ endif ifneq ($(OPENJDK_TARGET_OS), windows) ifeq ($(JVM_VARIANT_SERVER), true) - IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/server/$(LIBRARY_PREFIX)jsig$(SHARED_LIBRARY_SUFFIX) + HOTSPOT_IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/server/$(LIBRARY_PREFIX)jsig$(SHARED_LIBRARY_SUFFIX) ifneq (, $(JSIG_DEBUGINFO)) - IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/server/$(foreach I,$(JSIG_DEBUGINFO),$(notdir $I)) + HOTSPOT_IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/server/$(foreach I,$(JSIG_DEBUGINFO),$(notdir $I)) endif endif ifeq ($(JVM_VARIANT_CLIENT), true) - IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/client/$(LIBRARY_PREFIX)jsig$(SHARED_LIBRARY_SUFFIX) + HOTSPOT_IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/client/$(LIBRARY_PREFIX)jsig$(SHARED_LIBRARY_SUFFIX) ifneq (, $(JSIG_DEBUGINFO)) - IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/client/$(foreach I,$(JSIG_DEBUGINFO),$(notdir $I)) + HOTSPOT_IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/client/$(foreach I,$(JSIG_DEBUGINFO),$(notdir $I)) endif endif ifneq ($(OPENJDK_TARGET_OS), macosx) ifeq ($(JVM_VARIANT_MINIMAL1), true) - IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/minimal/$(LIBRARY_PREFIX)jsig$(SHARED_LIBRARY_SUFFIX) + HOTSPOT_IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/minimal/$(LIBRARY_PREFIX)jsig$(SHARED_LIBRARY_SUFFIX) ifneq (,$(JSIG_DEBUGINFO)) - IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/minimal/$(foreach I,$(JSIG_DEBUGINFO),$(notdir $I)) + HOTSPOT_IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/minimal/$(foreach I,$(JSIG_DEBUGINFO),$(notdir $I)) endif endif endif @@ -242,45 +183,9 @@ ifneq ($(OPENJDK_TARGET_OS), macosx) endif ########################################################################################## -# Unpack the binary distributions of the crypto classes if they exist. -SEC_FILES_ZIP := $(JDK_TOPDIR)/make/tools/crypto/sec-bin.zip -SEC_FILES_WIN_ZIP := $(JDK_TOPDIR)/make/tools/crypto/sec-windows-bin.zip -JGSS_WIN32_FILES_ZIP := $(JDK_TOPDIR)/make/tools/crypto/jgss-windows-i586-bin.zip -JGSS_WIN64_FILES_ZIP := $(JDK_TOPDIR)/make/tools/crypto/jgss-windows-x64-bin.zip -define unzip-sec-file - $(ECHO) Unzipping $( $@.tmp) - $(MV) $@.tmp $@ -endef +hotspot: $(HOTSPOT_IMPORT_TARGET_FILES) -$(JDK_OUTPUTDIR)/classes/_the.sec-bin.unzipped: $(SEC_FILES_ZIP) - $(call unzip-sec-file) +all: hotspot -$(JDK_OUTPUTDIR)/classes/_the.sec-windows-bin.unzipped: $(SEC_FILES_WIN_ZIP) - $(call unzip-sec-file) - -$(JDK_OUTPUTDIR)/classes/_the.jgss-windows-i586-bin.unzipped: $(JGSS_WIN32_FILES_ZIP) - $(call unzip-sec-file) - -$(JDK_OUTPUTDIR)/classes/_the.jgss-windows-x64-bin.unzipped: $(JGSS_WIN64_FILES_ZIP) - $(call unzip-sec-file) - -ifneq ($(wildcard $(SEC_FILES_ZIP)), ) - IMPORT_TARGET_FILES += $(JDK_OUTPUTDIR)/classes/_the.sec-bin.unzipped - ifeq ($(OPENJDK_TARGET_OS), windows) - IMPORT_TARGET_FILES += $(JDK_OUTPUTDIR)/classes/_the.sec-windows-bin.unzipped - ifeq ($(OPENJDK_TARGET_CPU), x86) - IMPORT_TARGET_FILES += $(JDK_OUTPUTDIR)/classes/_the.jgss-windows-i586-bin.unzipped - endif - ifeq ($(OPENJDK_TARGET_CPU), x86_64) - IMPORT_TARGET_FILES += $(JDK_OUTPUTDIR)/classes/_the.jgss-windows-x64-bin.unzipped - endif - endif -endif - -########################################################################################## - -all: $(IMPORT_TARGET_FILES) +.PHONY: hotspot all diff --git a/jdk/make/ModulesXml.gmk b/jdk/make/ModulesXml.gmk new file mode 100644 index 00000000000..1399e46bace --- /dev/null +++ b/jdk/make/ModulesXml.gmk @@ -0,0 +1,69 @@ +# +# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +# Default target declared first +default: all + +include $(SPEC) +include MakeBase.gmk +include Tools.gmk + +# +# Generate modules.xml for jdeps to use +# It augments $(TOPDIR)/modules.xml to include module membership +# +JDEPS_MODULES_XML := $(JDK_OUTPUTDIR)/modules/jdk.dev/com/sun/tools/jdeps/resources/modules.xml + +METADATA := $(JDK_OUTPUTDIR)/btclasses/build/tools/module/modules.xml +$(METADATA): $(TOPDIR)/modules.xml + $(call install-file) + +METADATA_FILES := $(METADATA) + +ifndef OPENJDK + CLOSED_METADATA := $(JDK_OUTPUTDIR)/btclasses/build/tools/module/closed/modules.xml + $(CLOSED_METADATA): $(TOPDIR)/closed/modules.xml + $(call install-file) + + METADATA_FILES += $(CLOSED_METADATA) +endif + +$(JDEPS_MODULES_XML): $(BUILD_TOOLS_JDK) $(METADATA_FILES) + $(MKDIR) -p $(@D) + $(RM) $@ + $(TOOL_GENMODULESXML) $@ $(JDK_OUTPUTDIR)/modules + +# +# Verify access across module boundaries +# +checkdeps: $(JDEPS_MODULES_XML) + $(ECHO) "Checking dependencies across JDK modules" + $(FIXPATH) $(JDK_OUTPUTDIR)/bin/jdeps -verify:access -mp $(JDK_OUTPUTDIR)/modules + +gen-modules-xml: $(JDEPS_MODULES_XML) + +all: checkdeps + +.PHONY: all diff --git a/jdk/make/Profiles.gmk b/jdk/make/Profiles.gmk index dc4ea590fdb..02743e31854 100644 --- a/jdk/make/Profiles.gmk +++ b/jdk/make/Profiles.gmk @@ -265,11 +265,11 @@ NOT_JRE_LIB_FILES += $(CUSTOM_JARS) include profile-rtjar-includes.txt # Function to expand foo/*.class into the set of classes -# NOTE: Classfiles with $ in their name are problematic as that is the -# meta-character for both make and the shell! Hence the \$$$$ substitution. +# NOTE: Files found by wildcard are stipped of extra $, so call DoubleDollar +# to keep the file names compatible with make. # But note that if you echo these values they will NOT display as expected. -class_list = $(patsubst $(JDK_OUTPUTDIR)/classes/%,%, \ - $(foreach i, $(1), $(subst $$,\$$$$, $(wildcard $(JDK_OUTPUTDIR)/classes/$i)))) +class_list = $(foreach dir, $(JDK_OUT_CLASSES), $(patsubst $(dir)/%,%, \ + $(foreach i, $(1), $(call DoubleDollar, $(wildcard $(dir)/$i))))) ifeq ($(PROFILE), profile_1) RT_JAR_EXCLUDES += \ diff --git a/jdk/make/Tools.gmk b/jdk/make/Tools.gmk index 0f781909490..a61ac62d15b 100644 --- a/jdk/make/Tools.gmk +++ b/jdk/make/Tools.gmk @@ -23,29 +23,40 @@ # questions. # +ifndef _TOOLS_GMK +_TOOLS_GMK := 1 + +default: all + +include $(SPEC) +include MakeBase.gmk +include JavaCompilation.gmk +include NativeCompilation.gmk +include SetupJava.gmk + # Cache all finds needed for this file. $(eval $(call FillCacheFind, $(JDK_TOPDIR)/make/src/classes)) # The exception handling of swing beaninfo which have the own tool directory -ifeq (, $(BUILD_TOOLS)) - $(eval $(call SetupJavaCompilation,BUILD_TOOLS, \ +ifeq (, $(BUILD_TOOLS_JDK)) + $(eval $(call SetupJavaCompilation,BUILD_TOOLS_JDK, \ SETUP := GENERATE_OLDBYTECODE, \ SRC := $(JDK_TOPDIR)/make/src/classes, \ BIN := $(JDK_OUTPUTDIR)/btclasses)) endif $(JDK_OUTPUTDIR)/btclasses/build/tools/generatenimbus/resources/%.template: \ - $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/nimbus/%.template + $(JDK_TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus/%.template $(call install-file) -BUILD_TOOLS += $(foreach i, $(wildcard $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/nimbus/*.template), $(JDK_OUTPUTDIR)/btclasses/build/tools/generatenimbus/resources/$(notdir $i)) +BUILD_TOOLS_JDK += $(foreach i, $(wildcard $(JDK_TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus/*.template), $(JDK_OUTPUTDIR)/btclasses/build/tools/generatenimbus/resources/$(notdir $i)) # Resource used by CheckDeps tool $(JDK_OUTPUTDIR)/btclasses/build/tools/deps/refs.allowed: \ $(JDK_TOPDIR)/make/data/checkdeps/refs.allowed $(call install-file) -BUILD_TOOLS += $(JDK_OUTPUTDIR)/btclasses/build/tools/deps/refs.allowed +BUILD_TOOLS_JDK += $(JDK_OUTPUTDIR)/btclasses/build/tools/deps/refs.allowed # Add a checksum ("jsum") to the end of a text file. Prevents trivial tampering with class lists. TOOL_ADDJSUM = $(JAVA_SMALL) -cp $(JDK_OUTPUTDIR)/btclasses \ @@ -90,6 +101,9 @@ TOOL_TZDB = $(JAVA_SMALL) -cp $(JDK_OUTPUTDIR)/btclasses \ TOOL_BLACKLISTED_CERTS = $(JAVA_SMALL) -cp $(JDK_OUTPUTDIR)/btclasses \ build.tools.blacklistedcertsconverter.BlacklistedCertsConverter +TOOL_MAKEJAVASECURITY = $(JAVA_SMALL) -cp $(JDK_OUTPUTDIR)/btclasses \ + build.tools.makejavasecurity.MakeJavaSecurity + # TODO: There are references to the jdwpgen.jar in jdk/make/netbeans/jdwpgen/build.xml # and nbproject/project.properties in the same dir. Needs to be looked at. @@ -118,11 +132,12 @@ TOOL_CLDRCONVERTER = $(JAVA_SMALL) -cp $(JDK_OUTPUTDIR)/btclasses \ build.tools.cldrconverter.CLDRConverter TOOL_CHECKDEPS = $(JAVA_SMALL) -Xbootclasspath/p:$(INTERIM_LANGTOOLS_JAR) \ - -cp $(JDK_OUTPUTDIR)/btclasses:$(JDK_OUTPUTDIR) \ + -cp "$(JDK_OUTPUTDIR)/btclasses$(PATH_SEP)$(JDK_OUTPUTDIR)" \ build.tools.deps.CheckDeps -TOOL_ADDTORESTRICTEDPKGS = $(JAVA_SMALL) -cp $(JDK_OUTPUTDIR)/btclasses \ - build.tools.addtorestrictedpkgs.AddToRestrictedPkgs +TOOL_GENMODULESXML = $(JAVA_SMALL) -Xbootclasspath/p:$(INTERIM_LANGTOOLS_JAR) \ + -cp "$(JDK_OUTPUTDIR)/btclasses$(PATH_SEP)$(JDK_OUTPUTDIR)" \ + build.tools.module.GenerateModulesXml ########################################################################################## @@ -149,3 +164,10 @@ $(eval $(call SetupNativeCompilation,FIX_EMPTY_SEC_HDR_FLAGS, \ OUTPUT_DIR := $(JDK_OUTPUTDIR)/btbin, \ PROGRAM := fix_empty_sec_hdr_flags)) endif + +java-tools: $(BUILD_TOOLS_JDK) + +all: java-tools + +endif # _TOOLS_GMK + diff --git a/jdk/make/UnpackSecurity.gmk b/jdk/make/UnpackSecurity.gmk new file mode 100644 index 00000000000..d178ed85155 --- /dev/null +++ b/jdk/make/UnpackSecurity.gmk @@ -0,0 +1,77 @@ +# +# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +default: all + +include $(SPEC) +include MakeBase.gmk + +################################################################################ +# Unpack the binary distributions of the crypto classes if they exist. +SEC_FILES_ZIP := $(JDK_TOPDIR)/make/tools/crypto/sec-bin.zip +SEC_FILES_WIN_ZIP := $(JDK_TOPDIR)/make/tools/crypto/sec-windows-bin.zip +JGSS_WIN32_FILES_ZIP := $(JDK_TOPDIR)/make/tools/crypto/jgss-windows-i586-bin.zip +JGSS_WIN64_FILES_ZIP := $(JDK_TOPDIR)/make/tools/crypto/jgss-windows-x64-bin.zip + +define unzip-sec-file + $(ECHO) Unzipping $( $@.tmp) + $(MV) $@.tmp $@ +endef + +$(JDK_OUTPUTDIR)/classes/_the.sec-bin.unzipped: $(SEC_FILES_ZIP) + $(call unzip-sec-file) + +$(JDK_OUTPUTDIR)/classes/_the.sec-windows-bin.unzipped: $(SEC_FILES_WIN_ZIP) + $(call unzip-sec-file) + +$(JDK_OUTPUTDIR)/classes/_the.jgss-windows-i586-bin.unzipped: $(JGSS_WIN32_FILES_ZIP) + $(call unzip-sec-file) + +$(JDK_OUTPUTDIR)/classes/_the.jgss-windows-x64-bin.unzipped: $(JGSS_WIN64_FILES_ZIP) + $(call unzip-sec-file) + +ifneq ($(wildcard $(SEC_FILES_ZIP)), ) + IMPORT_TARGET_FILES += $(JDK_OUTPUTDIR)/classes/_the.sec-bin.unzipped + ifeq ($(OPENJDK_TARGET_OS), windows) + IMPORT_TARGET_FILES += $(JDK_OUTPUTDIR)/classes/_the.sec-windows-bin.unzipped + ifeq ($(OPENJDK_TARGET_CPU), x86) + IMPORT_TARGET_FILES += $(JDK_OUTPUTDIR)/classes/_the.jgss-windows-i586-bin.unzipped + endif + ifeq ($(OPENJDK_TARGET_CPU), x86_64) + IMPORT_TARGET_FILES += $(JDK_OUTPUTDIR)/classes/_the.jgss-windows-x64-bin.unzipped + endif + endif +endif + +################################################################################ + +sec: $(IMPORT_TARGET_FILES) + +all: sec + +.PHONY: sec all diff --git a/jdk/src/macosx/bundle/JDK-Info.plist b/jdk/make/bundle/JDK-Info.plist similarity index 100% rename from jdk/src/macosx/bundle/JDK-Info.plist rename to jdk/make/bundle/JDK-Info.plist diff --git a/jdk/src/macosx/bundle/JRE-Info.plist b/jdk/make/bundle/JRE-Info.plist similarity index 100% rename from jdk/src/macosx/bundle/JRE-Info.plist rename to jdk/make/bundle/JRE-Info.plist diff --git a/jdk/make/copy/Copy-java.base.gmk b/jdk/make/copy/Copy-java.base.gmk new file mode 100644 index 00000000000..36a2c9da66a --- /dev/null +++ b/jdk/make/copy/Copy-java.base.gmk @@ -0,0 +1,245 @@ +# +# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include CopyCommon.gmk + +$(eval $(call IncludeCustomExtension, jdk, copy/Copy-java.base.gmk)) + +################################################################################ +# +# Copy exported header files to outputdir. +# +JAVA_BASE_HEADERS := \ + $(INCLUDEDIR)/jni.h \ + $(INCLUDEDIR)/jvmti.h \ + $(INCLUDEDIR)/jvmticmlr.h \ + $(INCLUDEDIR)/classfile_constants.h \ + $(OPENJDK_TARGET_OS_INCLUDE)/jni_md.h \ + # + +$(INCLUDEDIR)/%.h: $(JDK_TOPDIR)/src/java.base/share/native/include/%.h + $(call install-file) + +$(OPENJDK_TARGET_OS_INCLUDE)/%.h: \ + $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_EXPORT_DIR)/native/include/%.h + $(call install-file) + +################################################################################ + +CALENDARS_SRC := $(JDK_TOPDIR)/src/java.base/share/conf + +$(LIBDIR)/calendars.properties: $(CALENDARS_SRC)/calendars.properties + $(call install-file) + +BASE_CONF_FILES += $(LIBDIR)/calendars.properties + +$(LIBDIR)/hijrah-config-umalqura.properties: $(CALENDARS_SRC)/hijrah-config-umalqura.properties + $(MKDIR) -p $(@D) + $(RM) $@ + $(CP) $< $@ + +BASE_CONF_FILES += $(LIBDIR)/hijrah-config-umalqura.properties + +################################################################################ + +ifneq ($(findstring $(OPENJDK_TARGET_OS), windows aix),) + + TZMAPPINGS_SRC := $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/conf + + $(LIBDIR)/tzmappings: $(TZMAPPINGS_SRC)/tzmappings + $(call install-file) + + BASE_CONF_FILES += $(LIBDIR)/tzmappings + +endif + +################################################################################ +# Copy msvcrXX.dll on windows + +ifeq ($(OPENJDK_TARGET_OS), windows) + MSVCR_TARGET := $(JDK_OUTPUTDIR)/bin/$(notdir $(MSVCR_DLL)) + # Chmod to avoid permission issues if bundles are unpacked on unix platforms. + $(MSVCR_TARGET): $(MSVCR_DLL) + $(call install-file) + $(CHMOD) a+rx $@ +endif + +################################################################################ +# +# How to install jvm.cfg. +# +ifeq ($(JVM_VARIANT_ZERO), true) + JVMCFG_ARCH := zero +else + JVMCFG_ARCH := $(OPENJDK_TARGET_CPU_LEGACY) +endif + +ifeq ($(OPENJDK_TARGET_OS), macosx) + JVMCFG_SRC := $(JDK_TOPDIR)/src/java.base/macosx/conf/$(JVMCFG_ARCH)/jvm.cfg +else + JVMCFG_SRC := $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/conf/$(JVMCFG_ARCH)/jvm.cfg +endif +JVMCFG_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR) +JVMCFG := $(JVMCFG_DIR)/jvm.cfg + +# To do: should this also support -zeroshark? + +ifeq ($(OPENJDK_TARGET_CPU_BITS), 64) + COPY_JVM_CFG_FILE := true +else + # On 32-bit machines we have three potential VMs: client, server and minimal. + # Historically we usually have both client and server and so that is what the + # committed jvm.cfg expects (including platform specific ergonomics switches + # to decide whether to use client or server by default). So when we have anything + # other than client and server we need to define a new jvm.cfg file. + # The main problem is deciding whether to use aliases for the VMs that are not + # present and the current position is that we add aliases for client and server, but + # not for minimal. + CLIENT_AND_SERVER := $(and $(findstring true, $(JVM_VARIANT_SERVER)), $(findstring true, $(JVM_VARIANT_CLIENT))) + ifeq ($(CLIENT_AND_SERVER), true) + COPY_JVM_CFG_FILE := true + else + # For zero, the default jvm.cfg file is sufficient + ifeq ($(JVM_VARIANT_ZERO), true) + COPY_JVM_CFG_FILE := true + endif + endif +endif + +ifeq ($(COPY_JVM_CFG_FILE), true) + $(JVMCFG): $(JVMCFG_SRC) + $(call install-file) +else + $(JVMCFG): + $(MKDIR) -p $(@D) + $(RM) $(@) + # Now check for other permutations + ifeq ($(JVM_VARIANT_SERVER), true) + $(PRINTF) "-server KNOWN\n">>$(@) + $(PRINTF) "-client ALIASED_TO -server\n">>$(@) + ifeq ($(JVM_VARIANT_MINIMAL1), true) + $(PRINTF) "-minimal KNOWN\n">>$(@) + endif + else + ifeq ($(JVM_VARIANT_CLIENT), true) + $(PRINTF) "-client KNOWN\n">>$(@) + $(PRINTF) "-server ALIASED_TO -client\n">>$(@) + ifeq ($(JVM_VARIANT_MINIMAL1), true) + $(PRINTF) "-minimal KNOWN\n">>$(@) + endif + else + ifeq ($(JVM_VARIANT_MINIMAL1), true) + $(PRINTF) "-minimal KNOWN\n">>$(@) + $(PRINTF) "-server ALIASED_TO -minimal\n">>$(@) + $(PRINTF) "-client ALIASED_TO -minimal\n">>$(@) + endif + endif + endif +endif + +BASE_CONF_FILES += $(JVMCFG) + +################################################################################ + +POLICY_SRC := $(JDK_TOPDIR)/src/java.base/share/conf/security/java.policy +POLICY_DST := $(JDK_OUTPUTDIR)/lib/security/java.policy + +POLICY_SRC_LIST := + +ifeq ($(OPENJDK_TARGET_OS), windows) + POLICY_SRC_LIST += $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/conf/security/java.policy +endif +ifndef OPENJDK + ifeq ($(OPENJDK_TARGET_OS), windows) + ifeq ($(OPENJDK_TARGET_CPU_BITS), 32) + POLICY_SRC_LIST += $(JDK_TOPDIR)/src/closed/java.base/$(OPENJDK_TARGET_OS)/conf/security/java.policy-win32 + else + POLICY_SRC_LIST += $(JDK_TOPDIR)/src/closed/java.base/$(OPENJDK_TARGET_OS)/conf/security/java.policy-win64 + endif + endif + ifeq ($(OPENJDK_TARGET_OS), solaris) + POLICY_SRC_LIST += $(JDK_TOPDIR)/src/closed/java.base/$(OPENJDK_TARGET_OS)/conf/security/java.policy + endif +endif + +POLICY_SRC_LIST += $(POLICY_SRC) + +$(POLICY_DST): $(POLICY_SRC_LIST) + $(MKDIR) -p $(@D) + $(RM) $@ $@.tmp + $(foreach f,$(POLICY_SRC_LIST),$(CAT) $(f) >> $@.tmp;) + $(MV) $@.tmp $@ + +BASE_CONF_FILES += $(POLICY_DST) + +################################################################################ + +ifeq ($(CACERTS_FILE), ) + CACERTS_FILE := $(JDK_TOPDIR)/src/java.base/share/conf/security/cacerts +endif +CACERTS_DST := $(JDK_OUTPUTDIR)/lib/security/cacerts + +$(CACERTS_DST): $(CACERTS_FILE) + $(call install-file) + +BASE_CONF_FILES += $(CACERTS_DST) + +################################################################################ + +ifeq ($(OPENJDK_TARGET_OS), solaris) + + SUNPKCS11_CFG_SRC := $(JDK_TOPDIR)/src/java.base/share/conf/security/sunpkcs11-solaris.cfg + SUNPKCS11_CFG_DST := $(JDK_OUTPUTDIR)/lib/security/sunpkcs11-solaris.cfg + + $(SUNPKCS11_CFG_DST): $(SUNPKCS11_CFG_SRC) + $(call install-file) + + BASE_CONF_FILES += $(SUNPKCS11_CFG_DST) + +endif + +################################################################################ + +$(JDK_OUTPUTDIR)/lib/net.properties: $(JDK_TOPDIR)/src/java.base/share/conf/net.properties + $(ECHO) $(LOG_INFO) Copying $(@F) + $(call install-file) + +NET_CONF_FILES += $(JDK_OUTPUTDIR)/lib/net.properties + +ifeq ($(OPENJDK_TARGET_OS), solaris) + $(JDK_OUTPUTDIR)/lib/sdp/sdp.conf.template: $(JDK_TOPDIR)/src/java.base/${OPENJDK_TARGET_OS_API_DIR}/conf/sdp/sdp.conf.template + $(ECHO) $(LOG_INFO) Copying $(@F) + $(call install-file) + + NET_CONF_FILES += $(JDK_OUTPUTDIR)/lib/sdp/sdp.conf.template +endif + +################################################################################ + +java.base: $(BASE_CONF_FILES) $(NET_CONF_FILES) $(JAVA_BASE_HEADERS) $(MSVCR_TARGET) + +all: java.base + +.PHONY: all java.base diff --git a/jdk/make/copy/Copy-java.desktop.gmk b/jdk/make/copy/Copy-java.desktop.gmk new file mode 100644 index 00000000000..e724a862b28 --- /dev/null +++ b/jdk/make/copy/Copy-java.desktop.gmk @@ -0,0 +1,153 @@ +# +# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include CopyCommon.gmk + +$(eval $(call IncludeCustomExtension, jdk, copy/Copy-java.desktop.gmk)) + +################################################################################ + +JAVA_DESKTOP_HEADERS := \ + $(INCLUDEDIR)/jawt.h \ + $(OPENJDK_TARGET_OS_INCLUDE)/jawt_md.h \ + # + +$(INCLUDEDIR)/%.h: $(JDK_TOPDIR)/src/java.desktop/share/native/include/%.h + $(call install-file) + +$(OPENJDK_TARGET_OS_INCLUDE)/%.h: \ + $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_EXPORT_DIR)/native/include/%.h + $(call install-file) + +################################################################################ + +ICCPROFILE_DEST_DIR := $(LIBDIR)/cmm + +ifdef OPENJDK + ICCPROFILE_SRC_DIR := $(JDK_TOPDIR)/src/java.desktop/share/conf/cmm/lcms +else + ICCPROFILE_SRC_DIR := $(JDK_TOPDIR)/src/closed/java.desktop/share/conf/cmm/kcms +endif + +ICCPROFILE_SRCS := $(wildcard $(ICCPROFILE_SRC_DIR)/*.pf) +ICCPROFILE_TARGET_FILES := $(subst $(ICCPROFILE_SRC_DIR),$(ICCPROFILE_DEST_DIR),$(ICCPROFILE_SRCS)) + +$(ICCPROFILE_DEST_DIR)%.pf: $(ICCPROFILE_SRC_DIR)%.pf + $(call install-file) + $(CHMOD) 444 $@ + +DESKTOP_CONF_FILES += $(ICCPROFILE_TARGET_FILES) + +################################################################################ + +ifneq ($(FREETYPE_BUNDLE_LIB_PATH), ) + # We need to bundle the freetype library, so it will be available at runtime as well as link time. + # + # NB: Default freetype build system uses -h linker option and + # result .so contains hardcoded library name that is later + # used for adding dependencies to other objects + # (e.g. libfontmanager.so). + # + # It is not obvious how to extract that hardcoded name (libfreetype.so.6) + # without overcomplicating logic here. + # To workaround this we hardcode .6 suffix for now. + # + # Note that .so.6 library will not be found by System.loadLibrary() + # but fortunately we need to load FreeType library explicitly + # on windows only + # + #TODO: rework this to avoid hardcoding library name in the makefile + # + ifeq ($(OPENJDK_TARGET_OS), windows) + FREETYPE_TARGET_LIB := $(JDK_OUTPUTDIR)/bin/$(call SHARED_LIBRARY,freetype) + else + FREETYPE_TARGET_LIB := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/$(call SHARED_LIBRARY,freetype).6 + endif + + $(FREETYPE_TARGET_LIB): $(FREETYPE_BUNDLE_LIB_PATH)/$(call SHARED_LIBRARY,freetype) + $(CP) $(FREETYPE_BUNDLE_LIB_PATH)/$(call SHARED_LIBRARY,freetype) $@ + ifeq ($(OPENJDK_BUILD_OS), windows) + $(CHMOD) +rx $@ + endif +endif + +################################################################################ + +$(JDK_OUTPUTDIR)/lib/sound.properties: $(JDK_TOPDIR)/src/java.desktop/share/conf/sound.properties + $(call install-file) + +DESKTOP_CONF_FILES += $(JDK_OUTPUTDIR)/lib/sound.properties + +################################################################################ +# +# Copy property files from sun/print to LIBDIR +# +PSFONTPROPFILE_SRC_DIR := $(JDK_TOPDIR)/src/java.desktop/share/conf +PSFONTPROPFILE_SRCS := $(wildcard $(PSFONTPROPFILE_SRC_DIR)/psfont*.properties*) +PSFONTPROPFILE_TARGET_FILES := $(subst $(PSFONTPROPFILE_SRC_DIR),$(LIBDIR),$(PSFONTPROPFILE_SRCS)) + +$(LIBDIR)/%: $(PSFONTPROPFILE_SRC_DIR)/% + $(call install-file) + +DESKTOP_CONF_FILES += $(PSFONTPROPFILE_TARGET_FILES) + +################################################################################ +# +# Copy cursor.properties and cursors gif files to LIBDIR +# +ifneq ($(OPENJDK_TARGET_OS), macosx) + OPENJDK_TARGET_OS_LIB_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/conf +else + OPENJDK_TARGET_OS_LIB_SRC := $(JDK_TOPDIR)/src/java.desktop/macosx/conf +endif + +CURSORS_DEST_DIR := $(LIBDIR)/images/cursors +CURSORS_OPENJDK_TARGET_OS_LIB_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/conf/images/cursors + +$(CURSORS_DEST_DIR)/cursors.properties: $(CURSORS_OPENJDK_TARGET_OS_LIB_SRC)/cursors.properties + $(call install-file) + +DESKTOP_CONF_FILES += $(CURSORS_DEST_DIR)/cursors.properties + +CURSORS_LIB_SRC := $(JDK_TOPDIR)/src/java.desktop/share/conf/images/cursors +ifeq ($(OPENJDK_TARGET_OS), windows) + CURSORS_SRC_FILES := $(CURSORS_LIB_SRC)/invalid32x32.gif $(wildcard $(CURSORS_LIB_SRC)/win32_*.gif) +else # OPENJDK_TARGET_OS + CURSORS_SRC_FILES := $(CURSORS_LIB_SRC)/invalid32x32.gif $(wildcard $(CURSORS_LIB_SRC)/motif_*.gif) +endif # OPENJDK_TARGET_OS +CURSORS_TARGET_FILES := $(subst $(CURSORS_LIB_SRC),$(CURSORS_DEST_DIR),$(CURSORS_SRC_FILES)) + +$(CURSORS_DEST_DIR)/%: $(CURSORS_LIB_SRC)/% + $(call install-file) + +DESKTOP_CONF_FILES += $(CURSORS_TARGET_FILES) + +################################################################################ + +java.desktop: $(DESKTOP_CONF_FILES) $(FREETYPE_TARGET_LIB) $(JAVA_DESKTOP_HEADERS) + +all: java.desktop + +.PHONY: all java.desktop diff --git a/jdk/make/copy/Copy-java.logging.gmk b/jdk/make/copy/Copy-java.logging.gmk new file mode 100644 index 00000000000..f2644df1a17 --- /dev/null +++ b/jdk/make/copy/Copy-java.logging.gmk @@ -0,0 +1,43 @@ +# +# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include CopyCommon.gmk + +################################################################################ + +LOGGING_LIB_SRC := $(JDK_TOPDIR)/src/java.logging/share/conf + +$(LIBDIR)/logging.properties: $(LOGGING_LIB_SRC)/logging.properties + $(call install-file) + +LOGGING_CONF_FILES := $(LIBDIR)/logging.properties + +################################################################################ + +java.logging: $(LOGGING_CONF_FILES) + +all: java.logging + +.PHONY: all java.logging diff --git a/jdk/make/copy/Copy-java.management.gmk b/jdk/make/copy/Copy-java.management.gmk new file mode 100644 index 00000000000..55657a963ba --- /dev/null +++ b/jdk/make/copy/Copy-java.management.gmk @@ -0,0 +1,56 @@ +# +# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include CopyCommon.gmk + +################################################################################ + +MGMT_LIBDIR := $(LIBDIR)/management +MGMT_LIB_SRC := $(JDK_TOPDIR)/src/java.management/share/conf +MGMT_SRC_FILES := $(wildcard $(MGMT_LIB_SRC)/*) +MGMT_TARGET_FILES := $(subst $(MGMT_LIB_SRC),$(MGMT_LIBDIR),$(MGMT_SRC_FILES)) + +$(MGMT_LIBDIR)/management.properties: $(MGMT_LIB_SRC)/management.properties + $(call install-file) + $(CHMOD) 644 $@ + +# this file has different permissions...don't know why... +$(MGMT_LIBDIR)/jmxremote.access: $(MGMT_LIB_SRC)/jmxremote.access + $(call install-file) + $(CHMOD) 644 $@ + +$(MGMT_LIBDIR)/%: $(MGMT_LIB_SRC)/% + $(call install-file) + $(CHMOD) 444 $@ + +MANAGEMENT_CONF_FILES := $(MGMT_TARGET_FILES) + +################################################################################ + +java.management: $(MANAGEMENT_CONF_FILES) + +all: java.management + +.PHONY: all java.management diff --git a/jdk/make/copy/Copy-jdk.hprof.agent.gmk b/jdk/make/copy/Copy-jdk.hprof.agent.gmk new file mode 100644 index 00000000000..ccec153a5b7 --- /dev/null +++ b/jdk/make/copy/Copy-jdk.hprof.agent.gmk @@ -0,0 +1,43 @@ +# +# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include CopyCommon.gmk + +################################################################################ + +HPROF_SRC := $(JDK_TOPDIR)/src/demo/share/jvmti/hprof/jvm.hprof.txt + +$(LIBDIR)/jvm.hprof.txt: $(HPROF_SRC) + $(call install-file) + +HPROF_CONF_FILES := $(LIBDIR)/jvm.hprof.txt + +################################################################################ + +jdk.hprof.agent: $(HPROF_CONF_FILES) + +all: jdk.hprof.agent + +.PHONY: all jdk.hprof.agent diff --git a/jdk/make/copy/Copy-jdk.jdwp.agent.gmk b/jdk/make/copy/Copy-jdk.jdwp.agent.gmk new file mode 100644 index 00000000000..c02ae7bd9be --- /dev/null +++ b/jdk/make/copy/Copy-jdk.jdwp.agent.gmk @@ -0,0 +1,42 @@ +# +# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include CopyCommon.gmk + +################################################################################ + + +JDK_DEBUG_AGENT_HEADERS := $(INCLUDEDIR)/jdwpTransport.h + +$(INCLUDEDIR)/%.h: $(JDK_TOPDIR)/src/jdk.jdwp.agent/share/native/include/%.h + $(call install-file) + +################################################################################ + +jdk.jdwp.agent: $(JDK_DEBUG_AGENT_HEADERS) + +all: jdk.jdwp.agent + +.PHONY: all jdk.jdwp.agent diff --git a/jdk/make/copy/CopyCommon.gmk b/jdk/make/copy/CopyCommon.gmk new file mode 100644 index 00000000000..3baefab75c8 --- /dev/null +++ b/jdk/make/copy/CopyCommon.gmk @@ -0,0 +1,40 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +default: all + +include $(SPEC) +include MakeBase.gmk + +INCLUDEDIR = $(JDK_OUTPUTDIR)/include +LIBDIR := $(JDK_OUTPUTDIR)/lib + +OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/$(OPENJDK_TARGET_OS) + +ifeq ($(OPENJDK_TARGET_OS), windows) + OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/win32 +else ifeq ($(OPENJDK_TARGET_OS), macosx) + OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/darwin +endif diff --git a/jdk/make/GenerateData.gmk b/jdk/make/gendata/Gendata-java.base.gmk similarity index 59% rename from jdk/make/GenerateData.gmk rename to jdk/make/gendata/Gendata-java.base.gmk index 8228f917800..4c7f7a55b2c 100644 --- a/jdk/make/GenerateData.gmk +++ b/jdk/make/gendata/Gendata-java.base.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -23,41 +23,25 @@ # questions. # -default: all +include GendataCommon.gmk -include $(SPEC) -include MakeBase.gmk -include JavaCompilation.gmk +# Hook to include the corresponding custom file, if present. +$(eval $(call IncludeCustomExtension, jdk, gendata/Gendata-java.base.gmk)) -# Setup the java compilers for the JDK build. -include Setup.gmk -# We need the tools. -include Tools.gmk - -# Now include all the rules that generate data resources. -# These are written directly into classes dir. -GENDATA := - -include gendata/GendataBreakIterator.gmk +include GendataBreakIterator.gmk GENDATA += $(BREAK_ITERATOR) -include gendata/GendataFontConfig.gmk -GENDATA += $(GENDATA_FONT_CONFIG) - -include gendata/GendataTZDB.gmk +include GendataTZDB.gmk GENDATA += $(GENDATA_TZDB) -include gendata/GendataHtml32dtd.gmk -GENDATA += $(GENDATA_HTML32DTD) - -include gendata/GendataBlacklistedCerts.gmk +include GendataBlacklistedCerts.gmk GENDATA += $(GENDATA_BLACKLISTED_CERTS) ########################################################################################## -GENDATA_UNINAME := $(JDK_OUTPUTDIR)/classes/java/lang/uniName.dat +GENDATA_UNINAME := $(JDK_OUTPUTDIR)/modules/java.base/java/lang/uniName.dat -$(GENDATA_UNINAME): $(JDK_TOPDIR)/make/data/unicodedata/UnicodeData.txt $(BUILD_TOOLS) +$(GENDATA_UNINAME): $(JDK_TOPDIR)/make/data/unicodedata/UnicodeData.txt $(BUILD_TOOLS_JDK) $(MKDIR) -p $(@D) $(TOOL_CHARACTERNAME) $< $@ @@ -65,9 +49,9 @@ GENDATA += $(GENDATA_UNINAME) ########################################################################################## -GENDATA_CURDATA := $(JDK_OUTPUTDIR)/classes/java/util/currency.data +GENDATA_CURDATA := $(JDK_OUTPUTDIR)/modules/java.base/java/util/currency.data -$(GENDATA_CURDATA): $(JDK_TOPDIR)/make/data/currency/CurrencyData.properties $(BUILD_TOOLS) +$(GENDATA_CURDATA): $(JDK_TOPDIR)/make/data/currency/CurrencyData.properties $(BUILD_TOOLS_JDK) $(MKDIR) -p $(@D) $(RM) $@ $(TOOL_GENERATECURRENCYDATA) -o $@.tmp < $< @@ -78,11 +62,25 @@ GENDATA += $(GENDATA_CURDATA) ########################################################################################## -$(GENDATA): $(BUILD_TOOLS) +GENDATA_JAVA_SECURITY_SRC := $(JDK_TOPDIR)/src/java.base/share/conf/security/java.security +GENDATA_JAVA_SECURITY := $(JDK_OUTPUTDIR)/lib/security/java.security + +# RESTRICTED_PKGS_SRC is optionally set in custom extension for this makefile + +$(GENDATA_JAVA_SECURITY): $(BUILD_TOOLS) $(GENDATA_JAVA_SECURITY_SRC) $(RESTRICTED_PKGS_SRC) + $(ECHO) "Generating java.security" + $(MKDIR) -p $(@D) + $(TOOL_MAKEJAVASECURITY) $(GENDATA_JAVA_SECURITY_SRC) $@ $(OPENJDK_TARGET_OS) \ + $(RESTRICTED_PKGS_SRC) || exit 1 + +GENDATA += $(GENDATA_JAVA_SECURITY) -$(JDK_OUTPUTDIR)/classes/_the.gendata: $(GENDATA) - $(TOUCH) $@ +########################################################################################## -all: $(JDK_OUTPUTDIR)/classes/_the.gendata +$(GENDATA): $(BUILD_TOOLS_JDK) -.PHONY: all +java.base: $(GENDATA) + +all: java.base + +.PHONY: all java.base diff --git a/jdk/make/gendata/Gendata-java.desktop.gmk b/jdk/make/gendata/Gendata-java.desktop.gmk new file mode 100644 index 00000000000..8ba2fe198a1 --- /dev/null +++ b/jdk/make/gendata/Gendata-java.desktop.gmk @@ -0,0 +1,40 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include GendataCommon.gmk + +include GendataFontConfig.gmk +GENDATA += $(GENDATA_FONT_CONFIG) + +include GendataHtml32dtd.gmk +GENDATA += $(GENDATA_HTML32DTD) + +$(GENDATA): $(BUILD_TOOLS_JDK) + +java.desktop: $(GENDATA) + +all: $(GENDATA) + +.PHONY: all java.desktop diff --git a/jdk/make/gendata/GendataBreakIterator.gmk b/jdk/make/gendata/GendataBreakIterator.gmk index b1cc33dca08..7deb71e0db5 100644 --- a/jdk/make/gendata/GendataBreakIterator.gmk +++ b/jdk/make/gendata/GendataBreakIterator.gmk @@ -33,7 +33,8 @@ # They are used at JDK build phase in order to create $(BIFILES) which # are used on runtime instead. # -TEXT_SRCDIR = $(JDK_TOPDIR)/src/share/classes +TEXT_SRCDIR = $(JDK_TOPDIR)/src/java.base/share/classes \ + $(JDK_TOPDIR)/src/jdk.localedata/share/classes TEXT_PKG = sun/text/resources TEXT_SOURCES = $(TEXT_PKG)/BreakIteratorRules.java \ $(TEXT_PKG)/BreakIteratorInfo.java \ @@ -54,7 +55,7 @@ $(eval $(call SetupJavaCompilation,BUILD_BREAKITERATOR, \ SETUP := GENERATE_OLDBYTECODE, \ SRC := $(TEXT_SRCDIR), \ DISABLE_SJAVAC := true, \ - JAVAC_SOURCE_PATH_OVERRIDE := $(TEXT_SRCDIR)/$(TEXT_PKG), \ + JAVAC_SOURCE_PATH_OVERRIDE := $(patsubst %, %/$(TEXT_PKG), $(TEXT_SRCDIR)), \ INCLUDES := $(TEXT_PKG), \ INCLUDE_FILES := $(TEXT_SOURCES), \ BIN := $(BREAK_ITERATOR_CLASSES))) @@ -64,33 +65,34 @@ $(eval $(call SetupJavaCompilation,BUILD_BREAKITERATOR, \ UNICODEDATA = $(JDK_TOPDIR)/make/data/unicodedata/UnicodeData.txt # output -DATA_PKG_DIR = $(JDK_OUTPUTDIR)/classes/sun/text/resources -BIFILES = $(DATA_PKG_DIR)/CharacterBreakIteratorData \ - $(DATA_PKG_DIR)/WordBreakIteratorData \ - $(DATA_PKG_DIR)/LineBreakIteratorData \ - $(DATA_PKG_DIR)/SentenceBreakIteratorData -BIFILES_TH = $(DATA_PKG_DIR)/th/WordBreakIteratorData_th \ - $(DATA_PKG_DIR)/th/LineBreakIteratorData_th +BASE_DATA_PKG_DIR = $(JDK_OUTPUTDIR)/modules/java.base/sun/text/resources +SL_DATA_PKG_DIR = $(JDK_OUTPUTDIR)/modules/jdk.localedata/sun/text/resources +BIFILES = $(BASE_DATA_PKG_DIR)/CharacterBreakIteratorData \ + $(BASE_DATA_PKG_DIR)/WordBreakIteratorData \ + $(BASE_DATA_PKG_DIR)/LineBreakIteratorData \ + $(BASE_DATA_PKG_DIR)/SentenceBreakIteratorData +BIFILES_TH = $(SA_DATA_PKG_DIR)/th/WordBreakIteratorData_th \ + $(SA_DATA_PKG_DIR)/th/LineBreakIteratorData_th -$(BIFILES): $(DATA_PKG_DIR)/_the.bifiles -$(DATA_PKG_DIR)/_the.bifiles: JAVA_FLAGS += -Xbootclasspath/p:$(BREAK_ITERATOR_CLASSES) -$(DATA_PKG_DIR)/_the.bifiles: $(BUILD_TOOLS) $(UNICODEDATA) $(BUILD_BREAKITERATOR) +$(BIFILES): $(BASE_DATA_PKG_DIR)/_the.bifiles +$(BASE_DATA_PKG_DIR)/_the.bifiles: JAVA_FLAGS += -Xbootclasspath/p:$(BREAK_ITERATOR_CLASSES) +$(BASE_DATA_PKG_DIR)/_the.bifiles: $(BUILD_TOOLS) $(UNICODEDATA) $(BUILD_BREAKITERATOR) $(ECHO) $(LOG_INFO) "Generating BreakIteratorData" - $(MKDIR) -p $(DATA_PKG_DIR) + $(MKDIR) -p $(@D) $(RM) $(BIFILES) $(TOOL_GENERATEBREAKITERATORDATA) \ - -o $(DATA_PKG_DIR) \ + -o $(@D) \ -spec $(UNICODEDATA) $(TOUCH) $@ -$(BIFILES_TH): $(DATA_PKG_DIR)/_the.bifiles_th -$(DATA_PKG_DIR)/_the.bifiles_th: JAVA_FLAGS += -Xbootclasspath/p:$(BREAK_ITERATOR_CLASSES) -$(DATA_PKG_DIR)/_the.bifiles_th: $(BUILD_TOOLS) $(UNICODEDATA) $(BUILD_BREAKITERATOR) +$(BIFILES_TH): $(SL_DATA_PKG_DIR)/_the.bifiles_th +$(SL_DATA_PKG_DIR)/_the.bifiles_th: JAVA_FLAGS += -Xbootclasspath/p:$(BREAK_ITERATOR_CLASSES) +$(SL_DATA_PKG_DIR)/_the.bifiles_th: $(BUILD_TOOLS) $(UNICODEDATA) $(BUILD_BREAKITERATOR) $(ECHO) $(LOG_INFO) "Generating BreakIteratorData_th" - $(MKDIR) -p $(DATA_PKG_DIR)/th + $(MKDIR) -p $(@D)/th $(RM) $(BIFILES_TH) $(TOOL_GENERATEBREAKITERATORDATA) \ - -o $(DATA_PKG_DIR) \ + -o $(@D) \ -spec $(UNICODEDATA) \ -language th $(TOUCH) $@ diff --git a/corba/make/BuildCorba.gmk b/jdk/make/gendata/GendataCommon.gmk similarity index 76% rename from corba/make/BuildCorba.gmk rename to jdk/make/gendata/GendataCommon.gmk index 05bcbe31337..c199a377378 100644 --- a/corba/make/BuildCorba.gmk +++ b/jdk/make/gendata/GendataCommon.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -23,23 +23,14 @@ # questions. # -# -# Makefile for building the corba workspace. -# - -# This must be the first rule default: all include $(SPEC) +include MakeBase.gmk +include JavaCompilation.gmk -gensrc-corba: - +$(MAKE) -f $(CORBA_TOPDIR)/make/GensrcCorba.gmk +# Setup the java compilers for the JDK build. +include SetupJava.gmk +# We need the tools. +include Tools.gmk -compile-corba: gensrc-corba - +$(MAKE) -f $(CORBA_TOPDIR)/make/CompileCorba.gmk - -all: compile-corba - - -.PHONY: default all -.PHONY: gensrc-corba compile-corba diff --git a/jdk/make/gendata/GendataHtml32dtd.gmk b/jdk/make/gendata/GendataHtml32dtd.gmk index 1bbf971580c..7c996818969 100644 --- a/jdk/make/gendata/GendataHtml32dtd.gmk +++ b/jdk/make/gendata/GendataHtml32dtd.gmk @@ -25,7 +25,7 @@ GENDATA_HTML32DTD := -HTML32DTD = $(JDK_OUTPUTDIR)/classes/javax/swing/text/html/parser/html32.bdtd +HTML32DTD = $(JDK_OUTPUTDIR)/modules/java.desktop/javax/swing/text/html/parser/html32.bdtd $(HTML32DTD): $(BUILD_TOOLS) $(ECHO) "Generating HTML DTD file" $(MKDIR) -p $(@D) diff --git a/jdk/make/gendata/GendataTZDB.gmk b/jdk/make/gendata/GendataTZDB.gmk index b18d6a77409..20c2b19eb4f 100644 --- a/jdk/make/gendata/GendataTZDB.gmk +++ b/jdk/make/gendata/GendataTZDB.gmk @@ -36,6 +36,7 @@ GENDATA_TZDB_DAT := $(JDK_OUTPUTDIR)/lib/tzdb.dat $(GENDATA_TZDB_DAT): $(TZDATA_TZFILES) $(RM) $(GENDATA_TZDB_DAT) + $(MKDIR) -p $(@D) $(TOOL_TZDB) -srcdir $(TZDATA_DIR) -dstfile $(GENDATA_TZDB_DAT) $(TZDATA_TZFILE) GENDATA_TZDB += $(GENDATA_TZDB_DAT) diff --git a/jdk/make/gensrc/Gensrc-java.base.gmk b/jdk/make/gensrc/Gensrc-java.base.gmk new file mode 100644 index 00000000000..2f0346ce514 --- /dev/null +++ b/jdk/make/gensrc/Gensrc-java.base.gmk @@ -0,0 +1,45 @@ +# +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include GensrcCommon.gmk + +# TODO: maybe split into separate modules? +include GensrcProperties.gmk +GENSRC_JAVA_BASE += $(GENSRC_PROPERTIES) + +include GensrcLocaleDataMetaInfo.gmk +include GensrcCharacterData.gmk +include GensrcMisc.gmk +include GensrcCharsetMapping.gmk +include GensrcCharsetCoder.gmk +include GensrcBuffer.gmk +include GensrcExceptions.gmk +include GensrcCLDR.gmk + +java.base: $(GENSRC_JAVA_BASE) + +all: java.base + +.PHONY: all java.base diff --git a/jdk/make/gensrc/Gensrc-java.desktop.gmk b/jdk/make/gensrc/Gensrc-java.desktop.gmk new file mode 100644 index 00000000000..ec26dfe4679 --- /dev/null +++ b/jdk/make/gensrc/Gensrc-java.desktop.gmk @@ -0,0 +1,45 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include GensrcCommon.gmk + +# Hook to include the corresponding custom file, if present. +$(eval $(call IncludeCustomExtension, jdk, gensrc/Gensrc-java.desktop.gmk)) + +ifneq ($(OPENJDK_TARGET_OS), windows) + include GensrcIcons.gmk + + ifneq ($(OPENJDK_TARGET_OS), macosx) + include GensrcX11Wrappers.gmk + endif +endif + +include GensrcSwing.gmk + +java.desktop: $(GENSRC_JAVA_DESKTOP) + +all: java.desktop + +.PHONY: all java.desktop diff --git a/jdk/test/sun/tools/jps/jps-l_1.sh b/jdk/make/gensrc/Gensrc-jdk.attach.gmk similarity index 70% rename from jdk/test/sun/tools/jps/jps-l_1.sh rename to jdk/make/gensrc/Gensrc-jdk.attach.gmk index 4cb65ea5e23..a3cff05e1aa 100644 --- a/jdk/test/sun/tools/jps/jps-l_1.sh +++ b/jdk/make/gensrc/Gensrc-jdk.attach.gmk @@ -1,10 +1,12 @@ # -# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. # # This code is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -21,16 +23,12 @@ # questions. # -# @test -# @bug 4990825 -# @run shell jps-l_1.sh -# @summary Test that output of 'jps -l' matches a specific pattern +include GensrcCommon.gmk -. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh +include GensrcProviders.gmk -setup -verify_os +jdk.attach: $(GENSRC_JDK_ATTACH) -JPS="${TESTJAVA}/bin/jps" +all: jdk.attach -${JPS} -J-XX:+UsePerfData -l 2>&1 | awk -f ${TESTSRC}/jps-l_Output1.awk +.PHONY: all jdk.attach diff --git a/jdk/test/sun/tools/jps/jps-Defaults.sh b/jdk/make/gensrc/Gensrc-jdk.charsets.gmk similarity index 69% rename from jdk/test/sun/tools/jps/jps-Defaults.sh rename to jdk/make/gensrc/Gensrc-jdk.charsets.gmk index a8cd1ad1681..066d4851056 100644 --- a/jdk/test/sun/tools/jps/jps-Defaults.sh +++ b/jdk/make/gensrc/Gensrc-jdk.charsets.gmk @@ -1,10 +1,12 @@ # -# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. # # This code is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -21,16 +23,12 @@ # questions. # -# @test -# @bug 4990825 -# @run shell jps-Defaults.sh -# @summary Test that output of 'jps' matches a specific pattern +include GensrcCommon.gmk -. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh +include GensrcCharsetMapping.gmk -setup -verify_os +jdk.charsets: $(GENSRC_JDK_CHARSETS) -JPS="${TESTJAVA}/bin/jps" +all: jdk.charsets -${JPS} -J-XX:+UsePerfData 2>&1 | awk -f ${TESTSRC}/jps_Output1.awk +.PHONY: all jdk.charsets diff --git a/jdk/make/gensrc/Gensrc-jdk.jconsole.gmk b/jdk/make/gensrc/Gensrc-jdk.jconsole.gmk new file mode 100644 index 00000000000..38775c00948 --- /dev/null +++ b/jdk/make/gensrc/Gensrc-jdk.jconsole.gmk @@ -0,0 +1,45 @@ +# +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include GensrcCommon.gmk + +########################################################################################## +# Version file for jconsole + +$(JDK_OUTPUTDIR)/gensrc/jdk.jconsole/sun/tools/jconsole/Version.java: \ + $(JDK_TOPDIR)/src/jdk.jconsole/share/classes/sun/tools/jconsole/Version.java.template + $(MKDIR) -p $(@D) + $(RM) $@ $@.tmp + $(ECHO) $(LOG_INFO) Generating sun/tools/jconsole/Version.java + $(SED) -e 's/@@jconsole_version@@/$(FULL_VERSION)/g' $< > $@.tmp + $(MV) $@.tmp $@ + +GENSRC_JDK_JCONSOLE += $(JDK_OUTPUTDIR)/gensrc/jdk.jconsole/sun/tools/jconsole/Version.java + +jdk.jconsole: $(GENSRC_JDK_JCONSOLE) + +all: jdk.jconsole + +.PHONY: all jdk.jconsole diff --git a/jdk/test/sun/tools/jps/jps-l_2.sh b/jdk/make/gensrc/Gensrc-jdk.jdi.gmk similarity index 69% rename from jdk/test/sun/tools/jps/jps-l_2.sh rename to jdk/make/gensrc/Gensrc-jdk.jdi.gmk index 95784dbfcc1..16d61d317eb 100644 --- a/jdk/test/sun/tools/jps/jps-l_2.sh +++ b/jdk/make/gensrc/Gensrc-jdk.jdi.gmk @@ -1,10 +1,12 @@ # -# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. # # This code is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -21,16 +23,13 @@ # questions. # -# @test -# @bug 4990825 -# @run shell jps-l_2.sh -# @summary Test that output of 'jps -l' shows the long class name +include GensrcCommon.gmk -. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh +include GensrcJDWP.gmk +include GensrcProviders.gmk -setup -verify_os +jdk.jdi: $(GENSRC_JDK_JDI) -JPS="${TESTJAVA}/bin/jps" +all: jdk.jdi -${JPS} -J-XX:+UsePerfData -l | awk -f ${TESTSRC}/jps-l_Output2.awk +.PHONY: all jdk.jdi diff --git a/jdk/make/gensrc/GensrcBuffer.gmk b/jdk/make/gensrc/GensrcBuffer.gmk index 60335442ac5..bc23520fac2 100644 --- a/jdk/make/gensrc/GensrcBuffer.gmk +++ b/jdk/make/gensrc/GensrcBuffer.gmk @@ -26,9 +26,9 @@ GENSRC_BUFFER := GENSRC_BUFFER_TMP := $(JDK_OUTPUTDIR)/gensrc -GENSRC_BUFFER_DST := $(JDK_OUTPUTDIR)/gensrc/java/nio +GENSRC_BUFFER_DST := $(JDK_OUTPUTDIR)/gensrc/java.base/java/nio -GENSRC_BUFFER_SRC := $(JDK_TOPDIR)/src/share/classes/java/nio +GENSRC_BUFFER_SRC := $(JDK_TOPDIR)/src/java.base/share/classes/java/nio ### @@ -377,4 +377,5 @@ $(eval $(call SetupGenBuffer,ByteBufferAsDoubleBufferRL,$(BYTE_X_BUF), type:=dou ### -$(GENSRC_BUFFER): $(BUILD_TOOLS) +$(GENSRC_BUFFER): $(BUILD_TOOLS_JDK) +GENSRC_JAVA_BASE += $(GENSRC_BUFFER) diff --git a/jdk/make/gensrc/GensrcCLDR.gmk b/jdk/make/gensrc/GensrcCLDR.gmk index b3d197c09c5..ed6f7f75c2a 100644 --- a/jdk/make/gensrc/GensrcCLDR.gmk +++ b/jdk/make/gensrc/GensrcCLDR.gmk @@ -24,16 +24,29 @@ # CLDRVERSION := 21.0.1 -CLDRSRCDIR := $(JDK_TOPDIR)/src/share/classes/sun/util/cldr/resources/$(subst .,_,$(CLDRVERSION)) +CLDRSRCDIR := $(JDK_TOPDIR)/src/jdk.localedata/share/classes/sun/util/cldr/resources/$(subst .,_,$(CLDRVERSION)) -GENSRC_DIR := $(JDK_OUTPUTDIR)/gensrc +GENSRC_DIR := $(JDK_OUTPUTDIR)/gensrc/jdk.localedata +BASE_GENSRC_DIR := $(JDK_OUTPUTDIR)/gensrc/java.base -CLDR_METAINFO_FILE := $(GENSRC_DIR)/sun/util/cldr/CLDRLocaleDataMetaInfo.java +CLDR_METAINFO_FILE := $(BASE_GENSRC_DIR)/sun/util/cldr/CLDRLocaleDataMetaInfo.java $(CLDR_METAINFO_FILE): $(wildcard $(CLDRSRCDIR)/common/dtd/*.dtd) \ $(wildcard $(CLDRSRCDIR)/common/main/*.xml) \ - $(wildcard $(CLDRSRCDIR)/common/supplemental/*.xml) - $(MKDIR) -p $(@D) + $(wildcard $(CLDRSRCDIR)/common/supplemental/*.xml) \ + $(BUILD_TOOLS_JDK) + $(MKDIR) -p $(GENSRC_DIR) $(TOOL_CLDRCONVERTER) -base $(CLDRSRCDIR) -o $(GENSRC_DIR) + $(MKDIR) -p $(BASE_GENSRC_DIR)/sun/text/resources/cldr + $(MKDIR) -p $(BASE_GENSRC_DIR)/sun/util/resources/cldr + $(RM) -r $(BASE_GENSRC_DIR)/sun/text/resources/cldr/en \ + $(BASE_GENSRC_DIR)/sun/util/resources/cldr/en + $(MV) $(GENSRC_DIR)/sun/text/resources/cldr/en $(BASE_GENSRC_DIR)/sun/text/resources/cldr/en + $(MV) $(GENSRC_DIR)/sun/util/resources/cldr/en $(BASE_GENSRC_DIR)/sun/util/resources/cldr/en + $(MV) $(GENSRC_DIR)/sun/text/resources/cldr/*.java $(BASE_GENSRC_DIR)/sun/text/resources/cldr + $(MV) $(GENSRC_DIR)/sun/util/resources/cldr/*.java $(BASE_GENSRC_DIR)/sun/util/resources/cldr + $(MKDIR) -p $(@D) + $(MV) $(GENSRC_DIR)/sun/util/cldr/CLDRLocaleDataMetaInfo.java $@ GENSRC_CLDR := $(CLDR_METAINFO_FILE) +GENSRC_JAVA_BASE += $(GENSRC_CLDR) diff --git a/jdk/make/gensrc/GensrcCharacterData.gmk b/jdk/make/gensrc/GensrcCharacterData.gmk index d4d6e57341d..1f57bff7bf6 100644 --- a/jdk/make/gensrc/GensrcCharacterData.gmk +++ b/jdk/make/gensrc/GensrcCharacterData.gmk @@ -33,7 +33,7 @@ CHARACTERDATA = $(JDK_TOPDIR)/make/data/characterdata UNICODEDATA = $(JDK_TOPDIR)/make/data/unicodedata define SetupCharacterData - $(JDK_OUTPUTDIR)/gensrc/java/lang/$1.java: $(CHARACTERDATA)/$1.java.template $(BUILD_TOOLS) + $(JDK_OUTPUTDIR)/gensrc/java.base/java/lang/$1.java: $(CHARACTERDATA)/$1.java.template $(BUILD_TOOLS_JDK) $(MKDIR) -p $$(@D) $(ECHO) $(LOG_INFO) Generating $1.java $(TOOL_GENERATECHARACTER) $2 \ @@ -41,10 +41,10 @@ define SetupCharacterData -spec $(UNICODEDATA)/UnicodeData.txt \ -specialcasing $(UNICODEDATA)/SpecialCasing.txt \ -proplist $(UNICODEDATA)/PropList.txt \ - -o $(JDK_OUTPUTDIR)/gensrc/java/lang/$1.java -string \ + -o $(JDK_OUTPUTDIR)/gensrc/java.base/java/lang/$1.java -string \ -usecharforbyte $3 - GENSRC_CHARACTERDATA += $(JDK_OUTPUTDIR)/gensrc/java/lang/$1.java + GENSRC_CHARACTERDATA += $(JDK_OUTPUTDIR)/gensrc/java.base/java/lang/$1.java endef $(eval $(call SetupCharacterData,CharacterDataLatin1, , -latin1 8)) @@ -54,11 +54,12 @@ $(eval $(call SetupCharacterData,CharacterData02, -plane 2, 11 4 1)) $(eval $(call SetupCharacterData,CharacterData0E, -plane 14, 11 4 1)) # Copy two Java files that need no preprocessing. -$(JDK_OUTPUTDIR)/gensrc/java/lang/%.java: $(CHARACTERDATA)/%.java.template +$(JDK_OUTPUTDIR)/gensrc/java.base/java/lang/%.java: $(CHARACTERDATA)/%.java.template $(ECHO) $(LOG_INFO) Generating $(@F) $(call install-file) -GENSRC_CHARACTERDATA += $(JDK_OUTPUTDIR)/gensrc/java/lang/CharacterDataUndefined.java \ - $(JDK_OUTPUTDIR)/gensrc/java/lang/CharacterDataPrivateUse.java +GENSRC_CHARACTERDATA += $(JDK_OUTPUTDIR)/gensrc/java.base/java/lang/CharacterDataUndefined.java \ + $(JDK_OUTPUTDIR)/gensrc/java.base/java/lang/CharacterDataPrivateUse.java +GENSRC_JAVA_BASE += $(GENSRC_CHARACTERDATA) -$(GENSRC_CHARACTERDATA): $(BUILD_TOOLS) +$(GENSRC_CHARACTERDATA): $(BUILD_TOOLS_JDK) diff --git a/jdk/make/gensrc/GensrcCharsetCoder.gmk b/jdk/make/gensrc/GensrcCharsetCoder.gmk index ac12967ee63..b5444138b6f 100644 --- a/jdk/make/gensrc/GensrcCharsetCoder.gmk +++ b/jdk/make/gensrc/GensrcCharsetCoder.gmk @@ -26,9 +26,9 @@ GENSRC_CHARSETCODER := GENSRC_CHARSETCODER_TMP := $(JDK_OUTPUTDIR)/gensrc -GENSRC_CHARSETCODER_DST := $(JDK_OUTPUTDIR)/gensrc/java/nio/charset +GENSRC_CHARSETCODER_DST := $(JDK_OUTPUTDIR)/gensrc/java.base/java/nio/charset -GENSRC_CHARSETCODER_SRC := $(JDK_TOPDIR)/src/share/classes/java/nio +GENSRC_CHARSETCODER_SRC := $(JDK_TOPDIR)/src/java.base/share/classes/java/nio GENSRC_CHARSETCODER_TEMPLATE := $(GENSRC_CHARSETCODER_SRC)/charset/Charset-X-Coder.java.template @@ -101,7 +101,8 @@ $(GENSRC_CHARSETCODER_DST)/CharsetEncoder.java: $(GENSRC_CHARSETCODER_TEMPLATE) $(MV) $@.tmp $@ GENSRC_CHARSETCODER += $(GENSRC_CHARSETCODER_DST)/CharsetEncoder.java +GENSRC_JAVA_BASE += $(GENSRC_CHARSETCODER) ### -$(GENSRC_CHARSETCODER): $(BUILD_TOOLS) +$(GENSRC_CHARSETCODER): $(BUILD_TOOLS_JDK) diff --git a/jdk/make/gensrc/GensrcCharsetMapping.gmk b/jdk/make/gensrc/GensrcCharsetMapping.gmk index 821f4e03071..51f83c2701b 100644 --- a/jdk/make/gensrc/GensrcCharsetMapping.gmk +++ b/jdk/make/gensrc/GensrcCharsetMapping.gmk @@ -31,54 +31,57 @@ CHARSET_DATA_DIR := $(JDK_TOPDIR)/make/data/charsetmapping ### Generate files using the charsetmapping tool ### -CHARSET_GENSRC_JAVA_DIR := $(JDK_OUTPUTDIR)/gensrc/sun/nio/cs -CHARSET_DONE := $(CHARSET_GENSRC_JAVA_DIR)/_the.charsetmapping +CHARSET_GENSRC_JAVA_DIR_CS := $(JDK_OUTPUTDIR)/gensrc/jdk.charsets/sun/nio/cs/ext +CHARSET_GENSRC_JAVA_DIR_BASE := $(JDK_OUTPUTDIR)/gensrc/java.base/sun/nio/cs +CHARSET_DONE_CS := $(CHARSET_GENSRC_JAVA_DIR_CS)/_the.charsetmapping +CHARSET_DONE_BASE := $(CHARSET_GENSRC_JAVA_DIR_BASE)/_the.charsetmapping CHARSET_COPYRIGHT_HEADER_BASE := $(JDK_TOPDIR)/make/src/classes/build/tools/charsetmapping CHARSET_TEMPLATES := \ $(CHARSET_DATA_DIR)/SingleByte-X.java.template \ $(CHARSET_DATA_DIR)/DoubleByte-X.java.template # This target should be referenced using the order-only operator (|) -$(CHARSET_GENSRC_JAVA_DIR)/ext: +$(CHARSET_GENSRC_JAVA_DIR_CS): $(ECHO) "Generating charset mappings" - $(MKDIR) -p $(CHARSET_GENSRC_JAVA_DIR)/ext + $(MKDIR) -p $(CHARSET_GENSRC_JAVA_DIR_CS) + $(MKDIR) -p $(CHARSET_GENSRC_JAVA_DIR_BASE) -$(CHARSET_DONE)-sbcs: $(CHARSET_DATA_DIR)/sbcs \ - $(CHARSET_TEMPLATES) $(BUILD_TOOLS) | $(CHARSET_GENSRC_JAVA_DIR)/ext - $(TOOL_CHARSETMAPPING) $(CHARSET_DATA_DIR) $(CHARSET_GENSRC_JAVA_DIR) sbcs +$(CHARSET_DONE_BASE)-sbcs: $(CHARSET_DATA_DIR)/sbcs \ + $(CHARSET_TEMPLATES) $(BUILD_TOOLS_JDK) | $(CHARSET_GENSRC_JAVA_DIR_CS) + $(TOOL_CHARSETMAPPING) $(CHARSET_DATA_DIR) $(CHARSET_GENSRC_JAVA_DIR_BASE) sbcs $(TOUCH) '$@' -$(CHARSET_DONE)-extsbcs: $(CHARSET_DATA_DIR)/extsbcs \ - $(CHARSET_DONE)-sbcs $(CHARSET_TEMPLATES) $(BUILD_TOOLS) - $(TOOL_CHARSETMAPPING) $(CHARSET_DATA_DIR) $(CHARSET_GENSRC_JAVA_DIR)/ext extsbcs +$(CHARSET_DONE_CS)-extsbcs: $(CHARSET_DATA_DIR)/extsbcs \ + $(CHARSET_DONE_BASE)-sbcs $(CHARSET_TEMPLATES) $(BUILD_TOOLS_JDK) + $(TOOL_CHARSETMAPPING) $(CHARSET_DATA_DIR) $(CHARSET_GENSRC_JAVA_DIR_CS) extsbcs $(TOUCH) '$@' -$(CHARSET_DONE)-dbcs: $(CHARSET_DATA_DIR)/dbcs \ - $(CHARSET_DONE)-sbcs $(CHARSET_TEMPLATES) $(BUILD_TOOLS) - $(TOOL_CHARSETMAPPING) $(CHARSET_DATA_DIR) $(CHARSET_GENSRC_JAVA_DIR)/ext dbcs +$(CHARSET_DONE_CS)-dbcs: $(CHARSET_DATA_DIR)/dbcs \ + $(CHARSET_DONE_BASE)-sbcs $(CHARSET_TEMPLATES) $(BUILD_TOOLS_JDK) + $(TOOL_CHARSETMAPPING) $(CHARSET_DATA_DIR) $(CHARSET_GENSRC_JAVA_DIR_CS) dbcs $(TOUCH) '$@' -$(CHARSET_DONE)-hkscs: $(CHARSET_COPYRIGHT_HEADER_BASE)/HKSCS.java \ - $(CHARSET_DONE)-sbcs $(BUILD_TOOLS) - $(TOOL_CHARSETMAPPING) $(CHARSET_DATA_DIR) $(CHARSET_GENSRC_JAVA_DIR)/ext hkscs '$<' +$(CHARSET_DONE_CS)-hkscs: $(CHARSET_COPYRIGHT_HEADER_BASE)/HKSCS.java \ + $(CHARSET_DONE_BASE)-sbcs $(BUILD_TOOLS_JDK) + $(TOOL_CHARSETMAPPING) $(CHARSET_DATA_DIR) $(CHARSET_GENSRC_JAVA_DIR_CS) hkscs '$<' $(TOUCH) '$@' -$(CHARSET_DONE)-euctw: $(CHARSET_COPYRIGHT_HEADER_BASE)/EUC_TW.java \ - $(CHARSET_DONE)-sbcs $(BUILD_TOOLS) - $(TOOL_CHARSETMAPPING) $(CHARSET_DATA_DIR) $(CHARSET_GENSRC_JAVA_DIR)/ext euctw '$<' +$(CHARSET_DONE_CS)-euctw: $(CHARSET_COPYRIGHT_HEADER_BASE)/EUC_TW.java \ + $(CHARSET_DONE_BASE)-sbcs $(BUILD_TOOLS_JDK) + $(TOOL_CHARSETMAPPING) $(CHARSET_DATA_DIR) $(CHARSET_GENSRC_JAVA_DIR_CS) euctw '$<' $(TOUCH) '$@' -$(CHARSET_GENSRC_JAVA_DIR)/ext/sjis0213.dat: $(CHARSET_DATA_DIR)/sjis0213.map \ - $(CHARSET_DONE)-sbcs $(BUILD_TOOLS) +$(CHARSET_GENSRC_JAVA_DIR_CS)/sjis0213.dat: $(CHARSET_DATA_DIR)/sjis0213.map \ + $(CHARSET_DONE_BASE)-sbcs $(BUILD_TOOLS_JDK) $(TOOL_CHARSETMAPPING) '$<' '$@' sjis0213 -GENSRC_CHARSETMAPPING += \ - $(CHARSET_DONE)-sbcs \ - $(CHARSET_DONE)-extsbcs \ - $(CHARSET_DONE)-dbcs \ - $(CHARSET_DONE)-hkscs \ - $(CHARSET_DONE)-euctw \ - $(CHARSET_GENSRC_JAVA_DIR)/ext/sjis0213.dat \ +GENSRC_JAVA_BASE += $(CHARSET_DONE_BASE)-sbcs +GENSRC_JDK_CHARSETS += \ + $(CHARSET_DONE_CS)-extsbcs \ + $(CHARSET_DONE_CS)-dbcs \ + $(CHARSET_DONE_CS)-hkscs \ + $(CHARSET_DONE_CS)-euctw \ + $(CHARSET_GENSRC_JAVA_DIR_CS)/sjis0213.dat \ # ### @@ -144,20 +147,20 @@ $(CHARSET_STANDARD_GENSRC_DIR)/classes-map: $(CHARSET_STANDARD_DATA) \ $(NAWK) < '$<' > '$@' $(CHARSET_CLASSES_MAP_AWK) $(CHARSET_STANDARD_GENSRC_DIR)/aliases-map.java.snippet: $(CHARSET_STANDARD_GENSRC_DIR)/aliases-map \ - $(BUILD_TOOLS) | $(CHARSET_STANDARD_GENSRC_DIR) + $(BUILD_TOOLS_JDK) | $(CHARSET_STANDARD_GENSRC_DIR) $(TOOL_HASHER) -i Aliases < '$<' > '$@' $(CHARSET_STANDARD_GENSRC_DIR)/classes-map.java.snippet: $(CHARSET_STANDARD_GENSRC_DIR)/classes-map \ - $(BUILD_TOOLS) | $(CHARSET_STANDARD_GENSRC_DIR) + $(BUILD_TOOLS_JDK) | $(CHARSET_STANDARD_GENSRC_DIR) $(TOOL_HASHER) -i Classes < '$<' > '$@' $(CHARSET_STANDARD_GENSRC_DIR)/cache-map.java.snippet: $(CHARSET_STANDARD_GENSRC_DIR)/classes-map \ - $(BUILD_TOOLS) | $(CHARSET_STANDARD_GENSRC_DIR) + $(BUILD_TOOLS_JDK) | $(CHARSET_STANDARD_GENSRC_DIR) $(TOOL_HASHER) -i -e Cache -t Charset < '$<' > '$@' $(eval $(call SetupTextFileProcessing, BUILD_CHARSET_STANDARD, \ - SOURCE_FILES := $(JDK_TOPDIR)/src/share/classes/$(CHARSET_STANDARD_JAVA).template, \ - OUTPUT_FILE := $(JDK_OUTPUTDIR)/gensrc/$(CHARSET_STANDARD_JAVA), \ + SOURCE_FILES := $(JDK_TOPDIR)/src/java.base/share/classes/$(CHARSET_STANDARD_JAVA).template, \ + OUTPUT_FILE := $(JDK_OUTPUTDIR)/gensrc/java.base/$(CHARSET_STANDARD_JAVA), \ INCLUDES := \ _INCLUDE_ALIASES_TABLES_ => $(CHARSET_STANDARD_GENSRC_DIR)/aliases-tables.java.snippet ; \ _INCLUDE_ALIASES_MAP_ => $(CHARSET_STANDARD_GENSRC_DIR)/aliases-map.java.snippet ; \ @@ -172,4 +175,4 @@ $(BUILD_CHARSET_STANDARD): \ $(CHARSET_STANDARD_GENSRC_DIR)/classes-map.java.snippet \ $(CHARSET_STANDARD_GENSRC_DIR)/cache-map.java.snippet -GENSRC_CHARSETMAPPING += $(BUILD_CHARSET_STANDARD) +GENSRC_JAVA_BASE += $(BUILD_CHARSET_STANDARD) diff --git a/jdk/make/gensrc/GensrcCommon.gmk b/jdk/make/gensrc/GensrcCommon.gmk new file mode 100644 index 00000000000..3c271c81d77 --- /dev/null +++ b/jdk/make/gensrc/GensrcCommon.gmk @@ -0,0 +1,38 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +default: all + +include $(SPEC) +include MakeBase.gmk +include JavaCompilation.gmk +include NativeCompilation.gmk +include TextFileProcessing.gmk + +# Setup the java compilers for the JDK build. +include SetupJava.gmk +# We need the tools. +include Tools.gmk + diff --git a/jdk/make/gensrc/GensrcExceptions.gmk b/jdk/make/gensrc/GensrcExceptions.gmk index e3164f5b71a..e180bdc4eb3 100644 --- a/jdk/make/gensrc/GensrcExceptions.gmk +++ b/jdk/make/gensrc/GensrcExceptions.gmk @@ -26,9 +26,9 @@ GENSRC_EXCEPTIONS := GENSRC_EXCEPTIONS_TMP := $(JDK_OUTPUTDIR)/gensrc -GENSRC_EXCEPTIONS_DST := $(JDK_OUTPUTDIR)/gensrc/java/nio +GENSRC_EXCEPTIONS_DST := $(JDK_OUTPUTDIR)/gensrc/java.base/java/nio -GENSRC_EXCEPTIONS_SRC := $(JDK_TOPDIR)/src/share/classes/java/nio +GENSRC_EXCEPTIONS_SRC := $(JDK_TOPDIR)/src/java.base/share/classes/java/nio GENSRC_EXCEPTIONS_CMD := $(JDK_TOPDIR)/make/scripts/genExceptions.sh GENSRC_EXCEPTIONS_SRC_DIRS := . charset channels @@ -51,5 +51,6 @@ $(GENSRC_EXCEPTIONS_DST)/_the.%.marker: $(GENSRC_EXCEPTIONS_SRC)/%/exceptions \ $(TOUCH) $@ GENSRC_EXCEPTIONS += $(foreach D,$(GENSRC_EXCEPTIONS_SRC_DIRS),$(GENSRC_EXCEPTIONS_DST)/_the.$(D).marker) +GENSRC_JAVA_BASE += $(GENSRC_EXCEPTIONS) -$(GENSRC_EXCEPTIONS): $(BUILD_TOOLS) +$(GENSRC_EXCEPTIONS): $(BUILD_TOOLS_JDK) diff --git a/jdk/make/gensrc/GensrcIcons.gmk b/jdk/make/gensrc/GensrcIcons.gmk index 0728a2d8dad..e9b32f8f0b5 100644 --- a/jdk/make/gensrc/GensrcIcons.gmk +++ b/jdk/make/gensrc/GensrcIcons.gmk @@ -26,12 +26,12 @@ GENSRC_AWT_ICONS := GENSRC_AWT_ICONS_SRC := GENSRC_AWT_ICONS_TMP := $(JDK_OUTPUTDIR)/gensrc -GENSRC_AWT_ICONS_DST := $(GENSRC_AWT_ICONS_TMP)/sun/awt/ +GENSRC_AWT_ICONS_DST := $(GENSRC_AWT_ICONS_TMP)/java.desktop/sun/awt/ ifdef OPENJDK - X11_ICONS_PATH_PREFIX := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR) + X11_ICONS_PATH_PREFIX := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR) else - X11_ICONS_PATH_PREFIX := $(JDK_TOPDIR)/src/closed/solaris + X11_ICONS_PATH_PREFIX := $(JDK_TOPDIR)/src/closed/java.desktop/$(OPENJDK_TARGET_OS_API_DIR) endif GENSRC_AWT_ICONS_SRC += \ @@ -41,7 +41,7 @@ GENSRC_AWT_ICONS_SRC += \ $(X11_ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon48.png -AWT_ICONPATH := $(JDK_TOPDIR)/src/share/classes/sun/awt/resources +AWT_ICONPATH := $(JDK_TOPDIR)/src/java.desktop/share/classes/sun/awt/resources GENSRC_AWT_ICONS_SRC += \ $(AWT_ICONPATH)/security-icon-bw16.png \ @@ -80,7 +80,7 @@ define SetupGensrcAWTIcon $1_NAME64 := $(call GENSRC_AWT_ICONS_DST_NAME,$1,64) $1_TARGET64 := $(GENSRC_AWT_ICONS_DST)/$$($1_NAME64).java - $$($1_TARGET32): $2/$1 $(GENSRC_AWT_ICONS_TMP)/_the.icons.dir + $$($1_TARGET32): $2/$1 $(GENSRC_AWT_ICONS_TMP)/_the.icons.dir $(BUILD_TOOLS_JDK) $(RM) $$@ $$@.tmp $(ECHO) "package sun.awt;" > $$@.tmp $(ECHO) "public class $$($1_NAME32) {" >> $$@.tmp @@ -91,7 +91,7 @@ define SetupGensrcAWTIcon GENSRC_AWT_ICONS += $$($1_TARGET32) - $$($1_TARGET64): $2/$1 $(GENSRC_AWT_ICONS_TMP)/_the.icons.dir + $$($1_TARGET64): $2/$1 $(GENSRC_AWT_ICONS_TMP)/_the.icons.dir $(BUILD_TOOLS_JDK) $(RM) $$@ $$@.tmp $(ECHO) "package sun.awt;" > $$@.tmp $(ECHO) "public class $$($1_NAME64) {" >> $$@.tmp @@ -105,6 +105,8 @@ endef $(foreach I, $(GENSRC_AWT_ICONS_SRC), $(eval $(call SetupGensrcAWTIcon,$(notdir $(I)),$(dir $(I))))) +GENSRC_JAVA_DESKTOP += $(GENSRC_AWT_ICONS) + ### ifeq ($(OPENJDK_TARGET_OS), macosx) @@ -118,7 +120,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) GENSRC_OSX_ICONS_SRC := $(JDK_TOPDIR)/make/closed/data/macosxicons/JavaApp.icns endif - $(GENSRC_OSX_ICONS): $(GENSRC_OSX_ICONS_SRC) + $(GENSRC_OSX_ICONS): $(GENSRC_OSX_ICONS_SRC) $(BUILD_TOOLS_JDK) $(RM) $@ $@.tmp $(MKDIR) -p $(dir $@) $(ECHO) "static unsigned char sAWTIconData[] = { " >> $@.tmp @@ -126,4 +128,5 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) $(ECHO) "};" >> $@.tmp $(MV) $@.tmp $@ + GENSRC_JAVA_DESKTOP += $(GENSRC_OSX_ICONS) endif diff --git a/jdk/make/gensrc/GensrcJDWP.gmk b/jdk/make/gensrc/GensrcJDWP.gmk index 973602f0632..6085c62d810 100644 --- a/jdk/make/gensrc/GensrcJDWP.gmk +++ b/jdk/make/gensrc/GensrcJDWP.gmk @@ -30,19 +30,22 @@ JDWP_SPEC_FILE := $(JDK_TOPDIR)/make/data/jdwp/jdwp.spec $(JDK_OUTPUTDIR)/gensrc_jdwp_headers/JDWPCommands.h: $(JDWP_SPEC_FILE) -$(JDK_OUTPUTDIR)/gensrc/com/sun/tools/jdi/JDWP.java: $(JDWP_SPEC_FILE) +$(JDK_OUTPUTDIR)/gensrc/jdk.jdi/com/sun/tools/jdi/JDWP.java: \ + $(JDWP_SPEC_FILE) $(BUILD_TOOLS_JDK) $(MKDIR) -p $(@D) $(MKDIR) -p $(JDK_OUTPUTDIR)/gensrc_jdwp_headers $(RM) $@ $(JDK_OUTPUTDIR)/gensrc_jdwp_headers/JDWPCommands.h $(ECHO) $(LOG_INFO) Creating JDWP.java and JDWPCommands.h from jdwp.spec $(TOOL_JDWPGEN) $< -jdi $@ -include $(JDK_OUTPUTDIR)/gensrc_jdwp_headers/JDWPCommands.h -$(JDK_OUTPUTDIR)/gensrc_jdwp_doc/jdwp-protocol.html: $(JDWP_SPEC_FILE) +$(JDK_OUTPUTDIR)/gensrc_jdwp_doc/jdwp-protocol.html: $(JDWP_SPEC_FILE) \ + $(BUILD_TOOLS_JDK) $(MKDIR) -p $(@D) $(RM) $@ $(ECHO) $(LOG_INFO) Creating $(@F) from jdwp.spec $(TOOL_JDWPGEN) $< -doc $@ -GENSRC_JDWP := $(JDK_OUTPUTDIR)/gensrc/com/sun/tools/jdi/JDWP.java \ +GENSRC_JDWP := $(JDK_OUTPUTDIR)/gensrc/jdk.jdi/com/sun/tools/jdi/JDWP.java \ $(JDK_OUTPUTDIR)/gensrc_jdwp_headers/JDWPCommands.h \ $(JDK_OUTPUTDIR)/gensrc_jdwp_doc/jdwp-protocol.html +GENSRC_JDK_JDI += $(GENSRC_JDWP) diff --git a/jdk/make/gensrc/GensrcLocaleDataMetaInfo.gmk b/jdk/make/gensrc/GensrcLocaleDataMetaInfo.gmk index cb0ff6fc661..12b80d7fcbe 100644 --- a/jdk/make/gensrc/GensrcLocaleDataMetaInfo.gmk +++ b/jdk/make/gensrc/GensrcLocaleDataMetaInfo.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -24,17 +24,18 @@ # # Scan for all locale resources and extract for which locales there exists -# resources. Then put this meta information about exiting (supported?) locales +# resources. Then put this meta information about existing (supported?) locales # into LocaleDataMetaInfo.java # First go look for all locale files -LOCALE_FILES := $(shell $(FIND) $(JDK_TOPDIR)/src/share/classes \ +LOCALE_FILES := $(shell $(FIND) $(JDK_TOPDIR)/src/*/share/classes \ -name "FormatData_*.java" -o -name "FormatData_*.properties" -o \ -name "CollationData_*.java" -o -name "CollationData_*.properties" -o \ -name "TimeZoneNames_*.java" -o -name "TimeZoneNames_*.properties" -o \ -name "LocaleNames_*.java" -o -name "LocaleNames_*.properties" -o \ -name "CurrencyNames_*.java" -o -name "CurrencyNames_*.properties" -o \ - -name "CalendarData_*.java" -o -name "CalendarData_*.properties") + -name "CalendarData_*.java" -o -name "CalendarData_*.properties" -o \ + -name "BreakIteratorInfo_*.java" -o -name "BreakIteratorRules_*.java") # Then translate the locale files into for example: FormatData_sv LOCALE_RESOURCES := $(sort $(subst .properties,,$(subst .java,,$(notdir $(LOCALE_FILES))))) @@ -86,6 +87,12 @@ $(eval $(call CaptureLocale,FormatData)) #sun.text.resources.CollationData $(eval $(call CaptureLocale,CollationData)) +#sun.text.resources.BreakIteratorInfo +$(eval $(call CaptureLocale,BreakIteratorInfo)) + +#sun.text.resources.BreakIteratorRules +$(eval $(call CaptureLocale,BreakIteratorRules)) + #sun.util.resources.TimeZoneNames $(eval $(call CaptureLocale,TimeZoneNames)) @@ -101,27 +108,28 @@ $(eval $(call CaptureLocale,CalendarData)) SED_ARGS += -e 's/$(HASH)AvailableLocales_ENLocales$(HASH)/$(sort $(ALL_EN_LOCALES))/g' SED_ARGS += -e 's/$(HASH)AvailableLocales_NonENLocales$(HASH)/$(sort $(ALL_NON_EN_LOCALES))/g' -$(JDK_OUTPUTDIR)/gensrc/sun/util/locale/provider/LocaleDataMetaInfo.java: \ - $(JDK_TOPDIR)/src/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template +$(JDK_OUTPUTDIR)/gensrc/java.base/sun/util/locale/provider/LocaleDataMetaInfo.java: \ + $(JDK_TOPDIR)/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template $(MKDIR) -p $(@D) $(ECHO) Creating sun/util/LocaleDataMetaInfo.java from $(words $(LOCALE_RESOURCES)) found resources. $(PRINTF) "PREV_LOCALE_RESOURCES:=$(LOCALE_RESOURCES)" > $(JDK_OUTPUTDIR)/gensrc/_the.locale_resources $(SED) $(SED_ARGS) $< > $@ -GENSRC_LOCALEDATAMETAINFO := $(JDK_OUTPUTDIR)/gensrc/sun/util/locale/provider/LocaleDataMetaInfo.java +GENSRC_LOCALEDATAMETAINFO := $(JDK_OUTPUTDIR)/gensrc/java.base/sun/util/locale/provider/LocaleDataMetaInfo.java -### +################################################################################ -GENSRC_CRBC_DST := $(JDK_OUTPUTDIR)/gensrc/sun/util/CoreResourceBundleControl.java +GENSRC_CRBC_DST := $(JDK_OUTPUTDIR)/gensrc/java.base/sun/util/CoreResourceBundleControl.java GENSRC_CRBC_CMD := $(JDK_TOPDIR)/make/scripts/localelist.sh JRE_NONEXIST_LOCALES := en en_US de_DE es_ES fr_FR it_IT ja_JP ko_KR sv_SE zh -$(GENSRC_CRBC_DST): $(JDK_TOPDIR)/src/share/classes/sun/util/CoreResourceBundleControl-XLocales.java.template \ +$(GENSRC_CRBC_DST): $(JDK_TOPDIR)/src/java.base/share/classes/sun/util/CoreResourceBundleControl-XLocales.java.template \ $(GENSRC_CRBC_CMD) $(MKDIR) -p $(@D) NAWK="$(NAWK)" SED="$(SED)" $(SH) $(GENSRC_CRBC_CMD) "$(JRE_NONEXIST_LOCALES)" $< $@ GENSRC_LOCALEDATAMETAINFO += $(GENSRC_CRBC_DST) +GENSRC_JAVA_BASE += $(GENSRC_LOCALEDATAMETAINFO) -### +################################################################################ diff --git a/jdk/make/gensrc/GensrcMisc.gmk b/jdk/make/gensrc/GensrcMisc.gmk index e996f1c9a82..75fa0387c2b 100644 --- a/jdk/make/gensrc/GensrcMisc.gmk +++ b/jdk/make/gensrc/GensrcMisc.gmk @@ -30,9 +30,9 @@ include ProfileNames.gmk # string and the runtime name into the Version.java file. # To be printed by java -version -$(JDK_OUTPUTDIR)/gensrc/sun/misc/Version.java \ +$(JDK_OUTPUTDIR)/gensrc/java.base/sun/misc/Version.java \ $(PROFILE_VERSION_JAVA_TARGETS): \ - $(JDK_TOPDIR)/src/share/classes/sun/misc/Version.java.template + $(JDK_TOPDIR)/src/java.base/share/classes/sun/misc/Version.java.template $(MKDIR) -p $(@D) $(RM) $@ $@.tmp $(ECHO) Generating sun/misc/Version.java $(call profile_version_name, $@) @@ -44,25 +44,12 @@ $(PROFILE_VERSION_JAVA_TARGETS): \ $< > $@.tmp $(MV) $@.tmp $@ -GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/misc/Version.java \ +GENSRC_JAVA_BASE += $(JDK_OUTPUTDIR)/gensrc/java.base/sun/misc/Version.java \ $(PROFILE_VERSION_JAVA_TARGETS) ########################################################################################## -# Version file for jconsole -$(JDK_OUTPUTDIR)/gensrc/sun/tools/jconsole/Version.java: \ - $(JDK_TOPDIR)/src/share/classes/sun/tools/jconsole/Version.java.template - $(MKDIR) -p $(@D) - $(RM) $@ $@.tmp - $(ECHO) $(LOG_INFO) Generating sun/tools/jconsole/Version.java - $(SED) -e 's/@@jconsole_version@@/$(FULL_VERSION)/g' $< > $@.tmp - $(MV) $@.tmp $@ - -GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/tools/jconsole/Version.java - -########################################################################################## - -GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/nio/ch/SocketOptionRegistry.java +GENSRC_JAVA_BASE += $(JDK_OUTPUTDIR)/gensrc/java.base/sun/nio/ch/SocketOptionRegistry.java GENSRC_SOR_SRC := $(JDK_TOPDIR)/make/src/native/genconstants/ch GENSRC_SOR_SRC_FILE := genSocketOptionRegistry.c @@ -81,17 +68,17 @@ $(eval $(call SetupNativeCompilation,BUILD_GENSRC_SOR_EXE, \ OUTPUT_DIR := $(GENSRC_SOR_BIN), \ PROGRAM := genSocketOptionRegistry)) -SOR_PREGEN_FILE := $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/ch/SocketOptionRegistry-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java.template +SOR_PREGEN_FILE := $(JDK_TOPDIR)/src/closed/java.base/$(OPENJDK_TARGET_OS)/classes/sun/nio/ch/SocketOptionRegistry-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java.template ifeq ($(wildcard $(SOR_PREGEN_FILE)), ) - $(JDK_OUTPUTDIR)/gensrc/sun/nio/ch/SocketOptionRegistry.java: $(BUILD_GENSRC_SOR_EXE) + $(JDK_OUTPUTDIR)/gensrc/java.base/sun/nio/ch/SocketOptionRegistry.java: $(BUILD_GENSRC_SOR_EXE) $(MKDIR) -p $(@D) $(RM) $@ $@.tmp NAWK="$(NAWK)" SH="$(SH)" $(SH) -e $(JDK_TOPDIR)/make/scripts/addNotices.sh "$(SOR_COPYRIGHT_YEARS)" > $@.tmp $(BUILD_GENSRC_SOR_EXE) >> $@.tmp $(MV) $@.tmp $@ else - $(JDK_OUTPUTDIR)/gensrc/sun/nio/ch/SocketOptionRegistry.java: $(SOR_PREGEN_FILE) + $(JDK_OUTPUTDIR)/gensrc/java.base/sun/nio/ch/SocketOptionRegistry.java: $(SOR_PREGEN_FILE) $(call install-file) endif @@ -99,7 +86,7 @@ endif ifneq ($(OPENJDK_TARGET_OS), windows) - GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/UnixConstants.java + GENSRC_JAVA_BASE += $(JDK_OUTPUTDIR)/gensrc/java.base/sun/nio/fs/UnixConstants.java GENSRC_UC_SRC := $(JDK_TOPDIR)/make/src/native/genconstants/fs GENSRC_UC_SRC_FILE := genUnixConstants.c @@ -119,17 +106,17 @@ ifneq ($(OPENJDK_TARGET_OS), windows) OUTPUT_DIR := $(GENSRC_UC_BIN), \ PROGRAM := genUnixConstants)) - UC_PREGEN_FILE := $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/fs/UnixConstants-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java.template + UC_PREGEN_FILE := $(JDK_TOPDIR)/src/closed/java.base/$(OPENJDK_TARGET_OS)/classes/sun/nio/fs/UnixConstants-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java.template ifeq ($(wildcard $(UC_PREGEN_FILE)), ) - $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/UnixConstants.java: $(BUILD_GENSRC_UC_EXE) + $(JDK_OUTPUTDIR)/gensrc/java.base/sun/nio/fs/UnixConstants.java: $(BUILD_GENSRC_UC_EXE) $(MKDIR) -p $(@D) $(RM) $@ $@.tmp NAWK="$(NAWK)" SH="$(SH)" $(SH) -e $(JDK_TOPDIR)/make/scripts/addNotices.sh "$(UC_COPYRIGHT_YEARS)" > $@.tmp $(BUILD_GENSRC_UC_EXE) >> $@.tmp $(MV) $@.tmp $@ else - $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/UnixConstants.java: $(UC_PREGEN_FILE) + $(JDK_OUTPUTDIR)/gensrc/java.base/sun/nio/fs/UnixConstants.java: $(UC_PREGEN_FILE) $(call install-file) endif @@ -139,7 +126,7 @@ endif ifeq ($(OPENJDK_TARGET_OS), solaris) - GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/SolarisConstants.java + GENSRC_JAVA_BASE += $(JDK_OUTPUTDIR)/gensrc/java.base/sun/nio/fs/SolarisConstants.java GENSRC_SOL_SRC := $(JDK_TOPDIR)/make/src/native/genconstants/fs GENSRC_SOL_SRC_FILE := genSolarisConstants.c @@ -158,7 +145,7 @@ ifeq ($(OPENJDK_TARGET_OS), solaris) OUTPUT_DIR := $(GENSRC_SOL_BIN), \ PROGRAM := genSolarisConstants)) - $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/SolarisConstants.java: $(BUILD_GENSRC_SOL_EXE) + $(JDK_OUTPUTDIR)/gensrc/java.base/sun/nio/fs/SolarisConstants.java: $(BUILD_GENSRC_SOL_EXE) $(MKDIR) -p $(@D) $(RM) $@ $@.tmp NAWK="$(NAWK)" SH="$(SH)" $(SH) -e $(JDK_TOPDIR)/make/scripts/addNotices.sh "$(SOL_COPYRIGHT_YEARS)" > $@.tmp @@ -169,49 +156,3 @@ ifeq ($(OPENJDK_TARGET_OS), solaris) endif ########################################################################################## - -ifndef OPENJDK - ifeq ($(OPENJDK_TARGET_OS), windows) - - AB_GENSRC_DIR := $(JDK_OUTPUTDIR)/gensrc_ab - AB_SRC_DIR := $(JDK_TOPDIR)/src/closed/windows/classes/com/sun/java/accessibility - - ifeq ($(OPENJDK_TARGET_CPU_BITS), 32) - $(AB_GENSRC_DIR)/32bit/com/sun/java/accessibility/AccessBridgeLoader.java: \ - $(AB_SRC_DIR)/32bit/AccessBridgeLoader.java - $(install-file) - - $(AB_GENSRC_DIR)/32bit/com/sun/java/accessibility/AccessBridge.java: \ - $(AB_SRC_DIR)/AccessBridge.java - $(install-file) - - $(AB_GENSRC_DIR)/legacy/com/sun/java/accessibility/AccessBridgeLoader.java: \ - $(AB_SRC_DIR)/legacy/AccessBridgeLoader.java - $(install-file) - - $(AB_GENSRC_DIR)/legacy/com/sun/java/accessibility/AccessBridge.java: \ - $(AB_SRC_DIR)/AccessBridge.java - $(install-file) - - GENSRC_MISC += $(AB_GENSRC_DIR)/32bit/com/sun/java/accessibility/AccessBridgeLoader.java \ - $(AB_GENSRC_DIR)/legacy/com/sun/java/accessibility/AccessBridgeLoader.java \ - $(AB_GENSRC_DIR)/32bit/com/sun/java/accessibility/AccessBridge.java \ - $(AB_GENSRC_DIR)/legacy/com/sun/java/accessibility/AccessBridge.java - - else - $(AB_GENSRC_DIR)/64bit/com/sun/java/accessibility/AccessBridgeLoader.java: \ - $(AB_SRC_DIR)/64bit/AccessBridgeLoader.java - $(install-file) - - $(AB_GENSRC_DIR)/64bit/com/sun/java/accessibility/AccessBridge.java: \ - $(AB_SRC_DIR)/AccessBridge.java - $(install-file) - - GENSRC_MISC += $(AB_GENSRC_DIR)/64bit/com/sun/java/accessibility/AccessBridgeLoader.java \ - $(AB_GENSRC_DIR)/64bit/com/sun/java/accessibility/AccessBridge.java - - endif - endif -endif - -########################################################################################## diff --git a/jdk/make/gensrc/GensrcProperties.gmk b/jdk/make/gensrc/GensrcProperties.gmk index a4a5bb573f6..c387d52ffe2 100644 --- a/jdk/make/gensrc/GensrcProperties.gmk +++ b/jdk/make/gensrc/GensrcProperties.gmk @@ -24,9 +24,7 @@ # # Prepare the find cache. -$(eval $(call FillCacheFind, $(JDK_TOPDIR)/src/share/classes \ - $(JDK_TOPDIR)/src/windows/classes \ - $(JDK_TOPDIR)/src/macosx/classes)) +$(eval $(call FillCacheFind, $(wildcard $(JDK_TOPDIR)/src/*/*/classes))) # All .properties files to be compiled are appended to this variable. ALL_COMPILED_PROPSOURCES := @@ -40,63 +38,65 @@ define add_properties_to_compile # $2 is the files belonging to this group # $3 is the super class for the generated java file. - # Strip away prefix and suffix, - # leaving for example: sun/util/resources/CurrencyNames_sv - $1_PROPPATHS := $$(patsubst $(JDK_TOPDIR)/src/windows/classes/%.properties, %, \ - $$(patsubst $(JDK_TOPDIR)/src/macosx/classes/%.properties, %, \ - $$(patsubst $(JDK_TOPDIR)/src/share/classes/%.properties, %, $2))) + # Convert /jdk/src//share/classes/sun/util/resources/CurrencyNames_sv.properties + # to /jdk/gensrc/ $@ endef -$(JDK_OUTPUTDIR)/gensrc/%_zh_HK.java: $(JDK_TOPDIR)/src/share/classes/%_zh_TW.java +# Some are copies of existing sources +$(JDK_OUTPUTDIR)/gensrc/java.desktop/%_zh_HK.java: \ + $(JDK_TOPDIR)/src/java.desktop/share/classes/%_zh_TW.java $(call convert_tw_to_hk) +$(JDK_OUTPUTDIR)/gensrc/java.base/%_zh_HK.java: \ + $(JDK_TOPDIR)/src/java.base/share/classes/%_zh_TW.java + $(call convert_tw_to_hk) + +# Others are copies of sources generated by this makefile $(JDK_OUTPUTDIR)/gensrc/%_zh_HK.java: $(JDK_OUTPUTDIR)/gensrc/%_zh_TW.java $(call convert_tw_to_hk) -ZH_HK_JAVA := sun/applet/resources/MsgAppletViewer_zh_HK.java \ - sun/misc/resources/Messages_zh_HK.java \ - sun/security/util/AuthResources_zh_HK.java \ - sun/security/util/Resources_zh_HK.java +# The existing sources +ZH_HK_JAVA := java.desktop/sun/applet/resources/MsgAppletViewer_zh_HK.java \ + java.base/sun/misc/resources/Messages_zh_HK.java \ + java.base/sun/security/util/AuthResources_zh_HK.java \ + java.base/sun/security/util/Resources_zh_HK.java ZH_HK_JAVA_FILES := $(addprefix $(JDK_OUTPUTDIR)/gensrc/, $(ZH_HK_JAVA)) \ - $(filter-out $(JDK_OUTPUTDIR)/gensrc/sun/util/resources/zh/%, \ + $(filter-out $(JDK_OUTPUTDIR)/gensrc/jdk.localedata/sun/util/resources/zh/%, \ $(subst _zh_TW,_zh_HK,$(filter %_zh_TW.java, $(ALL_COMPILED_PROPJAVAS)))) ################################################################################ diff --git a/jdk/make/gensrc/GensrcProviders.gmk b/jdk/make/gensrc/GensrcProviders.gmk new file mode 100644 index 00000000000..985f032169e --- /dev/null +++ b/jdk/make/gensrc/GensrcProviders.gmk @@ -0,0 +1,51 @@ +# +# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +################################################################################ + +define process-provider + $(MKDIR) -p $(@D) + $(CAT) $^ | $(SED) -e "s/^#\[$(OPENJDK_TARGET_OS)\]//" > $@ +endef + +################################################################################ + +# Filter com.sun.tools.attach.spi.AttachProvider +$(JDK_OUTPUTDIR)/gensrc/jdk.attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider: \ + $(JDK_TOPDIR)/src/jdk.attach/share/classes/META-INF/services/com.sun.tools.attach.spi.AttachProvider + $(process-provider) + +GENSRC_JDK_ATTACH += $(JDK_OUTPUTDIR)/gensrc/jdk.attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider + +################################################################################ + +# Filter com.sun.jdi.connect.Connector +$(JDK_OUTPUTDIR)/gensrc/jdk.jdi/META-INF/services/com.sun.jdi.connect.Connector: \ + $(JDK_TOPDIR)/src/jdk.jdi/share/classes/META-INF/services/com.sun.jdi.connect.Connector + $(process-provider) + +GENSRC_JDK_JDI += $(JDK_OUTPUTDIR)/gensrc/jdk.jdi/META-INF/services/com.sun.jdi.connect.Connector + +################################################################################ diff --git a/jdk/make/gensrc/GensrcSwing.gmk b/jdk/make/gensrc/GensrcSwing.gmk index ba73623ca04..12e2445bb32 100644 --- a/jdk/make/gensrc/GensrcSwing.gmk +++ b/jdk/make/gensrc/GensrcSwing.gmk @@ -27,14 +27,14 @@ # Generate java files for javax.swing.plaf package # NIMBUS_PACKAGE = javax.swing.plaf -NIMBUS_GENSRC_DIR = $(JDK_OUTPUTDIR)/gensrc/javax/swing/plaf/nimbus -NIMBUS_SKIN_FILE = $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/nimbus/skin.laf +NIMBUS_GENSRC_DIR = $(JDK_OUTPUTDIR)/gensrc/java.desktop/javax/swing/plaf/nimbus +NIMBUS_SKIN_FILE = $(JDK_TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus/skin.laf -$(JDK_OUTPUTDIR)/gensrc/_the.generated_nimbus: $(NIMBUS_SKIN_FILE) $(BUILD_TOOLS) +$(JDK_OUTPUTDIR)/gensrc/_the.generated_nimbus: $(NIMBUS_SKIN_FILE) $(BUILD_TOOLS_JDK) $(MKDIR) -p $(@D) $(ECHO) "Generating Nimbus source files" $(TOOL_GENERATENIMBUS) $(LOG_INFO) \ - -skinFile $(NIMBUS_SKIN_FILE) -buildDir $(JDK_OUTPUTDIR)/gensrc \ + -skinFile $(NIMBUS_SKIN_FILE) -buildDir $(JDK_OUTPUTDIR)/gensrc/java.desktop \ -packagePrefix $(NIMBUS_PACKAGE).nimbus -lafName Nimbus $(ECHO) $(LOG_INFO) "Finished generating Nimbus source files" $(TOUCH) $@ @@ -62,8 +62,8 @@ BEANS = AbstractButton Box JComponent JApplet JButton \ # javax.swing.text package BEANS_TEXT = JTextComponent -BEANS_SRC = $(BEANS:%=$(JDK_TOPDIR)/src/share/classes/javax/swing/%.java) \ - $(BEANS_TEXT:%=$(JDK_TOPDIR)/src/share/classes/javax/swing/text/%.java) +BEANS_SRC = $(BEANS:%=$(JDK_TOPDIR)/src/java.desktop/share/classes/javax/swing/%.java) \ + $(BEANS_TEXT:%=$(JDK_TOPDIR)/src/java.desktop/share/classes/javax/swing/text/%.java) # Dummy variable so far, in the old build system it was false by default SWINGBEAN_DEBUG_FLAG = false @@ -71,33 +71,40 @@ SWINGBEAN_DEBUG_FLAG = false # LocaleDataMetaInfo needs to be generated before running this to avoid confusing errors # in the build log. $(JDK_OUTPUTDIR)/gensrc_no_srczip/_the.generated_beaninfo: $(BEANS_SRC) \ - $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing/SwingBeanInfoBase.java \ - $(JDK_OUTPUTDIR)/gensrc/sun/swing/BeanInfoUtils.java $(BUILD_TOOLS) \ + $(JDK_OUTPUTDIR)/gensrc_no_srczip/java.desktop/javax/swing/SwingBeanInfoBase.java \ + $(JDK_OUTPUTDIR)/gensrc/java.desktop/sun/swing/BeanInfoUtils.java $(BUILD_TOOLS_JDK) \ | $(GENSRC_LOCALEDATAMETAINFO) $(ECHO) Generating beaninfo - $(MKDIR) -p $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing + $(MKDIR) -p $(JDK_OUTPUTDIR)/gensrc_no_srczip/java.desktop/javax/swing $(JAVA) -Djava.awt.headless=true $(NEW_JAVADOC) \ - -sourcepath "$(JDK_TOPDIR)/src/share/classes$(PATH_SEP)$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes$(PATH_SEP)$(JDK_OUTPUTDIR)/gensrc" \ + -sourcepath "$(subst $(SPACE),$(PATH_SEP),\ + $(if $(SHUFFLED),$(wildcard $(JDK_TOPDIR)/src/*/*/classes) \ + $(JDK_OUTPUTDIR)/gensrc/java.base, \ + $(JDK_TOPDIR)/src/share/classes \ + $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes \ + $(JDK_OUTPUTDIR)/gensrc))" \ -doclet build.tools.swingbeaninfo.GenDocletBeanInfo \ - -x $(SWINGBEAN_DEBUG_FLAG) -d $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing \ + -x $(SWINGBEAN_DEBUG_FLAG) -d $(JDK_OUTPUTDIR)/gensrc_no_srczip/java.desktop/javax/swing \ -t $(DOCLET_DATA_DIR)/SwingBeanInfo.template -docletpath $(JDK_OUTPUTDIR)/btclasses \ -XDignore.symbol.file=true \ -classpath $(JDK_OUTPUTDIR)/btclasses $(BEANS_SRC) $(LOG_INFO) # Move the JTextComponent into its proper package directory. - $(MKDIR) -p $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing/text - $(MV) $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing/JTextComponentBeanInfo.java $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing/text/JTextComponentBeanInfo.java + $(MKDIR) -p $(JDK_OUTPUTDIR)/gensrc_no_srczip/java.desktop/javax/swing/text + $(MV) $(JDK_OUTPUTDIR)/gensrc_no_srczip/java.desktop/javax/swing/JTextComponentBeanInfo.java $(JDK_OUTPUTDIR)/gensrc_no_srczip/java.desktop/javax/swing/text/JTextComponentBeanInfo.java $(TOUCH) $@ # This file is the part of dt.jar # For some reason it is under $(JDK_TOPDIR)/make/data/swingbeaninfo -# Should it be moved under $(JDK_TOPDIR)/src/share/classes/javax/swing instead? -$(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing/SwingBeanInfoBase.java: $(DOCLET_DATA_DIR)/javax/swing/SwingBeanInfoBase.java +# Should it be moved under $(JDK_TOPDIR)/src/java.desktop/share/classes/javax/swing instead? +$(JDK_OUTPUTDIR)/gensrc_no_srczip/java.desktop/javax/swing/SwingBeanInfoBase.java: $(DOCLET_DATA_DIR)/javax/swing/SwingBeanInfoBase.java $(call install-file) # This file is the part of dt.jar # For some reason it is under $(JDK_TOPDIR)/make/data/swingbeaninfo -# Should it be moved under $(JDK_TOPDIR)/src/share/classes/sun/swing instead? -$(JDK_OUTPUTDIR)/gensrc/sun/swing/BeanInfoUtils.java: $(DOCLET_DATA_DIR)/sun/swing/BeanInfoUtils.java +# Should it be moved under $(JDK_TOPDIR)/src/java.desktop/share/classes/sun/swing instead? +$(JDK_OUTPUTDIR)/gensrc/java.desktop/sun/swing/BeanInfoUtils.java: $(DOCLET_DATA_DIR)/sun/swing/BeanInfoUtils.java $(call install-file) GENSRC_SWING_BEANINFO = $(JDK_OUTPUTDIR)/gensrc_no_srczip/_the.generated_beaninfo + +GENSRC_JAVA_DESKTOP += $(GENSRC_SWING_BEANINFO) $(GENSRC_SWING_NIMBUS) diff --git a/jdk/make/gensrc/GensrcX11Wrappers.gmk b/jdk/make/gensrc/GensrcX11Wrappers.gmk index cbe29ef27b1..dd754cd7ac1 100644 --- a/jdk/make/gensrc/GensrcX11Wrappers.gmk +++ b/jdk/make/gensrc/GensrcX11Wrappers.gmk @@ -39,7 +39,7 @@ GENSRC_X11WRAPPERS := # Also put verification offset file here as well. GENSRC_X11WRAPPERS_TMP := $(JDK_OUTPUTDIR)/gensrc_x11wrappers # Put the generated Java classes used to interface X11 from awt here. -GENSRC_X11WRAPPERS_DST := $(JDK_OUTPUTDIR)/gensrc/sun/awt/X11 +GENSRC_X11WRAPPERS_DST := $(JDK_OUTPUTDIR)/gensrc/java.desktop/sun/awt/X11 # The pre-calculated offset file are stored here: GENSRC_SIZER_DIR := $(JDK_TOPDIR)/make/data/x11wrappergen @@ -69,7 +69,7 @@ $(GENSRC_X11WRAPPERS_TMP)/sizes.%: $(GENSRC_SIZER_DIR)/sizes.% # Run the tool on the offset files copied from the source repository to generate several Java classes # used in awt. -$(JDK_OUTPUTDIR)/gensrc/_the.generated.x11: $(GENSRC_X11_SIZES_USED) $(BUILD_TOOLS) +$(JDK_OUTPUTDIR)/gensrc/_the.generated.x11: $(GENSRC_X11_SIZES_USED) $(BUILD_TOOLS_JDK) $(MKDIR) -p $(GENSRC_X11WRAPPERS_DST) $(TOOL_WRAPPERGENERATOR) $(GENSRC_X11WRAPPERS_DST) $(GENSRC_SIZER_DIR)/xlibtypes.txt "gen" $(GENSRC_X11WRAPPERS_TMP)/sizes $(TOUCH) $@ @@ -81,7 +81,7 @@ ifneq ($(COMPILE_TYPE), cross) # can compare it with the version in the source code repository. # Generate the C code for the program that will output the offset file. - $(GENSRC_X11WRAPPERS_TMP)/sizer.%.c: $(GENSRC_SIZER_DIR)/xlibtypes.txt $(BUILD_TOOLS) + $(GENSRC_X11WRAPPERS_TMP)/sizer.%.c: $(GENSRC_SIZER_DIR)/xlibtypes.txt $(BUILD_TOOLS_JDK) $(ECHO) "Generating X11 wrapper ($*-bit version)" $(MKDIR) -p $(@D) $(TOOL_WRAPPERGENERATOR) $(@D) $(GENSRC_SIZER_DIR)/xlibtypes.txt "sizer" $* @@ -91,20 +91,23 @@ ifneq ($(COMPILE_TYPE), cross) MEMORY_MODEL_FLAG="$(COMPILER_TARGET_BITS_FLAG)$*" endif + SIZER_CFLAGS := -I$(JDK_OUTPUTDIR)/include \ + -I$(JDK_TOPDIR)/src/java.base/share/native/include \ + -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_EXPORT_DIR)/native/include \ + -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \ + -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjava \ + -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/awt \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image/cvutils \ + # + # Compile the C code into an executable. $(GENSRC_X11WRAPPERS_TMP)/sizer.%.exe: $(GENSRC_X11WRAPPERS_TMP)/sizer.%.c $(MKDIR) -p $(@D) (cd $(@D) && $(CC) $(MEMORY_MODEL_FLAG) -o $@ $< \ $(X_CFLAGS) \ $(X_LIBS) \ - -I$(JDK_OUTPUTDIR)/include \ - -I$(JDK_TOPDIR)/src/share/javavm/export \ - -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_EXPORT_DIR)/javavm/export \ - -I$(JDK_TOPDIR)/src/share/native/common \ - -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/common \ - -I$(JDK_TOPDIR)/src/solaris/native/sun/awt \ - -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \ - -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils -lc) + $(SIZER_CFLAGS) -lc) .PRECIOUS: $(GENSRC_X11WRAPPERS_TMP)/sizer.%.exe $(GENSRC_X11WRAPPERS_TMP)/sizer.%.c @@ -119,3 +122,5 @@ ifneq ($(COMPILE_TYPE), cross) GENSRC_X11WRAPPERS += $(GENSRC_X11WRAPPERS_TMP)/sizes.$(OPENJDK_TARGET_CPU_BITS).verification endif + +GENSRC_JAVA_DESKTOP += $(GENSRC_X11WRAPPERS) diff --git a/jdk/make/launcher/Launcher-java.base.gmk b/jdk/make/launcher/Launcher-java.base.gmk new file mode 100644 index 00000000000..555c6f25aab --- /dev/null +++ b/jdk/make/launcher/Launcher-java.base.gmk @@ -0,0 +1,167 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LauncherCommon.gmk + +################################################################################ + +# On windows, the debuginfo files get the same name as for java.dll. Build +# into another dir and copy selectively so debuginfo for java.dll isn't +# overwritten. +$(eval $(call SetupLauncher,java, \ + -DEXPAND_CLASSPATH_WILDCARDS,,,user32.lib comctl32.lib, \ + $(JDK_OUTPUTDIR)/objs/jli_static.lib, $(JAVA_RC_FLAGS), \ + $(JAVA_VERSION_INFO_RESOURCE), $(JDK_OUTPUTDIR)/objs/java_objs,true)) + +$(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/java$(EXE_SUFFIX): $(BUILD_LAUNCHER_java) + $(MKDIR) -p $(@D) + $(RM) $@ + $(CP) $(JDK_OUTPUTDIR)/objs/java_objs$(OUTPUT_SUBDIR)/java$(EXE_SUFFIX) $@ + +LAUNCHERS += $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/java$(EXE_SUFFIX) + +ifeq ($(OPENJDK_TARGET_OS), windows) + $(eval $(call SetupLauncher,javaw, \ + -DJAVAW -DEXPAND_CLASSPATH_WILDCARDS,,,user32.lib comctl32.lib, \ + $(JDK_OUTPUTDIR)/objs/jli_static.lib, $(JAVA_RC_FLAGS), \ + $(JAVA_VERSION_INFO_RESOURCE),,true)) +endif + +$(eval $(call SetupLauncher,keytool, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.keytool.Main"$(COMMA) }')) + +################################################################################ + +BUILD_JEXEC := +BUILD_JEXEC_SRC := +BUILD_JEXEC_INC := +BUILD_JEXEC_DST_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR) + +# +# UNHANDLED: +# - COMPILE_APPROACH = normal +# + +# +# jdk/make/java/Makefile +# +ifeq ($(OPENJDK_TARGET_OS), solaris) + ifeq ($(OPENJDK_TARGET_CPU_BITS), 32) + BUILD_JEXEC := 1 + endif +endif + +ifeq ($(OPENJDK_TARGET_OS), linux) + BUILD_JEXEC := 1 +endif # OPENJDK_TARGET_OS + +# +# jdk/make/java/jexec/Makefile +# +ifeq ($(BUILD_JEXEC), 1) + + ifeq ($(OPENJDK_TARGET_OS), windows) + else ifeq ($(OPENJDK_TARGET_OS), macosx) + BUILD_JEXEC_SRC := $(JDK_TOPDIR)/src/java.base/macosx/native/launcher + else + BUILD_JEXEC_SRC := $(JDK_TOPDIR)/src/java.base/unix/native/launcher + endif + + ifeq ($(OPENJDK_TARGET_OS), linux) + BUILD_JEXEC_DST_DIR := $(JDK_OUTPUTDIR)/lib + BUILD_JEXEC_INC += -I$(JDK_TOPDIR)/src/java.base/share/native/libjli + endif +endif + +# +# Note that the two Makefile's seems to contradict each other, +# and that src/macosx/bin/jexec.c seems unused +# +ifneq ($(BUILD_JEXEC_SRC), ) + $(eval $(call SetupNativeCompilation,BUILD_JEXEC, \ + SRC := $(BUILD_JEXEC_SRC), \ + INCLUDE_FILES := jexec.c, \ + LANG := C, \ + OPTIMIZATION := LOW, \ + CFLAGS := $(CFLAGS_JDKEXE) \ + $(BUILD_JEXEC_INC), \ + CFLAGS_linux := -fPIC, \ + CFLAGS_solaris := -KPIC, \ + LDFLAGS := $(LDFLAGS_JDKEXE) \ + $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \ + OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/jexec_obj, \ + OUTPUT_DIR := $(BUILD_JEXEC_DST_DIR), \ + DEBUG_SYMBOLS := true, \ + PROGRAM := jexec)) + + LIBRARIES += $(BUILD_JEXEC) +endif + +################################################################################ + +BUILD_JSPAWNHELPER := +BUILD_JSPAWNHELPER_SRC := $(JDK_TOPDIR)/src/java.base/unix/native/jspawnhelper +JSPAWNHELPER_CFLAGS := -I$(JDK_TOPDIR)/src/java.base/unix/native/libjava +BUILD_JSPAWNHELPER_DST_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR) +LINK_JSPAWNHELPER_OBJECTS := $(JDK_OUTPUTDIR)/objs/libjava/childproc.o +LINK_JSPAWNHELPER_FLAGS := + +ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx solaris aix), ) + BUILD_JSPAWNHELPER := 1 +endif + +ifeq ($(OPENJDK_TARGET_OS), macosx) + BUILD_JSPAWNHELPER_DST_DIR := $(JDK_OUTPUTDIR)/lib +endif + +ifeq ($(OPENJDK_TARGET_CPU_BITS), 64) + LINK_JSPAWNHELPER_FLAGS += $(COMPILER_TARGET_BITS_FLAG)64 +endif + +ifeq ($(BUILD_JSPAWNHELPER), 1) + $(eval $(call SetupNativeCompilation,BUILD_JSPAWNHELPER, \ + SRC := $(BUILD_JSPAWNHELPER_SRC), \ + INCLUDE_FILES := jspawnhelper.c, \ + LANG := C, \ + OPTIMIZATION := LOW, \ + CFLAGS := $(CFLAGS_JDKEXE) $(JSPAWNHELPER_CFLAGS), \ + LDFLAGS := $(LDFLAGS_JDKEXE) $(LINK_JSPAWNHELPER_FLAGS), \ + LDFLAGS_SUFFIX := $(LINK_JSPAWNHELPER_OBJECTS), \ + OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/jspawnhelper, \ + OUTPUT_DIR := $(BUILD_JSPAWNHELPER_DST_DIR), \ + PROGRAM := jspawnhelper)) + + $(BUILD_JSPAWNHELPER): $(LINK_JSPAWNHELPER_OBJECTS) + + LIBRARIES += $(BUILD_JSPAWNHELPER) +endif + +################################################################################ + +java.base: $(LAUNCHERS) $(LIBRARIES) + +all: java.base + +.PHONY: all java.base diff --git a/jdk/make/launcher/Launcher-java.corba.gmk b/jdk/make/launcher/Launcher-java.corba.gmk new file mode 100644 index 00000000000..82b44247e23 --- /dev/null +++ b/jdk/make/launcher/Launcher-java.corba.gmk @@ -0,0 +1,53 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LauncherCommon.gmk + +$(eval $(call SetupLauncher,idlj, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.corba.se.idl.toJavaPortable.Compile"$(COMMA) }')) + +$(eval $(call SetupLauncher,orbd, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \ + "-J-Dcom.sun.CORBA.activation.DbDir=./orb.db"$(COMMA) \ + "-J-Dcom.sun.CORBA.activation.Port=1049"$(COMMA) \ + "-J-Dcom.sun.CORBA.POA.ORBServerId=1"$(COMMA) \ + "com.sun.corba.se.impl.activation.ORBD"$(COMMA) }')) + +$(eval $(call SetupLauncher,servertool, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.corba.se.impl.activation.ServerTool"$(COMMA) }')) + +$(eval $(call SetupLauncher,tnameserv, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \ + "-J-Dcom.sun.CORBA.activation.DbDir=./orb.db"$(COMMA) \ + "-J-Djava.util.logging.LoggingPermission=contol"$(COMMA) \ + "-J-Dcom.sun.CORBA.POA.ORBServerId=1"$(COMMA) \ + "com.sun.corba.se.impl.naming.cosnaming.TransientNameServer"$(COMMA) }')) + + +java.corba: $(LAUNCHERS) + +all: java.corba + +.PHONY: all java.corba diff --git a/jdk/make/launcher/Launcher-java.desktop.gmk b/jdk/make/launcher/Launcher-java.desktop.gmk new file mode 100644 index 00000000000..b7566e35bbe --- /dev/null +++ b/jdk/make/launcher/Launcher-java.desktop.gmk @@ -0,0 +1,41 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LauncherCommon.gmk + +# Hook to include the corresponding custom file, if present. +$(eval $(call IncludeCustomExtension, jdk, launcher/Launcher-java.desktop.gmk)) + +ifndef BUILD_HEADLESS_ONLY + $(eval $(call SetupLauncher,appletviewer, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.applet.Main"$(COMMA) }',, \ + $(XLIBS))) +endif + +java.desktop: $(LAUNCHERS) + +all: java.desktop + +.PHONY: all java.desktop diff --git a/jdk/make/launcher/Launcher-java.rmi.gmk b/jdk/make/launcher/Launcher-java.rmi.gmk new file mode 100644 index 00000000000..9eabcc2da30 --- /dev/null +++ b/jdk/make/launcher/Launcher-java.rmi.gmk @@ -0,0 +1,69 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LauncherCommon.gmk + +$(eval $(call SetupLauncher,rmid, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.rmi.server.Activation"$(COMMA) }')) + +$(eval $(call SetupLauncher,rmiregistry, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.rmi.registry.RegistryImpl"$(COMMA) }')) + +########################################################################################## + +# +# The java-rmi.cgi script in bin/ only gets delivered in certain situations +# +JAVA_RMI_CGI := $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/java-rmi.cgi +ifeq ($(OPENJDK_TARGET_OS), linux) + LAUNCHERS += $(JAVA_RMI_CGI) +endif +ifeq ($(OPENJDK_TARGET_OS), solaris) + LAUNCHERS += $(JAVA_RMI_CGI) +endif + +# TODO: +# On windows java-rmi.cgi shouldn't be bundled since Java 1.2, but has been built all +# this time anyway. Since jdk6, it has been built from the wrong source and resulted +# in a (almost) copy of the standard java launcher named "java-rmi.exe" ending up in +# the final images bin dir. This weird behavior is mimicked here in the converted +# makefiles for now. Should probably just be deleted. +# http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6512052 +ifeq ($(OPENJDK_TARGET_OS), windows) + $(eval $(call SetupLauncher,java-rmi, , \ + $(call SET_SHARED_LIBRARY_MAPFILE,$(JDK_TOPDIR)/make/java/main/java/mapfile-$(OPENJDK_TARGET_CPU)),,,,,,,,,RMI)) +else + $(JAVA_RMI_CGI): $(JDK_TOPDIR)/src/java.rmi/unix/bin/java-rmi.cgi.sh + $(call install-file) + $(CHMOD) a+x $@ +endif + +########################################################################################## + +java.rmi: $(LAUNCHERS) + +all: java.rmi + +.PHONY: all java.rmi diff --git a/jdk/make/launcher/Launcher-java.scripting.gmk b/jdk/make/launcher/Launcher-java.scripting.gmk new file mode 100644 index 00000000000..d43ea36b4e9 --- /dev/null +++ b/jdk/make/launcher/Launcher-java.scripting.gmk @@ -0,0 +1,35 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LauncherCommon.gmk + +$(eval $(call SetupLauncher,jrunscript, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.script.shell.Main"$(COMMA) }')) + +java.scripting: $(LAUNCHERS) + +all: java.scripting + +.PHONY: all java.scripting diff --git a/jaxws/make/Makefile b/jdk/make/launcher/Launcher-java.security.jgss.gmk similarity index 54% rename from jaxws/make/Makefile rename to jdk/make/launcher/Launcher-java.security.jgss.gmk index ce3a3333405..d25035170e1 100644 --- a/jaxws/make/Makefile +++ b/jdk/make/launcher/Launcher-java.security.jgss.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -23,27 +23,21 @@ # questions. # -# Locate this Makefile -ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))), ) - makefile_path := $(CURDIR)/$(lastword $(MAKEFILE_LIST)) -else - makefile_path := $(lastword $(MAKEFILE_LIST)) -endif -repo_dir := $(patsubst %/make/Makefile, %, $(makefile_path)) +include LauncherCommon.gmk -# What is the name of this subsystem (langtools, corba, etc)? -subsystem_name := $(notdir $(repo_dir)) +ifeq ($(OPENJDK_TARGET_OS), windows) + $(eval $(call SetupLauncher,kinit, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.krb5.internal.tools.Kinit"$(COMMA) }')) -# Try to locate top-level makefile -top_level_makefile := $(repo_dir)/../Makefile -ifneq ($(wildcard $(top_level_makefile)), ) - $(info Will run $(subsystem_name) target on top-level Makefile) - $(info WARNING: This is a non-recommended way of building!) - $(info ===================================================) -else - $(info Cannot locate top-level Makefile. Is this repo not checked out as part of a complete forest?) - $(error Build from top-level Makefile instead) + $(eval $(call SetupLauncher,klist, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.krb5.internal.tools.Klist"$(COMMA) }')) + + $(eval $(call SetupLauncher,ktab, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.krb5.internal.tools.Ktab"$(COMMA) }')) endif -all: - @$(MAKE) -f $(top_level_makefile) $(subsystem_name) +java.security.jgss: $(LAUNCHERS) + +all: java.security.jgss + +.PHONY: all java.security.jgss diff --git a/jdk/make/launcher/Launcher-jdk.compiler.gmk b/jdk/make/launcher/Launcher-jdk.compiler.gmk new file mode 100644 index 00000000000..a73616d3a18 --- /dev/null +++ b/jdk/make/launcher/Launcher-jdk.compiler.gmk @@ -0,0 +1,58 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LauncherCommon.gmk + +$(eval $(call SetupLauncher,javac, \ + -DEXPAND_CLASSPATH_WILDCARDS \ + -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javac.Main"$(COMMA) }')) + +ifeq ($(ENABLE_SJAVAC), yes) + $(eval $(call SetupLauncher,sjavac, \ + -DEXPAND_CLASSPATH_WILDCARDS \ + -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.sjavac.Main"$(COMMA) }')) +endif + +$(eval $(call SetupLauncher,javah, \ + -DEXPAND_CLASSPATH_WILDCARDS \ + -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javah.Main"$(COMMA) }')) + +$(eval $(call SetupLauncher,javap, \ + -DEXPAND_CLASSPATH_WILDCARDS \ + -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javap.Main"$(COMMA) }')) + +$(eval $(call SetupLauncher,serialver, \ + -DEXPAND_CLASSPATH_WILDCARDS \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.serialver.SerialVer"$(COMMA) }')) + +jdk.compiler: $(LAUNCHERS) + +all: jdk.compiler + +.PHONY: all jdk.compiler diff --git a/jdk/make/launcher/Launcher-jdk.dev.gmk b/jdk/make/launcher/Launcher-jdk.dev.gmk new file mode 100644 index 00000000000..2b188669037 --- /dev/null +++ b/jdk/make/launcher/Launcher-jdk.dev.gmk @@ -0,0 +1,52 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LauncherCommon.gmk + +$(eval $(call SetupLauncher,extcheck, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.extcheck.Main"$(COMMA) }')) + +$(eval $(call SetupLauncher,jar, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jar.Main"$(COMMA) }')) + +$(eval $(call SetupLauncher,jarsigner, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.jarsigner.Main"$(COMMA) }')) + +$(eval $(call SetupLauncher,jdeps, \ + -DEXPAND_CLASSPATH_WILDCARDS \ + -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.jdeps.Main"$(COMMA) }')) + +$(eval $(call SetupLauncher,jhat, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.hat.Main"$(COMMA) }')) + +$(eval $(call SetupLauncher,native2ascii, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.native2ascii.Main"$(COMMA) }')) + +jdk.dev: $(LAUNCHERS) + +all: jdk.dev + +.PHONY: all jdk.dev diff --git a/jdk/make/launcher/Launcher-jdk.hotspot.agent.gmk b/jdk/make/launcher/Launcher-jdk.hotspot.agent.gmk new file mode 100644 index 00000000000..984288dcec4 --- /dev/null +++ b/jdk/make/launcher/Launcher-jdk.hotspot.agent.gmk @@ -0,0 +1,37 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LauncherCommon.gmk + +$(eval $(call SetupLauncher,jsadebugd, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.jvm.hotspot.jdi.SADebugServer"$(COMMA) }' \ + -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \ + ,,,,,,,,,Info-privileged.plist)) + +jdk.hotspot.agent: $(LAUNCHERS) + +all: jdk.hotspot.agent + +.PHONY: all jdk.hotspot.agent diff --git a/jdk/make/launcher/Launcher-jdk.javadoc.gmk b/jdk/make/launcher/Launcher-jdk.javadoc.gmk new file mode 100644 index 00000000000..dbf3ce45493 --- /dev/null +++ b/jdk/make/launcher/Launcher-jdk.javadoc.gmk @@ -0,0 +1,37 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LauncherCommon.gmk + +$(eval $(call SetupLauncher,javadoc, \ + -DEXPAND_CLASSPATH_WILDCARDS \ + -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javadoc.Main"$(COMMA) }')) + +jdk.javadoc: $(LAUNCHERS) + +all: jdk.javadoc + +.PHONY: all jdk.javadoc diff --git a/jdk/make/launcher/Launcher-jdk.jcmd.gmk b/jdk/make/launcher/Launcher-jdk.jcmd.gmk new file mode 100644 index 00000000000..12595154ce4 --- /dev/null +++ b/jdk/make/launcher/Launcher-jdk.jcmd.gmk @@ -0,0 +1,65 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LauncherCommon.gmk + +$(eval $(call SetupLauncher,jinfo, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \ + "-J-Dsun.jvm.hotspot.debugger.useProcDebugger"$(COMMA) \ + "-J-Dsun.jvm.hotspot.debugger.useWindbgDebugger"$(COMMA) \ + "sun.tools.jinfo.JInfo"$(COMMA) }' \ + -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \ + ,,,,,,,,,Info-privileged.plist)) + +$(eval $(call SetupLauncher,jmap, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \ + "-J-Dsun.jvm.hotspot.debugger.useProcDebugger"$(COMMA) \ + "-J-Dsun.jvm.hotspot.debugger.useWindbgDebugger"$(COMMA) \ + "sun.tools.jmap.JMap"$(COMMA) }' \ + -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \ + ,,,,,,,,,Info-privileged.plist)) + +$(eval $(call SetupLauncher,jps, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jps.Jps"$(COMMA) }')) + +$(eval $(call SetupLauncher,jstack, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \ + "-J-Dsun.jvm.hotspot.debugger.useProcDebugger"$(COMMA) \ + "-J-Dsun.jvm.hotspot.debugger.useWindbgDebugger"$(COMMA) \ + "sun.tools.jstack.JStack"$(COMMA) }' \ + -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \ + ,,,,,,,,,Info-privileged.plist)) + +$(eval $(call SetupLauncher,jstat, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jstat.Jstat"$(COMMA) }')) + +$(eval $(call SetupLauncher,jcmd, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jcmd.JCmd"$(COMMA) }')) + +jdk.jcmd: $(LAUNCHERS) + +all: jdk.jcmd + +.PHONY: all jdk.jcmd diff --git a/jdk/make/launcher/Launcher-jdk.jconsole.gmk b/jdk/make/launcher/Launcher-jdk.jconsole.gmk new file mode 100644 index 00000000000..df537db5906 --- /dev/null +++ b/jdk/make/launcher/Launcher-jdk.jconsole.gmk @@ -0,0 +1,39 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LauncherCommon.gmk + +BUILD_LAUNCHER_jconsole_CFLAGS_windows := -DJAVAW +BUILD_LAUNCHER_jconsole_LDFLAGS_windows := user32.lib + +$(eval $(call SetupLauncher,jconsole, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "-J-Djconsole.showOutputViewer"$(COMMA) "sun.tools.jconsole.JConsole"$(COMMA) }' \ + -DAPP_CLASSPATH='{ "/lib/jconsole.jar"$(COMMA) "/lib/tools.jar"$(COMMA) "/classes" }')) + +jdk.jconsole: $(LAUNCHERS) + +all: jdk.jconsole + +.PHONY: all jdk.jconsole diff --git a/jdk/make/launcher/Launcher-jdk.jdi.gmk b/jdk/make/launcher/Launcher-jdk.jdi.gmk new file mode 100644 index 00000000000..b32d6c44d70 --- /dev/null +++ b/jdk/make/launcher/Launcher-jdk.jdi.gmk @@ -0,0 +1,36 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LauncherCommon.gmk + +$(eval $(call SetupLauncher,jdb, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.example.debug.tty.TTY"$(COMMA) }' \ + -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }')) + +jdk.jdi: $(LAUNCHERS) + +all: jdk.jdi + +.PHONY: all jdk.jdi diff --git a/jdk/test/sun/tools/jps/jps-V_2.sh b/jdk/make/launcher/Launcher-jdk.jvmstat.gmk similarity index 66% rename from jdk/test/sun/tools/jps/jps-V_2.sh rename to jdk/make/launcher/Launcher-jdk.jvmstat.gmk index 2ab10ee7822..5f5f8a1fbbe 100644 --- a/jdk/test/sun/tools/jps/jps-V_2.sh +++ b/jdk/make/launcher/Launcher-jdk.jvmstat.gmk @@ -1,10 +1,12 @@ # -# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. # # This code is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -21,16 +23,13 @@ # questions. # -# @test -# @bug 4990825 -# @run shell jps-V_2.sh -# @summary Test that output of 'jps -V' shows JVM flags +include LauncherCommon.gmk -. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh +$(eval $(call SetupLauncher,jstatd, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jstatd.Jstatd"$(COMMA) }')) -setup -verify_os +jdk.jvmstat: $(LAUNCHERS) -JPS="${TESTJAVA}/bin/jps" +all: jdk.jvmstat -${JPS} -J-XX:+UsePerfData -J-XX:Flags=${TESTSRC}/vmflags -V | awk -f ${TESTSRC}/jps-V_Output2.awk +.PHONY: all jdk.jvmstat diff --git a/jdk/make/launcher/Launcher-jdk.rmic.gmk b/jdk/make/launcher/Launcher-jdk.rmic.gmk new file mode 100644 index 00000000000..88a8471e978 --- /dev/null +++ b/jdk/make/launcher/Launcher-jdk.rmic.gmk @@ -0,0 +1,36 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LauncherCommon.gmk + +$(eval $(call SetupLauncher,rmic, \ + -DEXPAND_CLASSPATH_WILDCARDS \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.rmi.rmic.Main"$(COMMA) }')) + +jdk.rmic: $(LAUNCHERS) + +all: jdk.rmic + +.PHONY: all jdk.rmic diff --git a/jdk/make/launcher/Launcher-jdk.runtime.gmk b/jdk/make/launcher/Launcher-jdk.runtime.gmk new file mode 100644 index 00000000000..cf6be2d2467 --- /dev/null +++ b/jdk/make/launcher/Launcher-jdk.runtime.gmk @@ -0,0 +1,147 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LauncherCommon.gmk + +ifndef BUILD_HEADLESS_ONLY + $(eval $(call SetupLauncher,policytool, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.policytool.PolicyTool"$(COMMA) }',, \ + $(XLIBS))) +endif + +$(eval $(call SetupLauncher,pack200, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.java.util.jar.pack.Driver"$(COMMA) }')) + +################################################################################ +# The order of the object files on the link command line affects the size of the resulting +# binary (at least on linux) which causes the size to differ between old and new build. + +UNPACKEXE_SRC := $(JDK_TOPDIR)/src/jdk.runtime/share/native/common-unpack \ + $(JDK_TOPDIR)/src/jdk.runtime/share/native/unpack200 +UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/jdk.runtime/share/native/common-unpack \ + -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \ + -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjava + +ifeq ($(USE_EXTERNAL_LIBZ), true) + UNPACKEXE_CFLAGS += -DSYSTEM_ZLIB + UNPACKEXE_ZIPOBJS := -lz +else + UNPACKEXE_CFLAGS += -I$(JDK_TOPDIR)/src/java.base/share/native/libzip/zlib-1.2.8 + UNPACKEXE_ZIPOBJS := $(JDK_OUTPUTDIR)/objs/libzip/zcrc32$(OBJ_SUFFIX) \ + $(JDK_OUTPUTDIR)/objs/libzip/deflate$(OBJ_SUFFIX) \ + $(JDK_OUTPUTDIR)/objs/libzip/trees$(OBJ_SUFFIX) \ + $(JDK_OUTPUTDIR)/objs/libzip/zadler32$(OBJ_SUFFIX) \ + $(JDK_OUTPUTDIR)/objs/libzip/compress$(OBJ_SUFFIX) \ + $(JDK_OUTPUTDIR)/objs/libzip/zutil$(OBJ_SUFFIX) \ + $(JDK_OUTPUTDIR)/objs/libzip/inflate$(OBJ_SUFFIX) \ + $(JDK_OUTPUTDIR)/objs/libzip/infback$(OBJ_SUFFIX) \ + $(JDK_OUTPUTDIR)/objs/libzip/inftrees$(OBJ_SUFFIX) \ + $(JDK_OUTPUTDIR)/objs/libzip/inffast$(OBJ_SUFFIX) + +endif + +UNPACKEXE_LANG := C +ifeq ($(OPENJDK_TARGET_OS), solaris) + UNPACKEXE_LANG := C++ +endif +UNPACKEXE_DEBUG_SYMBOLS := true +# On windows, unpack200 is linked completely differently to all other +# executables, using the compiler with the compiler arguments. +# It's also linked incrementally, producing a .ilk file that needs to +# be kept away. +ifeq ($(OPENJDK_TARGET_OS), windows) + BUILD_UNPACKEXE_LDEXE := $(CC) + EXE_OUT_OPTION_save := $(EXE_OUT_OPTION) + EXE_OUT_OPTION := -Fe + # With the current way unpack200 is built, debug symbols aren't supported + # anyway. + UNPACKEXE_DEBUG_SYMBOLS := +endif + +# The linker on older SuSE distros (e.g. on SLES 10) complains with: +# "Invalid version tag `SUNWprivate_1.1'. Only anonymous version tag is allowed in executable." +# if feeded with a version script which contains named tags. +ifeq ($(USING_BROKEN_SUSE_LD), yes) + UNPACK_MAPFILE = $(JDK_TOPDIR)/make/mapfiles/libunpack/mapfile-vers-unpack200.anonymous +else + UNPACK_MAPFILE = $(JDK_TOPDIR)/make/mapfiles/libunpack/mapfile-vers-unpack200 +endif + +$(eval $(call SetupNativeCompilation,BUILD_UNPACKEXE, \ + SRC := $(UNPACKEXE_SRC), \ + LANG := $(UNPACKEXE_LANG), \ + OPTIMIZATION := LOW, \ + CFLAGS := $(UNPACKEXE_CFLAGS) $(CXXFLAGS_JDKEXE) \ + -DFULL, \ + CFLAGS_release := -DPRODUCT, \ + CFLAGS_linux := -fPIC, \ + CFLAGS_solaris := -KPIC, \ + CFLAGS_macosx := -fPIC, \ + MAPFILE := $(UNPACK_MAPFILE),\ + LDFLAGS := $(UNPACKEXE_ZIPOBJS), \ + LDFLAGS_windows := $(CXXFLAGS_JDKEXE), \ + LDFLAGS_posix := $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \ + $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)unpack$(SHARED_LIBRARY_SUFFIX)) \ + $(call SET_SHARED_LIBRARY_ORIGIN), \ + LDFLAGS_linux := -lc, \ + LDFLAGS_solaris := $(UNPACKEXE_LDFLAGS_solaris) -lc, \ + LDFLAGS_SUFFIX := $(LIBCXX), \ + OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \ + OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \ + PROGRAM := unpack200, \ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ + RC_FLAGS := $(RC_FLAGS) \ + -D "JDK_FNAME=unpack200.exe" \ + -D "JDK_INTERNAL_NAME=unpack200" \ + -D "JDK_FTYPE=0x1L", \ + DEBUG_SYMBOLS := $(UNPACKEXE_DEBUG_SYMBOLS), \ + MANIFEST := $(JDK_TOPDIR)/src/jdk.runtime/windows/native/unpack200/unpack200_proto.exe.manifest)) + +ifeq ($(OPENJDK_TARGET_OS), windows) + EXE_OUT_OPTION := $(EXE_OUT_OPTION_save) +endif + +ifneq ($(USE_EXTERNAL_LIBZ), true) + + $(BUILD_UNPACKEXE): $(UNPACKEXE_ZIPOBJS) + +endif + +# Build into object dir and copy executable afterwards to avoid .ilk file in +# image. The real fix would be clean up linking of unpack200 using +# -link -incremental:no +# like all other launchers. +$(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/unpack200$(EXE_SUFFIX): $(BUILD_UNPACKEXE) + $(call install-file) + +LAUNCHERS += $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/unpack200$(EXE_SUFFIX) + +################################################################################ + +jdk.runtime: $(LAUNCHERS) + +all: jdk.runtime + +.PHONY: all jdk.runtime diff --git a/jdk/make/launcher/Launcher-jdk.scripting.nashorn.gmk b/jdk/make/launcher/Launcher-jdk.scripting.nashorn.gmk new file mode 100644 index 00000000000..cfb5f421a18 --- /dev/null +++ b/jdk/make/launcher/Launcher-jdk.scripting.nashorn.gmk @@ -0,0 +1,35 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LauncherCommon.gmk + +$(eval $(call SetupLauncher,jjs, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "jdk.nashorn.tools.Shell"$(COMMA) }')) + +jdk.scripting.nashorn: $(LAUNCHERS) + +all: jdk.scripting.nashorn + +.PHONY: all jdk.scripting.nashorn diff --git a/jdk/make/launcher/Launcher-jdk.xml.bind.gmk b/jdk/make/launcher/Launcher-jdk.xml.bind.gmk new file mode 100644 index 00000000000..f03de37ca17 --- /dev/null +++ b/jdk/make/launcher/Launcher-jdk.xml.bind.gmk @@ -0,0 +1,38 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LauncherCommon.gmk + +$(eval $(call SetupLauncher,schemagen, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.internal.jxc.SchemaGenerator"$(COMMA) }')) + +$(eval $(call SetupLauncher,xjc, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.internal.xjc.Driver"$(COMMA) }')) + +jdk.xml.bind: $(LAUNCHERS) + +all: jdk.xml.bind + +.PHONY: all jdk.xml.bind diff --git a/jdk/make/launcher/Launcher-jdk.xml.ws.gmk b/jdk/make/launcher/Launcher-jdk.xml.ws.gmk new file mode 100644 index 00000000000..583156372e2 --- /dev/null +++ b/jdk/make/launcher/Launcher-jdk.xml.ws.gmk @@ -0,0 +1,38 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LauncherCommon.gmk + +$(eval $(call SetupLauncher,wsgen, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.internal.ws.WsGen"$(COMMA) }')) + +$(eval $(call SetupLauncher,wsimport, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.internal.ws.WsImport"$(COMMA) }')) + +jdk.xml.ws: $(LAUNCHERS) + +all: jdk.xml.ws + +.PHONY: all jdk.xml.ws diff --git a/jdk/make/launcher/LauncherCommon.gmk b/jdk/make/launcher/LauncherCommon.gmk new file mode 100644 index 00000000000..f8ff00c830d --- /dev/null +++ b/jdk/make/launcher/LauncherCommon.gmk @@ -0,0 +1,234 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +default: all + +include $(SPEC) +include MakeBase.gmk +include NativeCompilation.gmk + +# Prepare the find cache. +$(eval $(call FillCacheFind, $(JDK_TOPDIR)/src/java.base/share/native/launcher)) + +# Build tools +include Tools.gmk + +# When building a legacy overlay image (on solaris 64 bit), the launchers +# need to be built with a different rpath and a different output dir. +ifeq ($(OVERLAY_IMAGES), true) + ORIGIN_ROOT := /../.. + OUTPUT_SUBDIR := $(OPENJDK_TARGET_CPU_ISADIR) +else + ORIGIN_ROOT := /.. +endif + +ifeq ($(OPENJDK_TARGET_OS), macosx) + ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN) +else + ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli) +endif + +# +# Applications expect to be able to link against libjawt without invoking +# System.loadLibrary("jawt") first. This was the behaviour described in the +# devloper documentation of JAWT and what worked with OpenJDK6. +# +ifneq ($(findstring $(OPENJDK_TARGET_OS), linux solaris), ) + ORIGIN_ARG += $(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)) +endif + +LAUNCHER_SRC := $(JDK_TOPDIR)/src/java.base/share/native/launcher +LAUNCHER_CFLAGS := -I$(JDK_TOPDIR)/src/java.base/share/native/launcher \ + -I$(JDK_TOPDIR)/src/java.base/share/native/libjli \ + -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjli \ + -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libjli \ + # +GLOBAL_VERSION_INFO_RESOURCE := $(JDK_TOPDIR)/src/java.base/windows/native/common/version.rc +JAVA_VERSION_INFO_RESOURCE := $(JDK_TOPDIR)/src/java.base/windows/native/launcher/java.rc +MACOSX_PLIST_DIR := $(JDK_TOPDIR)/src/java.base/macosx/native/launcher +# Until the shuffle is permanent, we can't add this in configure +CFLAGS_JDKEXE := $(filter-out %javavm/export, $(CFLAGS_JDKEXE)) +CFLAGS_JDKEXE += -I$(JDK_TOPDIR)/src/java.base/share/native/include \ + -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/include +CXXFLAGS_JDKEXE := $(filter-out %javavm/export, $(CXXFLAGS_JDKEXE)) +CXXFLAGS_JDKEXE += -I$(JDK_TOPDIR)/src/java.base/share/native/include \ + -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/include +JAVA_MANIFEST := $(JDK_TOPDIR)/src/java.base/windows/native/launcher/java.manifest + +define SetupLauncher + # TODO: Fix mapfile on solaris. Won't work with ld as linker. + # Parameter 1 is the name of the launcher (java, javac, jar...) + # Parameter 2 is extra CFLAGS + # Parameter 3 is extra LDFLAGS + # Parameter 4 is extra LDFLAGS_SUFFIX_posix + # Parameter 5 is extra LDFLAGS_SUFFIX_windows + # Parameter 6 is optional Windows JLI library (full path) + # Parameter 7 is optional Windows resource (RC) flags + # Parameter 8 is optional Windows version resource file (.rc) + # Parameter 9 is different output dir + # Parameter 10 if set, link statically with c runtime on windows. + # Parameter 11 if set, override plist file on macosx. + $(call LogSetupMacroEntry,SetupLauncher($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11)) + $(if $(13),$(error Internal makefile error: Too many arguments to SetupLauncher, please update CompileLaunchers.gmk)) + + $1_WINDOWS_JLI_LIB := $(JDK_OUTPUTDIR)/objs/libjli/jli.lib + ifneq ($6, ) + $1_WINDOWS_JLI_LIB := $6 + endif + $1_VERSION_INFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE) + ifneq ($8, ) + $1_VERSION_INFO_RESOURCE := $8 + endif + + $1_LDFLAGS := $3 + $1_LDFLAGS_SUFFIX := + ifeq ($(OPENJDK_TARGET_OS), macosx) + $1_PLIST_FILE := Info-cmdline.plist + ifneq ($(11), ) + $1_PLIST_FILE := $(11) + ifneq ($$(findstring privileged, $$($1_PLIST_FILE)), ) + $1_CODESIGN := true + endif + endif + + $1_LDFLAGS += -Wl,-all_load $(JDK_OUTPUTDIR)/objs/libjli_static.a \ + -framework Cocoa -framework Security -framework ApplicationServices \ + -sectcreate __TEXT __info_plist $(MACOSX_PLIST_DIR)/$$($1_PLIST_FILE) + $1_LDFLAGS_SUFFIX += -pthread + endif + + ifeq ($(OPENJDK_TARGET_OS), aix) + $1_LDFLAGS_SUFFIX += -L$(JDK_OUTPUTDIR)/objs -ljli_static + endif + + ifeq ($(USE_EXTERNAL_LIBZ), true) + $1_LDFLAGS_SUFFIX += -lz + endif + + $1_OUTPUT_DIR_ARG := $9 + ifeq (, $$($1_OUTPUT_DIR_ARG)) + $1_OUTPUT_DIR_ARG := $(JDK_OUTPUTDIR)/bin + endif + + # TODO: maybe it's better to move this if-statement out of this function + ifeq ($1, java) + $1_OPTIMIZATION_ARG := HIGH + $1_LDFLAGS_solaris := -R$(OPENWIN_HOME)/lib$(OPENJDK_TARGET_CPU_ISADIR) + else + $1_OPTIMIZATION_ARG := LOW + endif + + $1_CFLAGS := $(CFLAGS_JDKEXE) + ifeq ($(10), true) + $1_CFLAGS := $(filter-out -MD, $(CFLAGS_JDKEXE)) + endif + + # The linker on older SuSE distros (e.g. on SLES 10) complains with: + # "Invalid version tag `SUNWprivate_1.1'. Only anonymous version tag is allowed in executable." + # if feeded with a version script which contains named tags. + ifeq ($(USING_BROKEN_SUSE_LD),yes) + ifneq ($(wildcard $(JDK_TOPDIR)/make/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU).anonymous), ) + $1_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU).anonymous + else + $1_MAPFILE := + endif + else + ifneq ($(wildcard $(JDK_TOPDIR)/make/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU)), ) + $1_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU) + else + $1_MAPFILE := + endif + endif + + $(call SetupNativeCompilation,BUILD_LAUNCHER_$1, \ + SRC := $(LAUNCHER_SRC), \ + INCLUDE_FILES := main.c, \ + LANG := C, \ + OPTIMIZATION := $$($1_OPTIMIZATION_ARG), \ + CFLAGS := $$($1_CFLAGS) \ + $(LAUNCHER_CFLAGS) \ + -DFULL_VERSION='"$(FULL_VERSION)"' \ + -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \ + -DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"' \ + -DLAUNCHER_NAME='"$(LAUNCHER_NAME)"' \ + -DPROGNAME='"$1"' $(DPACKAGEPATH) \ + $2, \ + CFLAGS_linux := -fPIC, \ + CFLAGS_solaris := -KPIC -DHAVE_GETHRTIME, \ + LDFLAGS := $(LDFLAGS_JDKEXE) \ + $(ORIGIN_ARG) \ + $$($1_LDFLAGS), \ + LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_NAME,$1), \ + LDFLAGS_linux := -lpthread \ + $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \ + LDFLAGS_solaris := $$($1_LDFLAGS_solaris) \ + $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \ + MAPFILE := $$($1_MAPFILE), \ + LDFLAGS_SUFFIX := $(LDFLAGS_JDKEXE_SUFFIX) $$($1_LDFLAGS_SUFFIX), \ + LDFLAGS_SUFFIX_posix := $4, \ + LDFLAGS_SUFFIX_windows := $$($1_WINDOWS_JLI_LIB) \ + $(JDK_OUTPUTDIR)/objs/libjava/java.lib advapi32.lib $5, \ + LDFLAGS_SUFFIX_linux := -L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli $(LIBDL) -lc, \ + LDFLAGS_SUFFIX_solaris := -L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli -lthread $(LIBDL) -lc, \ + OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/$1_objs$(OUTPUT_SUBDIR), \ + OUTPUT_DIR := $$($1_OUTPUT_DIR_ARG)$(OUTPUT_SUBDIR), \ + PROGRAM := $1, \ + DEBUG_SYMBOLS := true, \ + VERSIONINFO_RESOURCE := $$($1_VERSION_INFO_RESOURCE), \ + RC_FLAGS := $(RC_FLAGS) \ + -D "JDK_FNAME=$1$(EXE_SUFFIX)" \ + -D "JDK_INTERNAL_NAME=$1" \ + -D "JDK_FTYPE=0x1L" \ + $7, \ + MANIFEST := $(JAVA_MANIFEST), \ + CODESIGN := $$($1_CODESIGN)) + + LAUNCHERS += $$(BUILD_LAUNCHER_$1) + + ifneq (,$(filter $(OPENJDK_TARGET_OS), macosx aix)) + $$(BUILD_LAUNCHER_$1): $(JDK_OUTPUTDIR)/objs/libjli_static.a + endif + + ifeq ($(OPENJDK_TARGET_OS), windows) + $$(BUILD_LAUNCHER_$1): $(JDK_OUTPUTDIR)/objs/libjava/java.lib \ + $$($1_WINDOWS_JLI_LIB) + endif +endef + +########################################################################################## + +XLIBS := $(X_LIBS) -lX11 +ifeq ($(OPENJDK_TARGET_OS), macosx) + DPACKAGEPATH := -DPACKAGE_PATH='"$(PACKAGE_PATH)"' + XLIBS := +endif + +JAVA_RC_FLAGS += -i $(JDK_TOPDIR)/src/java.base/windows/native/common +ifdef OPENJDK + JAVA_RC_FLAGS += -i "$(JDK_TOPDIR)/src/java.base/windows/native/launcher/icons" +else + JAVA_RC_FLAGS += -i "$(JDK_TOPDIR)/src/closed/java.base/windows/native/launcher/icons" +endif + diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk index 7dbd66b4b5e..694db74f196 100644 --- a/jdk/make/lib/Awt2dLibraries.gmk +++ b/jdk/make/lib/Awt2dLibraries.gmk @@ -30,10 +30,11 @@ WIN_AWT_LIB := $(JDK_OUTPUTDIR)/objs/libawt/awt.lib ########################################################################################## -BUILD_LIBMLIB_SRC := $(JDK_TOPDIR)/src/share/native/sun/awt/medialib +BUILD_LIBMLIB_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/libmlib_image \ + $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/medialib BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \ - -I$(BUILD_LIBMLIB_SRC) \ - -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/medialib + $(addprefix -I, $(BUILD_LIBMLIB_SRC)) \ + -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libmlib_image BUILD_LIBMLIB_LDLIBS := BUILD_LIBMLIB_IMAGE_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libmlib_image/mapfile-vers @@ -52,7 +53,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBMLIB_IMAGE, \ LIBRARY := mlib_image, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ SRC := $(BUILD_LIBMLIB_SRC), \ - EXCLUDE_FILES := awt_ImagingLib.c mlib_c_ImageBlendTable.c, \ + EXCLUDE_FILES := mlib_c_ImageBlendTable.c, \ LANG := C, \ OPTIMIZATION := HIGHEST, \ CFLAGS := $(CFLAGS_JDKLIB) \ @@ -63,7 +64,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBMLIB_IMAGE, \ LDFLAGS_SUFFIX := $(BUILD_LIBMLIB_LDLIBS) \ $(LDFLAGS_JDKLIB_SUFFIX), \ LDFLAGS_SUFFIX_solaris := -lc, \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=mlib_image.dll" \ -D "JDK_INTERNAL_NAME=mlib_image" \ @@ -73,119 +74,61 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBMLIB_IMAGE, \ $(BUILD_LIBMLIB_IMAGE): $(BUILD_LIBJAVA) -BUILD_LIBRARIES += $(BUILD_LIBMLIB_IMAGE) +DESKTOP_LIBRARIES += $(BUILD_LIBMLIB_IMAGE) ########################################################################################## ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc) - BUILD_LIBMLIB_IMAGE_V_FILES := \ - mlib_v_ImageLookUp.c \ - mlib_ImageCreate.c \ - mlib_ImageAffine.c \ - mlib_ImageConvMxN.c \ - mlib_ImageConvKernelConvert.c \ - mlib_sys.c \ - mlib_ImageLookUp_64.c \ - mlib_ImageLookUp_Bit.c \ - mlib_ImageColorTrue2Index.c \ - mlib_c_ImageThresh1_U8.c \ - mlib_v_ImageLookUpS16S16Func.c \ - mlib_v_ImageLookUpS16S32Func.c \ - mlib_v_ImageLookUpS16U16Func.c \ - mlib_v_ImageLookUpS16U8Func.c \ - mlib_v_ImageLookUpS32S16Func.c \ - mlib_v_ImageLookUpS32S32Func.c \ - mlib_v_ImageLookUpS32U16Func.c \ - mlib_v_ImageLookUpS32U8Func.c \ - mlib_v_ImageLookUpSIS16S16Func.c \ - mlib_v_ImageLookUpSIS16S32Func.c \ - mlib_v_ImageLookUpSIS16U16Func.c \ - mlib_v_ImageLookUpSIS16U8Func.c \ - mlib_v_ImageLookUpSIS32S16Func.c \ - mlib_v_ImageLookUpSIS32S32Func.c \ - mlib_v_ImageLookUpSIS32U16Func.c \ - mlib_v_ImageLookUpSIS32U8Func.c \ - mlib_v_ImageLookUpSIU16S16Func.c \ - mlib_v_ImageLookUpSIU16S32Func.c \ - mlib_v_ImageLookUpSIU16U16Func.c \ - mlib_v_ImageLookUpSIU16U8Func.c \ - mlib_v_ImageLookUpSIU8S16Func.c \ - mlib_v_ImageLookUpSIU8S32Func.c \ - mlib_v_ImageLookUpSIU8U16Func.c \ - mlib_v_ImageLookUpSIU8U8Func.c \ - mlib_v_ImageLookUpU16S16Func.c \ - mlib_v_ImageLookUpU16S32Func.c \ - mlib_v_ImageLookUpU16U16Func.c \ - mlib_v_ImageLookUpU16U8Func.c \ - mlib_v_ImageLookUpU8S16Func.c \ - mlib_v_ImageLookUpU8S32Func.c \ - mlib_v_ImageLookUpU8U16Func.c \ - mlib_v_ImageLookUpU8U8Func.c \ - mlib_v_ImageAffineIndex_BC.c \ - mlib_v_ImageAffine_BC.c \ - mlib_v_ImageAffine_BC_S16.c \ - mlib_v_ImageAffine_BC_U16.c \ - mlib_v_ImageAffine_BL.c \ - mlib_v_ImageAffine_BL_S16.c \ - mlib_v_ImageAffine_BL_U16.c \ - mlib_v_ImageAffine_NN.c \ - mlib_v_ImageFilters.c \ - mlib_ImageAffineEdge.c \ - mlib_ImageAffine_BC_D64.c \ - mlib_ImageAffine_BC_F32.c \ - mlib_ImageAffine_BC_S32.c \ - mlib_ImageAffine_BL_D64.c \ - mlib_ImageAffine_BL_F32.c \ - mlib_ImageAffine_BL_S32.c \ - mlib_ImageAffine_NN.c \ - mlib_ImageAffine_NN_Bit.c \ - mlib_ImageFilters.c \ - mlib_ImageScanPoly.c \ - mlib_ImageConv_8nw.c \ - mlib_ImageConv_8ext.c \ - mlib_ImageConv_16nw.c \ - mlib_ImageConv_16ext.c \ - mlib_ImageConv_u16nw.c \ - mlib_ImageConv_u16ext.c \ - mlib_ImageConv_32nw.c \ - mlib_ImageConv_F32nw.c \ - mlib_ImageConvMxN_Fp.c \ - mlib_ImageConvMxN_ext.c \ - mlib_ImageConv_D64nw.c \ - mlib_ImageClipping.c \ - mlib_ImageConvCopyEdge_Bit.c \ - mlib_ImageConvClearEdge_Bit.c \ - mlib_ImageConv2x2_f.c \ - mlib_ImageConvClearEdge_Fp.c \ - mlib_v_ImageConvMxN_8.c \ - mlib_v_ImageConvClearEdge.c \ - mlib_v_ImageConvCopyEdge.c \ - mlib_v_ImageConvMxN_8ext.c \ - mlib_v_ImageConvVersion.c \ - mlib_v_ImageConv_8nw.c \ - mlib_ImageConvCopyEdge_Fp.c \ - mlib_v_ImageChannelInsert_1.c \ - mlib_v_ImageChannelExtract_43.c \ - mlib_v_ImageChannelExtract_1.c \ - mlib_ImageCopy_Bit.c \ - mlib_v_ImageCopy_f.c \ - mlib_ImageUtils.c \ - mlib_ImageDivTables.c + LIBMLIB_IMAGE_V_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/libmlib_image \ + $(JDK_TOPDIR)/src/java.desktop/unix/native/libmlib_image \ + $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/medialib \ + $(JDK_TOPDIR)/src/java.desktop/unix/native/common/sun/awt/medialib \ + # + LIBMLIB_IMAGE_V_CFLAGS := $(JDK_TOPDIR)/src/java.desktop/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il \ + $(addprefix -I, $(LIBMLIB_IMAGE_V_SRC)) \ + # - BUILD_LIBMLIB_V_CFLAGS := $(filter-out -DMLIB_NO_LIBSUNMATH, $(BUILD_LIBMLIB_CFLAGS)) + BUILD_LIBMLIB_IMAGE_V_EXFILES := \ + awt_ImagingLib.c \ + mlib_c_ImageAffine_BC.c \ + mlib_c_ImageAffine_BC_S16.c \ + mlib_c_ImageAffine_BC_U16.c \ + mlib_c_ImageAffine_BL.c \ + mlib_c_ImageAffine_BL_S16.c \ + mlib_c_ImageAffine_BL_U16.c \ + mlib_c_ImageAffineIndex_BC.c \ + mlib_c_ImageAffineIndex_BL.c \ + mlib_c_ImageAffine_NN.c \ + mlib_c_ImageBlendTable.c \ + mlib_c_ImageConvClearEdge.c \ + mlib_c_ImageConvCopyEdge.c \ + mlib_c_ImageConv_f.c \ + mlib_c_ImageConvVersion.c \ + mlib_c_ImageCopy.c \ + mlib_c_ImageLookUp.c \ + mlib_c_ImageLookUp_f.c \ + mlib_v_ImageChannelExtract.c \ + mlib_v_ImageChannelExtract_f.c \ + mlib_v_ImageChannelInsert_34.c \ + mlib_v_ImageChannelInsert.c \ + mlib_v_ImageConvIndex3_8_16nw.c \ + mlib_v_ImageConvIndex3_8_8nw.c \ + mlib_v_ImageCopy.c \ + mlib_v_ImageCopy_blk.s \ + # + + LIBMLIB_IMAGE_V_CFLAGS += $(filter-out -DMLIB_NO_LIBSUNMATH, $(BUILD_LIBMLIB_CFLAGS)) $(eval $(call SetupNativeCompilation,BUILD_LIBMLIB_IMAGE_V, \ LIBRARY := mlib_image_v, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(JDK_TOPDIR)/src/share/native/sun/awt/medialib \ - $(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib, \ + SRC := $(LIBMLIB_IMAGE_V_SRC), \ LANG := C, \ - INCLUDE_FILES := $(BUILD_LIBMLIB_IMAGE_V_FILES), \ + EXCLUDE_FILES := $(BUILD_LIBMLIB_IMAGE_V_EXFILES), \ OPTIMIZATION := HIGHEST, \ CFLAGS := -xarch=sparcvis \ - $(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib/vis_$(OPENJDK_TARGET_CPU_BITS).il \ - $(BUILD_LIBMLIB_V_CFLAGS) \ + $(LIBMLIB_IMAGE_V_CFLAGS) \ $(CFLAGS_JDKLIB), \ MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \ LDFLAGS := $(LDFLAGS_JDKLIB) \ @@ -197,184 +140,53 @@ ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc) $(BUILD_LIBMLIB_IMAGE_V): $(BUILD_LIBJAVA) - BUILD_LIBRARIES += $(BUILD_LIBMLIB_IMAGE_V) + DESKTOP_LIBRARIES += $(BUILD_LIBMLIB_IMAGE_V) endif ########################################################################################## -LIBAWT_DIRS := \ - $(JDK_TOPDIR)/src/share/native/sun/awt \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \ - $(JDK_TOPDIR)/src/share/native/sun/awt/image \ - $(JDK_TOPDIR)/src/share/native/sun/awt/image/gif \ - $(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \ - $(JDK_TOPDIR)/src/share/native/sun/awt/medialib \ - $(JDK_TOPDIR)/src/share/native/sun/awt/debug \ - $(JDK_TOPDIR)/src/share/native/sun/awt/utility \ - $(JDK_TOPDIR)/src/share/native/sun/java2d \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \ - $(JDK_TOPDIR)/src/share/native/sun/java2d/loops \ - $(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \ - $(JDK_TOPDIR)/src/share/native/sun/awt/image \ - $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/opengl \ - $(JDK_TOPDIR)/src/share/native/sun/font +LIBAWT_DIRS := $(JDK_TOPDIR)/src/java.desktop/share/native/libawt \ + $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt \ + $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \ + $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/awt \ + # ifeq ($(OPENJDK_TARGET_OS), windows) - LIBAWT_DIRS += \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/windows \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/d3d -else ifneq ($(OPENJDK_TARGET_OS), macosx) - LIBAWT_DIRS += \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/x11 + LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/utility +else + LIBAWT_EXFILES := sun/java2d/ShaderList.c endif -ifeq ($(OPENJDK_TARGET_OS), aix) - LIBAWT_DIRS += $(JDK_TOPDIR)/src/aix/porting +ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux macosx), ) + LIBAWT_EXFILES += awt_Font.c CUPSfuncs.c fontpath.c X11Color.c endif +ifeq ($(OPENJDK_TARGET_OS), macosx) + LIBAWT_EXFILES += initIDs.c sun/awt/image/cvutils/img_colors.c +endif + +LIBAWT_CFLAGS += -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \ + $(addprefix -I, $(shell find $(LIBAWT_DIRS) -type d)) \ + -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/awt \ + $(LIBJAVA_HEADER_FLAGS) \ + $(addprefix -I, $(BUILD_LIBMLIB_IMAGE_SRC)) \ + # + LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \ $(X_CFLAGS) \ $(foreach dir, $(LIBAWT_DIRS), -I$(dir)) -LIBAWT_FILES := \ - gifdecoder.c \ - imageInitIDs.c \ - img_globals.c \ - SurfaceData.c \ - Region.c \ - BufImgSurfaceData.c \ - Disposer.c \ - Trace.c \ - GraphicsPrimitiveMgr.c \ - Blit.c \ - BlitBg.c \ - ScaledBlit.c \ - FillRect.c \ - FillSpans.c \ - FillParallelogram.c \ - DrawParallelogram.c \ - DrawLine.c \ - DrawRect.c \ - DrawPolygons.c \ - DrawPath.c \ - FillPath.c \ - ProcessPath.c \ - MaskBlit.c \ - MaskFill.c \ - TransformHelper.c \ - AlphaMath.c \ - AlphaMacros.c \ - AnyByte.c \ - ByteBinary1Bit.c \ - ByteBinary2Bit.c \ - ByteBinary4Bit.c \ - ByteIndexed.c \ - ByteGray.c \ - Index8Gray.c \ - Index12Gray.c \ - AnyShort.c \ - Ushort555Rgb.c \ - Ushort565Rgb.c \ - Ushort4444Argb.c \ - Ushort555Rgbx.c \ - UshortGray.c \ - UshortIndexed.c \ - Any3Byte.c \ - ThreeByteBgr.c \ - AnyInt.c \ - IntArgb.c \ - IntArgbPre.c \ - IntArgbBm.c \ - IntRgb.c \ - IntBgr.c \ - IntRgbx.c \ - Any4Byte.c \ - FourByteAbgr.c \ - FourByteAbgrPre.c \ - BufferedMaskBlit.c \ - BufferedRenderPipe.c \ - ShapeSpanIterator.c \ - SpanClipRenderer.c \ - awt_ImageRep.c \ - awt_ImagingLib.c \ - awt_Mlib.c \ - awt_parseImage.c \ - DataBufferNative.c \ - dither.c \ - debug_assert.c \ - debug_mem.c \ - debug_trace.c \ - debug_util.c - -ifneq (, $(filter $(OPENJDK_TARGET_OS), solaris linux aix)) - LIBAWT_FILES += awt_LoadLibrary.c initIDs.c img_colors.c -endif - -ifeq ($(OPENJDK_TARGET_OS), aix) - LIBAWT_FILES += porting_aix.c -endif - ifeq ($(OPENJDK_TARGET_OS), macosx) - LIBAWT_FILES += awt_LoadLibrary.c endif ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc) LIBAWT_CFLAGS += -DMLIB_ADD_SUFF LIBAWT_CFLAGS += -xarch=sparcvis - LIBAWT_CFLAGS += $(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib/vis_$(OPENJDK_TARGET_CPU_BITS).il - LIBAWT_CFLAGS += \ - -I$(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib \ - -I$(JDK_TOPDIR)/src/solaris/native/sun/java2d/medialib \ - -I$(JDK_TOPDIR)/src/solaris/native/sun/java2d/loops - LIBAWT_DIRS += $(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib \ - $(JDK_TOPDIR)/src/solaris/native/sun/java2d/loops - - LIBAWT_FILES += \ - vis_FuncArray.c \ - java2d_Mlib.c \ - mlib_ImageCreate.c \ - mlib_ImageZoom_NN.c \ - mlib_ImageCopy_Bit.c \ - mlib_sys.c \ - mlib_v_ImageClear.c \ - mlib_v_ImageClear_f.c \ - mlib_v_ImageConstXor.c \ - mlib_v_ImageCopy.c \ - mlib_v_ImageCopy_f.c \ - mlib_v_ImageXor.c \ - mlib_v_ImageZoom_NN_f.c \ - vis_Interp.c \ - vis_AlphaMacros.c \ - vis_AlphaMaskBlit.c \ - vis_AlphaMaskFill.c \ - vis_ByteGray.c \ - vis_ByteGray_FromRgb.c \ - vis_ByteGray_Mask.c \ - vis_ByteIndexed.c \ - vis_DrawLine.c \ - vis_FourByteAbgr.c \ - vis_IntArgb.c \ - vis_IntArgbPre.c \ - vis_IntArgbPre_Mask.c \ - vis_IntBgr.c \ - vis_IntRgb.c \ - vis_IntRgbx.c \ - vis_SrcMaskFill.c \ - vis_SrcOverMaskBlit.c \ - vis_SrcOverMaskFill.c \ - vis_FourByteAbgrPre.c \ - vis_GlyphList.c \ - vis_GlyphListXor.c \ - vis_IntArgbBm.c \ - vis_ThreeByteBgr.c \ - vis_UshortGray.c \ - vis_UshortGray_FromRgb.c \ - vis_XorBlit.c \ - mlib_v_ImageCopy_blk.s + LIBAWT_CFLAGS += $(JDK_TOPDIR)/src/java.desktop/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il + LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/medialib + LIBAWT_EXFILES += sun/java2d/loops/MapAccelFunc.c ifeq ($(OPENJDK_TARGET_CPU), sparcv9) LIBAWT_ASFLAGS = -P -xarch=v9a @@ -382,7 +194,11 @@ ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc) LIBAWT_ASFLAGS = -P -xarch=v8plusa endif else - LIBAWT_FILES += MapAccelFunc.c + LIBAWT_EXCLUDES += \ + $(JDK_TOPDIR)/src/java.desktop/unix/native/libawt/sun/awt/medialib \ + $(JDK_TOPDIR)/src/java.desktop/unix/native/libawt/sun/java2d/loops \ + $(JDK_TOPDIR)/src/java.desktop/unix/native/common/sun/awt/medialib \ + # endif ifneq ($(OPENJDK_TARGET_OS), solaris) @@ -392,56 +208,22 @@ endif LIBAWT_LANG := C ifeq ($(OPENJDK_TARGET_OS), windows) - LIBAWT_FILES += AccelGlyphCache.c \ - ShaderList.c \ - CmdIDList.cpp \ - Hashtable.cpp \ - GDIHashtable.cpp \ - Devices.cpp \ - ObjectList.cpp \ - GDIBlitLoops.cpp \ - GDIRenderer.cpp \ - GDIWindowSurfaceData.cpp \ - WindowsFlags.cpp \ - WPrinterJob.cpp \ - awt_%.cpp \ - D3DBlitLoops.cpp \ - D3DBufImgOps.cpp \ - D3DContext.cpp \ - D3DGlyphCache.cpp \ - D3DGraphicsDevice.cpp \ - D3DMaskBlit.cpp \ - D3DMaskCache.cpp \ - D3DMaskFill.cpp \ - D3DPipelineManager.cpp \ - D3DPaints.cpp \ - D3DRenderer.cpp \ - D3DRenderQueue.cpp \ - D3DResourceManager.cpp \ - D3DSurfaceData.cpp \ - D3DTextRenderer.cpp \ - D3DVertexCacher.cpp \ - ShellFolder2.cpp \ - ThemeReader.cpp \ - ComCtl32Util.cpp \ - DllUtil.cpp \ - initIDs.cpp \ - MouseInfo.cpp \ - rect.c \ - OGLBlitLoops.c \ - OGLBufImgOps.c \ - OGLContext.c \ - OGLFuncs.c \ - OGLMaskBlit.c \ - OGLMaskFill.c \ - OGLPaints.c \ - OGLRenderQueue.c \ - OGLRenderer.c \ - OGLSurfaceData.c \ - OGLTextRenderer.c \ - OGLVertexCache.c \ - WGLGraphicsConfig.c \ - WGLSurfaceData.c + LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \ + $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/java2d/opengl \ + # Why does libawt need java.base headers? + LIBAWT_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/java2d/opengl \ + -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/java2d/opengl \ + -I$(JDK_TOPDIR)/src/java.desktop/windows/native/include \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \ + -I$(JDK_OUTPUTDIR)/gensrc_headers/java.base \ + # + LIBAWT_EXFILES += \ + sun/java2d/d3d/D3DPipeline.cpp \ + sun/java2d/d3d/D3DShaderGen.c \ + sun/awt/image/cvutils/img_colors.c \ + sun/windows/WBufferStrategy.cpp \ + # LIBAWT_LANG := C++ LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE @@ -450,11 +232,11 @@ ifeq ($(OPENJDK_TARGET_OS), windows) endif ifdef OPENJDK - LIBAWT_RC_FLAGS := -i "$(JDK_TOPDIR)/src/windows/resource/icons" + LIBAWT_RC_FLAGS := -i "$(JDK_TOPDIR)/src/java.base/windows/native/launcher/icons" else - LIBAWT_RC_FLAGS := -i "$(JDK_TOPDIR)/src/closed/windows/native/sun/windows" + LIBAWT_RC_FLAGS := -i "$(JDK_TOPDIR)/src/closed/java.base/windows/native/launcher/icons" endif - LIBAWT_VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/native/sun/windows/awt.rc + LIBAWT_VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/java.desktop/windows/native/libawt/sun/windows/awt.rc endif ifeq ($(MILESTONE), internal) @@ -470,7 +252,8 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBAWT, \ LIBRARY := awt, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ SRC := $(LIBAWT_DIRS), \ - INCLUDE_FILES := $(LIBAWT_FILES), \ + EXCLUDES := $(LIBAWT_EXCLUDES), \ + EXCLUDE_FILES := $(LIBAWT_EXFILES), \ LANG := $(LIBAWT_LANG), \ OPTIMIZATION := LOW, \ CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \ @@ -511,7 +294,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) $(BUILD_LIBAWT): $(BUILD_LIBMLIB_IMAGE) endif -BUILD_LIBRARIES += $(BUILD_LIBAWT) +DESKTOP_LIBRARIES += $(BUILD_LIBAWT) ########################################################################################## @@ -519,28 +302,38 @@ ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),) ifndef BUILD_HEADLESS_ONLY LIBAWT_XAWT_DIRS := \ - $(JDK_TOPDIR)/src/share/native/sun/awt/debug \ - $(JDK_TOPDIR)/src/share/native/sun/awt/utility \ - $(JDK_TOPDIR)/src/share/native/sun/font \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/font \ - $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/opengl \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/x11 \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/xawt \ + $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt_xawt \ + $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libjawt \ + $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \ + $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/utility \ + $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \ + $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/java2d/opengl \ + $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/java2d/opengl \ + $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/java2d/x11 \ + $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/awt \ + # - LIBAWT_XAWT_CFLAGS := -DXAWT -DXAWT_HACK \ + LIBAWT_XAWT_EXCLUDES := medialib + + LIBAWT_XAWT_CFLAGS := $(addprefix -I, $(shell $(FIND) $(LIBAWT_XAWT_DIRS) -type d)) \ + -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \ + -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \ + -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/include \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d \ + -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/sun/java2d \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/loops \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/pipe \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image/cvutils \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image \ + -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libsunwjdga \ + -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/font \ + $(LIBJAVA_HEADER_FLAGS) + # + + LIBAWT_XAWT_CFLAGS += -DXAWT -DXAWT_HACK \ -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \ - $(CUPS_CFLAGS) \ - $(foreach dir, $(LIBAWT_XAWT_DIRS), -I$(dir)) \ - -I$(JDK_TOPDIR)/src/share/native/sun/java2d \ - -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \ - -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \ - -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \ - -I$(JDK_TOPDIR)/src/share/native/sun/awt/image \ - -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \ - -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \ - -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga + $(CUPS_CFLAGS) ifeq ($(OPENJDK_TARGET_OS), solaris) LIBAWT_XAWT_CFLAGS += -DFUNCPROTO=15 @@ -556,63 +349,6 @@ ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),) LIBAWT_XAWT_CFLAGS += -DINTERNAL_BUILD endif - LIBAWT_XAWT_FILES := \ - XlibWrapper.c \ - XWindow.c \ - XToolkit.c \ - X11Color.c \ - X11SurfaceData.c \ - awt_GraphicsEnv.c \ - awt_InputMethod.c \ - robot_common.c \ - awt_Robot.c \ - list.c \ - multiVis.c \ - initIDs.c \ - awt_util.c \ - awt_Desktop.c \ - awt_UNIXToolkit.c \ - X11FontScaler_md.c \ - X11TextRenderer_md.c \ - fontpath.c \ - awt_Insets.c \ - awt_Event.c \ - X11Renderer.c \ - X11PMBlitLoops.c \ - OGLBlitLoops.c \ - OGLBufImgOps.c \ - OGLContext.c \ - OGLFuncs.c \ - OGLMaskBlit.c \ - OGLMaskFill.c \ - OGLPaints.c \ - OGLRenderQueue.c \ - OGLRenderer.c \ - OGLSurfaceData.c \ - OGLTextRenderer.c \ - OGLVertexCache.c \ - GLXGraphicsConfig.c \ - GLXSurfaceData.c \ - AccelGlyphCache.c \ - awt_Font.c \ - multi_font.c \ - awt_AWTEvent.c \ - awt_DrawingSurface.c \ - jawt.c \ - CUPSfuncs.c \ - debug_assert.c \ - debug_mem.c \ - debug_trace.c \ - debug_util.c \ - gnome_interface.c \ - gtk2_interface.c \ - swing_GTKEngine.c \ - swing_GTKStyle.c \ - rect.c \ - sun_awt_X11_GtkFileDialogPeer.c \ - XRSurfaceData.c \ - XRBackendNative.c - LIBAWT_XAWT_LDFLAGS_SUFFIX := $(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) -lXtst -lXi -ljava -ljvm -lc ifeq ($(OPENJDK_TARGET_OS), linux) @@ -624,7 +360,7 @@ ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),) LIBRARY := awt_xawt, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ SRC := $(LIBAWT_XAWT_DIRS), \ - INCLUDE_FILES := $(LIBAWT_XAWT_FILES), \ + EXCLUDES := $(LIBAWT_XAWT_EXCLUDES), \ LANG := C, \ OPTIMIZATION := LOW, \ CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_XAWT_CFLAGS) \ @@ -635,7 +371,7 @@ ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),) $(call SET_SHARED_LIBRARY_ORIGIN) \ $(call SET_SHARED_LIBRARY_ORIGIN,/..), \ LDFLAGS_SUFFIX := $(LIBAWT_XAWT_LDFLAGS_SUFFIX), \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=xawt.dll" \ -D "JDK_INTERNAL_NAME=xawt" \ @@ -647,40 +383,40 @@ ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),) $(BUILD_LIBAWT_XAWT): $(BUILD_LIBAWT) - BUILD_LIBRARIES += $(BUILD_LIBAWT_XAWT) + DESKTOP_LIBRARIES += $(BUILD_LIBAWT_XAWT) endif endif ########################################################################################## -LIBLCMS_DIR := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms +LIBLCMS_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/liblcms +LIBLCMS_CPPFLAGS += -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \ + $(LIBJAVA_HEADER_FLAGS) \ + # ifeq ($(USE_EXTERNAL_LCMS), true) # If we're using an external library, we'll just need the wrapper part. # By including it explicitely, all other files will be excluded. BUILD_LIBLCMS_INCLUDE_FILES := LCMS.c - BUILD_LIBLCMS_HEADERS := else BUILD_LIBLCMS_INCLUDE_FILES := # If we're using the bundled library, we'll need to include it in the # include path explicitly. Otherwise the system headers will be used. - BUILD_LIBLCMS_HEADERS := -I$(LIBLCMS_DIR) + LIBLCMS_CPPFLAGS += $(addprefix -I, $(LIBLCMS_SRC)) endif -# TODO: Update awt lib path when awt is converted $(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \ LIBRARY := lcms, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(LIBLCMS_DIR), \ + SRC := $(LIBLCMS_SRC), \ INCLUDE_FILES := $(BUILD_LIBLCMS_INCLUDE_FILES), \ LANG := C, \ OPTIMIZATION := HIGHEST, \ CFLAGS := $(filter-out -xc99=%none, $(CFLAGS_JDKLIB)) \ - $(SHARED_LIBRARY_FLAGS) \ - -I$(JDK_TOPDIR)/src/share/native/sun/java2d \ - -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \ - $(BUILD_LIBLCMS_HEADERS) \ + $(SHARED_LIBRARY_FLAGS) $(LIBLCMS_CPPFLAGS) \ $(LCMS_CFLAGS), \ CFLAGS_solaris := -xc99=no_lib, \ CFLAGS_windows := -DCMS_IS_WINDOWS_, \ @@ -693,7 +429,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \ LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm $(LCMS_LIBS), \ LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm $(LCMS_LIBS), \ LDFLAGS_SUFFIX_aix := -lm -lawt -ljava -ljvm $(LCMS_LIBS),\ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=lcms.dll" \ -D "JDK_INTERNAL_NAME=lcms" \ @@ -701,22 +437,21 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/liblcms, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) -BUILD_LIBRARIES += $(BUILD_LIBLCMS) +DESKTOP_LIBRARIES += $(BUILD_LIBLCMS) $(BUILD_LIBLCMS): $(BUILD_LIBAWT) ########################################################################################## -BUILD_LIBJAVAJPEG_DIR := $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg - ifdef OPENJDK BUILD_LIBJAVAJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers else BUILD_LIBJAVAJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers-closed - BUILD_LIBJAVAJPEG_CLOSED_SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/awt/image/jpeg - BUILD_LIBJAVAJPEG_CLOSED_INCLUDES := -I$(BUILD_LIBJAVAJPEG_CLOSED_SRC) + LIBJAVAJPEG_SRC += $(JDK_TOPDIR)/src/closed/java.desktop/share/native/libjavajpeg endif +LIBJAVAJPEG_SRC += $(JDK_TOPDIR)/src/java.desktop/share/native/libjavajpeg + BUILD_LIBJAVAJPEG_REORDER := ifeq ($(OPENJDK_TARGET_OS), solaris) ifneq ($(OPENJDK_TARGET_CPU), x86_64) @@ -749,46 +484,58 @@ ifeq ($(USE_EXTERNAL_LIBJPEG), true) else LIBJPEG_LIBS := BUILD_LIBJAVAJPEG_INCLUDE_FILES := - BUILD_LIBJAVAJPEG_HEADERS := -I$(BUILD_LIBJAVAJPEG_DIR) + BUILD_LIBJAVAJPEG_HEADERS := $(addprefix -I, $(LIBJAVAJPEG_SRC)) endif $(eval $(call SetupNativeCompilation,BUILD_LIBJAVAJPEG, \ LIBRARY := javajpeg, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(BUILD_LIBJAVAJPEG_CLOSED_SRC) \ - $(BUILD_LIBJAVAJPEG_DIR), \ + SRC := $(LIBJAVAJPEG_SRC), \ INCLUDE_FILES := $(BUILD_LIBJAVAJPEG_INCLUDE_FILES), \ LANG := C, \ OPTIMIZATION := HIGHEST, \ - CFLAGS := $(CFLAGS_JDKLIB) \ - $(BUILD_LIBJAVAJPEG_CLOSED_INCLUDES) \ - $(BUILD_LIBJAVAJPEG_HEADERS), \ + CFLAGS := $(CFLAGS_JDKLIB) $(addprefix -I, $(LIBJAVAJPEG_SRC)) \ + $(LIBJAVA_HEADER_FLAGS) \ + -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop, \ MAPFILE := $(BUILD_LIBJAVAJPEG_MAPFILE), \ LDFLAGS := $(LDFLAGS_JDKLIB) $(LIBJPEG_LIBS) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LDFLAGS_windows := $(WIN_JAVA_LIB) jvm.lib, \ LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=javajpeg.dll" \ -D "JDK_INTERNAL_NAME=javajpeg" \ -D "JDK_FTYPE=0x2L", \ REORDER := $(BUILD_LIBJAVAJPEG_REORDER), \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjpeg, \ + OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjavajpeg, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) $(BUILD_LIBJAVAJPEG): $(BUILD_LIBJAVA) -BUILD_LIBRARIES += $(BUILD_LIBJAVAJPEG) +DESKTOP_LIBRARIES += $(BUILD_LIBJAVAJPEG) ########################################################################################## +LIBFONTMANAGER_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/libfontmanager \ + $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libfontmanager +LIBFONTMANAGER_CFLAGS := \ + $(addprefix -I, $(shell $(FIND) \ + $(LIBFONTMANAGER_SRC) \ + $(JDK_TOPDIR)/src/java.desktop/share/native/libawt \ + $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt \ + $(JDK_TOPDIR)/src/java.desktop/share/native/common \ + $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common -type d)) \ + -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \ + $(LIBJAVA_HEADER_FLAGS) \ + # + ifndef OPENJDK - FONT_HEADERS := -I$(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k + LIBFONTMANAGER_CFLAGS += -I$(JDK_TOPDIR)/src/closed/java.desktop/share/native/libt2k BUILD_LIBFONTMANAGER_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libfontmanager/mapfile-vers LIBFONTMANAGER_EXCLUDE_FILES += freetypeScaler.c else - FONT_HEADERS := $(FREETYPE_CFLAGS) + LIBFONTMANAGER_CFLAGS += $(FREETYPE_CFLAGS) BUILD_LIBFONTMANAGER_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libfontmanager/mapfile-vers.openjdk BUILD_LIBFONTMANAGER_FONTLIB := $(FREETYPE_LIBS) endif @@ -799,6 +546,7 @@ ifeq ($(OPENJDK_TARGET_OS), windows) LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \ X11TextRenderer.c LIBFONTMANAGER_OPTIMIZATION := HIGHEST + LIBFONTMANAGER_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/sun/windows else ifeq ($(OPENJDK_TARGET_OS), macosx) LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \ X11TextRenderer.c \ @@ -809,19 +557,7 @@ else lcdglyph.c endif -BUILD_LIBFONTMANAGER_CFLAGS_COMMON := \ - $(FONT_HEADERS) \ - $(X_CFLAGS) \ - -DLE_STANDALONE -DHEADLESS \ - -I$(JDK_TOPDIR)/src/share/native/sun/font \ - -I$(JDK_TOPDIR)/src/share/native/sun/font/layout \ - -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \ - -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \ - -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \ - -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \ - -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \ - -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \ - -I$(JDK_TOPDIR)/src/share/native/sun/java2d +LIBFONTMANAGER_CFLAGS += $(FONT_HEADERS) $(X_CFLAGS) -DLE_STANDALONE -DHEADLESS # Turn off aliasing with GCC for ExtensionSubtables.cpp ifeq ($(OPENJDK_TARGET_OS), linux) @@ -835,16 +571,14 @@ endif $(eval $(call SetupNativeCompilation,BUILD_LIBFONTMANAGER, \ LIBRARY := fontmanager, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(JDK_TOPDIR)/src/share/native/sun/font \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/font, \ + SRC := $(LIBFONTMANAGER_SRC), \ EXCLUDE_FILES := $(LIBFONTMANAGER_EXCLUDE_FILES) \ AccelGlyphCache.c, \ LANG := C++, \ - CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBFONTMANAGER_CFLAGS_COMMON), \ - CXXFLAGS := $(CXXFLAGS_JDKLIB) $(BUILD_LIBFONTMANAGER_CFLAGS_COMMON), \ + CFLAGS := $(CFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \ + CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \ OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \ - CFLAGS_windows = -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \ - -DCC_NOEX, \ + CFLAGS_windows = -DCC_NOEX, \ MAPFILE := $(BUILD_LIBFONTMANAGER_MAPFILE), \ LDFLAGS := $(subst -Xlinker -z -Xlinker defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ @@ -857,7 +591,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBFONTMANAGER, \ -ljava -ljvm, \ LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \ $(WIN_AWT_LIB), \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=fontmanager.dll" \ -D "JDK_INTERNAL_NAME=fontmanager" \ @@ -871,41 +605,33 @@ ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris aix)) $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_XAWT) endif -BUILD_LIBRARIES += $(BUILD_LIBFONTMANAGER) +DESKTOP_LIBRARIES += $(BUILD_LIBFONTMANAGER) ########################################################################################## ifndef OPENJDK - #ifeq ($(OPENJDK_TARGET_OS), linux) - # ifeq ("$(CC_VER_MAJOR)", "3") - # OTHER_LDLIBS += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic - # endif - #endif + LIBT2K_SRC := $(JDK_TOPDIR)/src/closed/java.desktop/share/native/libt2k + LIBT2K_CFLAGS := $(addprefix -I, $(LIBT2K_SRC)) \ + -I$(JDK_TOPDIR)/src/closed/java.desktop/share/native/libt2k/t2k \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libfontmanager \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/loops \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \ + -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \ + -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjava \ + -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \ # - # The resulting size of the t2k lib file is (at least on linux) dependant on the order of - # the input .o files. Because of this the new build will differ in size to the old build. - BUILD_LIBT2K_CFLAGS_COMMON := -I$(JDK_TOPDIR)/src/share/native/sun/font \ - -I$(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k \ - -I$(JDK_TOPDIR)/src/closed/share/native/sun/font \ - -I$(JDK_TOPDIR)/src/share/share/native/sun/font \ - -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/font \ - -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \ - -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \ - -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \ - -I$(JDK_TOPDIR)/src/share/native/sun/java2d $(eval $(call SetupNativeCompilation,BUILD_LIBT2K, \ LIBRARY := t2k, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/font \ - $(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k \ - $(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k/ttHints, \ - EXCLUDE_FILES := orion.c, \ + SRC := $(LIBT2K_SRC), \ + EXCLUDE_FILES := t2k/orion.c, \ LANG := C++, \ OPTIMIZATION := HIGH, \ - CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBT2K_CFLAGS_COMMON), \ - CXXFLAGS := $(CXXFLAGS_JDKLIB) $(BUILD_LIBT2K_CFLAGS_COMMON), \ + CFLAGS := $(CFLAGS_JDKLIB) $(LIBT2K_CFLAGS), \ + CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBT2K_CFLAGS), \ CFLAGS_windows = -DCC_NOEX, \ CXXFLAGS_windows = -DCC_NOEX, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libt2k/mapfile-vers, \ @@ -914,7 +640,7 @@ ifndef OPENJDK LDFLAGS_windows := user32.lib $(JDK_OUTPUTDIR)/objs/libfontmanager/fontmanager.lib, \ LDFLAGS_SUFFIX_posix := $(LIBM) $(LIBCXX) -lfontmanager -ljava -ljvm -lc, \ LDFLAGS_SUFFIX_solaris := -lawt -lawt_xawt, \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=t2k.dll" \ -D "JDK_INTERNAL_NAME=t2k" \ @@ -925,33 +651,41 @@ ifndef OPENJDK # t2k is linked against fontmanager $(BUILD_LIBT2K): $(BUILD_LIBFONTMANAGER) - BUILD_LIBRARIES += $(BUILD_LIBT2K) + DESKTOP_LIBRARIES += $(BUILD_LIBT2K) endif ########################################################################################## ifeq ($(OPENJDK_TARGET_OS), windows) + LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libjawt + LIBJAWT_CFLAGS := -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/sun/windows \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image/cvutils \ + -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/sun/java2d/windows \ + -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \ + -I$(JDK_TOPDIR)/src/java.desktop/windows/native/include \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \ + $(LIBJAVA_HEADER_FLAGS) \ + # + ifeq ($(OPENJDK_TARGET_CPU), x86) KERNEL32_LIB := kernel32.lib endif $(eval $(call SetupNativeCompilation,BUILD_LIBJAWT, \ LIBRARY := jawt, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows, \ - INCLUDE_FILES := jawt.cpp, \ + SRC := $(LIBJAWT_SRC), \ + INCLUDE_FILES := $(LIBJAWT_INCLUDE_FILES), \ LANG := C++, \ OPTIMIZATION := LOW, \ CFLAGS := $(CXXFLAGS_JDKLIB) \ -EHsc -DUNICODE -D_UNICODE \ - -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \ - -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \ - -I$(JDK_TOPDIR)/src/share/native/sun/java2d \ - -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \ - -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/windows, \ + $(LIBJAWT_CFLAGS), \ LDFLAGS := $(LDFLAGS_JDKLIB) $(KERNEL32_LIB) $(LDFLAGS_CXX_JDK) \ advapi32.lib $(WIN_AWT_LIB), \ LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=jawt.dll" \ -D "JDK_INTERNAL_NAME=jawt" \ @@ -965,15 +699,26 @@ ifeq ($(OPENJDK_TARGET_OS), windows) $(ECHO) Copying $(@F) $(CP) $(JDK_OUTPUTDIR)/objs/libjawt/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX) $@ - BUILD_LIBRARIES += $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX) + DESKTOP_LIBRARIES += $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX) else # OPENJDK_TARGET_OS not windows ifeq ($(OPENJDK_TARGET_OS), macosx) - JAWT_FILES := jawt.m + LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/macosx/native/libjawt + else + LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libjawt + endif + LIBJAWT_CFLAGS := \ + -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/awt \ + -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \ + -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/include \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \ + $(LIBJAVA_HEADER_FLAGS) \ + # + + ifeq ($(OPENJDK_TARGET_OS), macosx) JAWT_LIBS := -lawt_lwawt else - JAWT_FILES := jawt.c JAWT_LIBS := ifneq ($(OPENJDK_TARGET_OS), solaris) JAWT_LIBS += -lawt @@ -989,14 +734,14 @@ else # OPENJDK_TARGET_OS not windows $(eval $(call SetupNativeCompilation,BUILD_LIBJAWT, \ LIBRARY := jawt, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \ - $(JDK_TOPDIR)/src/macosx/native/sun/awt, \ + SRC := $(LIBJAWT_SRC), \ INCLUDE_FILES := $(JAWT_FILES), \ LANG := C, \ OPTIMIZATION := LOW, \ - CFLAGS := $(CFLAGS_JDKLIB), \ + CFLAGS := $(CFLAGS_JDKLIB) \ + $(LIBJAWT_CFLAGS), \ CFLAGS_linux := $(HEADLESS_CFLAG), \ - CFLAGS_macosx := -I$(JDK_TOPDIR)/src/solaris/native/sun/awt, \ + CFLAGS_macosx := $(LIBJAWT_CFLAGS_macosx), \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjawt/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ @@ -1021,37 +766,40 @@ else # OPENJDK_TARGET_OS not windows endif # OPENJDK_TARGET_OS -BUILD_LIBRARIES += $(BUILD_LIBJAWT) +DESKTOP_LIBRARIES += $(BUILD_LIBJAWT) ########################################################################################## ifndef OPENJDK - BUILD_LIBKCMS_EXCLUDE_FILES := - ifeq ($(OPENJDK_TARGET_OS), windows) - BUILD_LIBKCMS_EXCLUDE_FILES += ukcpmgr.c unixmem.c - else - BUILD_LIBKCMS_EXCLUDE_FILES += cmmdll.c registry.c spxffile.c sysinfo.c winmem.c wkcpmgr.c - endif + LIBKCMS_SRC := $(JDK_TOPDIR)/src/closed/java.desktop/share/native/libkcms \ + $(JDK_TOPDIR)/src/closed/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libkcms \ + # + LIBKCMS_CFLAGS += $(addprefix -I, $(LIBKCMS_SRC)) \ + -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \ + -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjava \ + -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \ + # + LIBKCMS_VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/closed/java.desktop/windows/native/libkcms/cmm.rc - BUILD_LIBKCMS_FLAGS := $(CFLAGS_JDKLIB) + LIBKCMS_CFLAGS += $(CFLAGS_JDKLIB) ifeq ($(OPENJDK_TARGET_OS), solaris) # This particular library uses a feature called PIC_CODE_SMALL (on solaris) # implement it like this...since it's only used here - BUILD_LIBKCMS_FLAGS := $(patsubst -KPIC, -Kpic, $(BUILD_LIBKCMS_FLAGS)) + LIBKCMS_CFLAGS := $(patsubst -KPIC, -Kpic, $(LIBKCMS_CFLAGS)) else ifeq ($(OPENJDK_TARGET_CPU_ARCH), ppc) - BUILD_LIBKCMS_FLAGS := $(patsubst -fPIC, -fpic, $(BUILD_LIBKCMS_FLAGS)) + LIBKCMS_CFLAGS := $(patsubst -fPIC, -fpic, $(LIBKCMS_CFLAGS)) endif $(eval $(call SetupNativeCompilation,BUILD_LIBKCMS, \ LIBRARY := kcms, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms, \ + SRC := $(LIBKCMS_SRC), \ LANG := C, \ EXCLUDE_FILES := $(BUILD_LIBKCMS_EXCLUDE_FILES), \ OPTIMIZATION := LOW, \ - CFLAGS := $(BUILD_LIBKCMS_FLAGS) \ + CFLAGS := $(LIBKCMS_CFLAGS) \ -DJAVACMM -DFUT_CALC_EX -DNO_FUT_GCONST, \ CFLAGS_linux := -Wno-missing-field-initializers, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libkcms/mapfile-vers, \ @@ -1061,8 +809,7 @@ ifndef OPENJDK LDFLAGS_SUFFIX_solaris := -lc, \ LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib version.lib, \ LDFLAGS_SUFFIX_posix := -lm -ljava -ljvm, \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms/cmm.rc, \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms/cmm.rc, \ + VERSIONINFO_RESOURCE := $(LIBKCMS_VERSIONINFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=kcms.dll" \ -D "JDK_INTERNAL_NAME=kcms" \ @@ -1072,7 +819,7 @@ ifndef OPENJDK $(BUILD_LIBKCMS): $(BUILD_LIBJAVA) - BUILD_LIBRARIES += $(BUILD_LIBKCMS) + DESKTOP_LIBRARIES += $(BUILD_LIBKCMS) endif @@ -1092,7 +839,7 @@ ifndef OPENJDK $(eval $(call SetupNativeCompilation,BUILD_LIBSUNWJDGA, \ LIBRARY := sunwjdga, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(JDK_TOPDIR)/src/solaris/native/sun/jdga, \ + SRC := $(JDK_TOPDIR)/src/java.desktop/unix/native/libsunwjdga, \ LANG := C, \ OPTIMIZATION := LOW, \ CFLAGS := $(CFLAGS_JDKLIB) \ @@ -1106,7 +853,7 @@ ifndef OPENJDK OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsunwjdga, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) - BUILD_LIBRARIES += $(BUILD_LIBSUNWJDGA) + DESKTOP_LIBRARIES += $(BUILD_LIBSUNWJDGA) endif endif @@ -1119,58 +866,30 @@ ifeq ($(BUILD_HEADLESS), true) # Mac and Windows only use the native AWT lib, do not build libawt_headless ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx),) - LIBAWT_HEADLESS_DIRS := $(JDK_TOPDIR)/src/share/native/sun/font \ - $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \ - $(JDK_TOPDIR)/src/solaris/native/sun/font \ - $(JDK_TOPDIR)/src/solaris/native/sun/awt \ - $(JDK_TOPDIR)/src/solaris/native/sun/java2d/opengl \ - $(JDK_TOPDIR)/src/solaris/native/sun/java2d/x11 + LIBAWT_HEADLESS_DIRS := $(JDK_TOPDIR)/src/java.desktop/unix/native/libawt_headless/sun/awt \ + $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/awt \ + $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/java2d/opengl \ + $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/java2d/x11 \ + $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/java2d/opengl \ + $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \ + # - ifeq ($(OPENJDK_TARGET_OS), macosx) - LIBAWT_HEADLESS_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/font - endif - - LIBAWT_HEADLESS_CFLAGS := -DHEADLESS=true \ - -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \ - $(CUPS_CFLAGS) \ - $(X_CFLAGS) \ - -I$(JDK_TOPDIR)/src/share/native/sun/java2d \ - -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \ - -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \ - -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \ - -I$(JDK_TOPDIR)/src/share/native/sun/awt/image \ - -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \ - -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \ - -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga \ - $(foreach dir, $(LIBAWT_HEADLESS_DIRS), -I$(dir)) - - LIBAWT_HEADLESS_FILES := \ - awt_Font.c \ - HeadlessToolkit.c \ - fontpath.c \ - VDrawingArea.c \ - X11Color.c \ - X11Renderer.c \ - X11PMBlitLoops.c \ - X11SurfaceData.c \ - X11FontScaler_md.c \ - X11TextRenderer_md.c \ - OGLBlitLoops.c \ - OGLBufImgOps.c \ - OGLContext.c \ - OGLFuncs.c \ - OGLMaskBlit.c \ - OGLMaskFill.c \ - OGLPaints.c \ - OGLRenderQueue.c \ - OGLRenderer.c \ - OGLSurfaceData.c \ - OGLTextRenderer.c \ - OGLVertexCache.c \ - GLXGraphicsConfig.c \ - GLXSurfaceData.c \ - AccelGlyphCache.c \ - CUPSfuncs.c + LIBAWT_HEADLESS_EXCLUDES := medialib + LIBAWT_HEADLESS_CFLAGS := -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \ + $(addprefix -I, $(LIBAWT_HEADLESS_DIRS)) \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/loops \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image/cvutils \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/pipe \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image \ + -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/sun/java2d \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \ + -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/font \ + -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libsunwjdga/ \ + $(LIBJAVA_HEADER_FLAGS) \ + # + LIBAWT_HEADLESS_EXFILES := initIDs.c LIBAWT_HEADLESS_REORDER := ifeq ($(OPENJDK_TARGET_OS), solaris) @@ -1183,10 +902,16 @@ ifeq ($(BUILD_HEADLESS), true) LIBRARY := awt_headless, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ SRC := $(LIBAWT_HEADLESS_DIRS), \ - INCLUDE_FILES := $(LIBAWT_HEADLESS_FILES), \ + EXCLUDE_FILES := $(LIBAWT_HEADLESS_EXFILES), \ + EXCLUDES := $(LIBAWT_HEADLESS_EXCLUDES), \ LANG := C, \ OPTIMIZATION := LOW, \ - CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_HEADLESS_CFLAGS), \ + CFLAGS := $(CFLAGS_JDKLIB) \ + -DHEADLESS=true \ + -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \ + $(CUPS_CFLAGS) \ + $(X_CFLAGS) \ + $(LIBAWT_HEADLESS_CFLAGS), \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt_headless/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ @@ -1202,7 +927,7 @@ ifeq ($(BUILD_HEADLESS), true) $(BUILD_LIBAWT_HEADLESS): $(BUILD_LIBAWT) - BUILD_LIBRARIES += $(BUILD_LIBAWT_HEADLESS) + DESKTOP_LIBRARIES += $(BUILD_LIBAWT_HEADLESS) endif endif @@ -1210,51 +935,54 @@ endif ########################################################################################## ifndef BUILD_HEADLESS_ONLY + LIBSPLASHSCREEN_DIRS := \ - $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \ - $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen + $(JDK_TOPDIR)/src/java.desktop/share/native/libjavajpeg \ + $(JDK_TOPDIR)/src/java.desktop/share/native/libsplashscreen \ + # ifeq ($(USE_EXTERNAL_LIBGIF), true) GIFLIB_LDFLAGS := -lgif + LIBSPLASHSCREEN_EXCLUDES := giflib else - LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/giflib - GIFLIB_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/giflib + LIBSPLASHSCREEN_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/share/native/libsplashscreen/giflib endif ifeq ($(USE_EXTERNAL_LIBJPEG), true) LIBJPEG_LDFLAGS := -ljpeg else - LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg - LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg + LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/libjavajpeg + LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/java.desktop/share/native/libjavajpeg endif ifeq ($(USE_EXTERNAL_LIBPNG), false) - LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/libpng - LIBPNG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/libpng + LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/libsplashscreen/libpng + else + LIBSPLASHSCREEN_EXCLUDES += libpng endif ifneq ($(OPENJDK_TARGET_OS), macosx) - LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen + LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libsplashscreen else - LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen + LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/macosx/native/libsplashscreen endif - LIBSPLASHSCREEN_CFLAGS := -DSPLASHSCREEN -DPNG_NO_MMX_CODE \ - $(foreach dir, $(LIBSPLASHSCREEN_DIRS), -I$(dir)) + LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE \ + $(addprefix -I, $(LIBSPLASHSCREEN_DIRS)) \ + $(LIBJAVA_HEADER_FLAGS) \ + # ifeq ($(OPENJDK_TARGET_OS), macosx) - LIBSPLASHSCREEN_CFLAGS := -I$(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen \ - $(LIBSPLASHSCREEN_CFLAGS) LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX - LIBSPLASHSCREEN_CFLAGS += -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp + LIBSPLASHSCREEN_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp - LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS := -x objective-c -O0 - LIBSPLASHSCREEN_splashscreen_gfx_impl.c_CFLAGS := -x objective-c -O0 - LIBSPLASHSCREEN_splashscreen_gif.c_CFLAGS := -x objective-c -O0 - LIBSPLASHSCREEN_splashscreen_impl.c_CFLAGS := -x objective-c -O0 - LIBSPLASHSCREEN_splashscreen_jpeg.c_CFLAGS := -x objective-c -O0 - LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS := -x objective-c -O0 - LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS := -O0 + BUILD_LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS := -x objective-c -O0 + BUILD_LIBSPLASHSCREEN_splashscreen_gfx_impl.c_CFLAGS := -x objective-c -O0 + BUILD_LIBSPLASHSCREEN_splashscreen_gif.c_CFLAGS := -x objective-c -O0 + BUILD_LIBSPLASHSCREEN_splashscreen_impl.c_CFLAGS := -x objective-c -O0 + BUILD_LIBSPLASHSCREEN_splashscreen_jpeg.c_CFLAGS := -x objective-c -O0 + BUILD_LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS := -x objective-c -O0 + BUILD_LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS := -O0 else ifeq ($(OPENJDK_TARGET_OS), windows) LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32 @@ -1265,7 +993,7 @@ ifndef BUILD_HEADLESS_ONLY LIBSPLASHSCREEN_LDFLAGS_SUFFIX := ifneq ($(USE_EXTERNAL_LIBZ), true) - LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.8 + LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.base/share/native/libzip/zlib-1.2.8 LIBSPLASHSCREEN_CFLAGS += $(ZLIB_CPPFLAGS) endif @@ -1281,11 +1009,12 @@ ifndef BUILD_HEADLESS_ONLY LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread endif - $(eval $(call SetupNativeCompilation,LIBSPLASHSCREEN, \ + $(eval $(call SetupNativeCompilation,BUILD_LIBSPLASHSCREEN, \ LIBRARY := splashscreen, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ SRC := $(LIBSPLASHSCREEN_DIRS), \ EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \ + EXCLUDES := $(LIBSPLASHSCREEN_EXCLUDES), \ LANG := C, \ OPTIMIZATION := LOW, \ CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \ @@ -1296,7 +1025,7 @@ ifndef BUILD_HEADLESS_ONLY LDFLAGS_SUFFIX := $(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) \ $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS) $(PNG_LIBS), \ LDFLAGS_SUFFIX_solaris := -lc, \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=splashscreen.dll" \ -D "JDK_INTERNAL_NAME=splashscreen" \ @@ -1304,10 +1033,10 @@ ifndef BUILD_HEADLESS_ONLY OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsplashscreen, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) - BUILD_LIBRARIES += $(LIBSPLASHSCREEN) + DESKTOP_LIBRARIES += $(BUILD_LIBSPLASHSCREEN) ifeq ($(OPENJDK_TARGET_OS), macosx) - $(LIBSPLASHSCREEN): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)osxapp$(SHARED_LIBRARY_SUFFIX) + $(BUILD_LIBSPLASHSCREEN): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)osxapp$(SHARED_LIBRARY_SUFFIX) endif endif @@ -1316,14 +1045,13 @@ endif ifndef OPENJDK - LIBDCPR_SRC_DIRS := \ - $(JDK_TOPDIR)/src/closed/share/native/sun/dc/doe \ - $(JDK_TOPDIR)/src/closed/share/native/sun/dc/path \ - $(JDK_TOPDIR)/src/closed/share/native/sun/dc/pr \ - $(JDK_TOPDIR)/src/closed/share/native/sun/dc/util - - LIBDCPR_CFLAGS := $(foreach dir, $(LIBDCPR_SRC_DIRS), -I$(dir)) \ - -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe + LIBDCPR_SRC_DIRS := $(JDK_TOPDIR)/src/closed/java.desktop/share/native/libdcpr + LIBDCPR_CFLAGS := $(addprefix -I, $(shell $(FIND) $(LIBDCPR_SRC_DIRS) -type d)) \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/pipe \ + -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \ + -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjava \ + -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \ + # $(eval $(call SetupNativeCompilation,BUILD_LIBDCPR, \ LIBRARY := dcpr, \ @@ -1339,7 +1067,7 @@ ifndef OPENJDK LDFLAGS_SUFFIX := $(LIBM) $(LDFLAGS_JDKLIB_SUFFIX), \ LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB), \ LDFLAGS_SUFFIX_posix := -lm, \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=dcpr.dll" \ -D "JDK_INTERNAL_NAME=dcpr" \ @@ -1349,7 +1077,7 @@ ifndef OPENJDK $(BUILD_LIBDCPR): $(BUILD_LIBJAVA) - BUILD_LIBRARIES += $(BUILD_LIBDCPR) + DESKTOP_LIBRARIES += $(BUILD_LIBDCPR) endif @@ -1357,88 +1085,36 @@ endif ifeq ($(OPENJDK_TARGET_OS), macosx) - LIBAWT_LWAWT_FILES := \ - AWT_debug.m \ - ApplicationDelegate.m \ - CFRetainedResource.m \ - CGLGraphicsConfig.m \ - CGLSurfaceData.m \ - CGLLayer.m \ - CGraphicsConfig.m \ - CGraphicsDevice.m \ - CGraphicsEnv.m \ - CCharToGlyphMapper.m \ - CSystemColors.m \ - AWTFont.m \ - CGGlyphOutlines.m \ - CGGlyphImages.m \ - CoreTextSupport.m \ - AWTStrike.m \ - InitIDs.m \ - AWTEvent.m \ - AWTView.m \ - AWTWindow.m \ - AWTSurfaceLayers.m \ - CCursorManager.m \ - CClipboard.m \ - CDataTransferer.m \ - CDragSource.m \ - CDragSourceContextPeer.m \ - CDropTarget.m \ - CDropTargetContextPeer.m \ - CInputMethod.m \ - CDesktopPeer.m \ - OSVersion.m \ - DnDUtilities.m \ - CFileDialog.m \ - CImage.m \ - CMenu.m \ - CMenuBar.m \ - CMenuComponent.m \ - CMenuItem.m \ - CPopupMenu.m \ - CRobot.m \ - CTrayIcon.m \ - CWrapper.m \ - JavaAccessibilityAction.m \ - JavaAccessibilityUtilities.m \ - JavaComponentAccessibility.m \ - JavaTextAccessibility.m \ - LWCToolkit.m \ - GeomUtilities.m \ - CPrinterJob.m \ - PrintModel.m \ - PrinterSurfaceData.m \ - PrinterView.m \ - QuartzSurfaceData.m \ - QuartzRenderer.m \ - CTextPipe.m \ - ImageSurfaceData.m \ - awt_DrawingSurface.m \ - \ - OGLBlitLoops.c \ - OGLBufImgOps.c \ - OGLContext.c \ - OGLFuncs.c \ - OGLMaskBlit.c \ - OGLMaskFill.c \ - OGLPaints.c \ - OGLRenderQueue.c \ - OGLRenderer.c \ - OGLSurfaceData.c \ - OGLTextRenderer.c \ - OGLVertexCache.c \ - AccelGlyphCache.c \ - CUPSfuncs.c - - LIBAWT_LWAWT_DIRS := \ - $(JDK_TOPDIR)/src/macosx/native/sun/awt \ - $(JDK_TOPDIR)/src/macosx/native/sun/font \ - $(JDK_TOPDIR)/src/macosx/native/sun/java2d/opengl \ - $(JDK_TOPDIR)/src/solaris/native/sun/awt \ - $(JDK_TOPDIR)/src/share/native/sun/font \ - $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \ + $(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt \ + $(JDK_TOPDIR)/src/java.desktop/unix/native/common/sun/awt \ + $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \ + $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/java2d/opengl \ + # + + LIBAWT_LWAWT_CFLAGS := \ + $(addprefix -I, $(LIBAWT_LWAWT_DIRS)) \ + -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \ + -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/include \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \ + -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl \ + -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/sun/awt \ + -I$(JDK_TOPDIR)/src/java.desktop/unix/native/libawt_xawt/sun/awt \ + -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/sun/font \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d \ + -I$(JDK_TOPDIR)/src/java.desktop/unix/native/libawt/sun/java2d \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libmlib_image/ \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image/cvutils \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/loops \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/pipe \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \ + -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp \ + $(LIBJAVA_HEADER_FLAGS) \ + # + + LIBAWT_LWAWT_EXFILES := fontpath.c awt_Font.c X11Color.c initIDs.c + LIBAWT_LWAWT_EXCLUDES := $(JDK_TOPDIR)/src/java.desktop/unix/native/common/sun/awt/medialib $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_LWAWT, \ LIBRARY := awt_lwawt, \ @@ -1446,19 +1122,13 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) SRC := $(LIBAWT_LWAWT_DIRS), \ LANG := C, \ INCLUDE_FILES := $(LIBAWT_LWAWT_FILES), \ + EXCLUDE_FILES := $(LIBAWT_LWAWT_EXFILES), \ + EXCLUDES := $(LIBAWT_LWAWT_EXCLUDES), \ OPTIMIZATION := LOW, \ CFLAGS := $(CFLAGS_JDKLIB) \ $(X_CFLAGS) \ $(X_LIBS) \ - $(foreach dir, $(LIBAWT_LWAWT_DIRS), -I$(dir)) \ - -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \ - -I$(JDK_TOPDIR)/src/share/native/sun/java2d \ - -I$(JDK_TOPDIR)/src/solaris/native/sun/java2d \ - -I$(JDK_TOPDIR)/src/share/native/sun/awt/image \ - -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \ - -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \ - -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \ - -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug, \ + $(LIBAWT_LWAWT_CFLAGS), \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LDFLAGS_SUFFIX_macosx := -lawt -lmlib_image -losxapp -ljvm $(LIBM) \ @@ -1476,7 +1146,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt_lwawt, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) - BUILD_LIBRARIES += $(BUILD_LIBAWT_LWAWT) + DESKTOP_LIBRARIES += $(BUILD_LIBAWT_LWAWT) $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBAWT) @@ -1495,13 +1165,16 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) $(eval $(call SetupNativeCompilation,BUILD_LIBOSXUI, \ LIBRARY := osxui, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(JDK_TOPDIR)/src/macosx/native/com/apple/laf, \ + SRC := $(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxui, \ LANG := C, \ OPTIMIZATION := LOW, \ CFLAGS := $(CFLAGS_JDKLIB) \ - -I$(JDK_TOPDIR)/src/macosx/native/com/apple/laf \ - -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \ - -I$(JDK_TOPDIR)/src/macosx/native/sun/awt, \ + -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxui \ + -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/sun/awt \ + -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp \ + -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \ + -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjava \ + -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN) \ -Xlinker -rpath -Xlinker @loader_path, \ @@ -1515,7 +1188,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libosxui, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) - BUILD_LIBRARIES += $(BUILD_LIBOSXUI) + DESKTOP_LIBRARIES += $(BUILD_LIBOSXUI) $(BUILD_LIBOSXUI): $(BUILD_LIBAWT) diff --git a/jdk/make/lib/CoreLibraries.gmk b/jdk/make/lib/CoreLibraries.gmk index 871e95a0dff..99a0c46f114 100644 --- a/jdk/make/lib/CoreLibraries.gmk +++ b/jdk/make/lib/CoreLibraries.gmk @@ -33,15 +33,17 @@ ifneq ($(OPENJDK_TARGET_OS), solaris) BUILD_LIBFDLIBM_OPTIMIZATION := NONE endif +LIBFDLIBM_SRC := $(JDK_TOPDIR)/src/java.base/share/native/libfdlibm +LIBFDLIBM_CFLAGS := -I$(LIBFDLIBM_SRC) + ifneq ($(OPENJDK_TARGET_OS), macosx) $(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM, \ STATIC_LIBRARY := fdlibm, \ OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs, \ - SRC := $(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/src, \ + SRC := $(LIBFDLIBM_SRC), \ LANG := C, \ OPTIMIZATION := $(BUILD_LIBFDLIBM_OPTIMIZATION), \ - CFLAGS := $(CFLAGS_JDKLIB) \ - -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include, \ + CFLAGS := $(CFLAGS_JDKLIB) $(LIBFDLIBM_CFLAGS), \ CFLAGS_windows_debug := -DLOGGING, \ CFLAGS_aix := -qfloat=nomaf, \ ARFLAGS := $(ARFLAGS), \ @@ -55,10 +57,9 @@ else $(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM_MAC, \ LIBRARY := fdlibm, \ OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/libfdlibm, \ - SRC := $(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/src, \ + SRC := $(LIBFDLIBM_SRC), \ LANG := C, \ - CFLAGS := $(CFLAGS_JDKLIB) \ - -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include, \ + CFLAGS := $(CFLAGS_JDKLIB) $(LIBFDLIBM_CFLAGS), \ LDFLAGS := -nostdlib -r -arch x86_64, \ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfdlibm, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) @@ -69,8 +70,6 @@ else endif -BUILD_LIBRARIES += $(BUILD_LIBFDLIBM) - ########################################################################################## BUILD_LIBVERIFY_SRC := check_code.c check_format.c @@ -91,8 +90,7 @@ endif $(eval $(call SetupNativeCompilation,BUILD_LIBVERIFY, \ LIBRARY := verify, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(JDK_TOPDIR)/src/share/native/common, \ - INCLUDE_FILES := $(BUILD_LIBVERIFY_SRC), \ + SRC := $(JDK_TOPDIR)/src/java.base/share/native/libverify, \ LANG := C, \ OPTIMIZATION := $(LIBVERIFY_OPTIMIZATION), \ CFLAGS := $(CFLAGS_JDKLIB), \ @@ -101,7 +99,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBVERIFY, \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LDFLAGS_SUFFIX_posix := -ljvm -lc, \ LDFLAGS_SUFFIX_windows := jvm.lib, \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=verify.dll" \ -D "JDK_INTERNAL_NAME=verify" \ @@ -110,39 +108,19 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBVERIFY, \ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libverify, \ DEBUG_SYMBOLS := true)) -BUILD_LIBRARIES += $(BUILD_LIBVERIFY) +BASE_LIBRARIES += $(BUILD_LIBVERIFY) ########################################################################################## -LIBJAVA_SRC_DIRS := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/lang \ - $(JDK_TOPDIR)/src/share/native/java/lang \ - $(JDK_TOPDIR)/src/share/native/java/lang/reflect \ - $(JDK_TOPDIR)/src/share/native/java/io \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/io \ - $(JDK_TOPDIR)/src/share/native/java/nio \ - $(JDK_TOPDIR)/src/share/native/java/security \ - $(JDK_TOPDIR)/src/share/native/common \ - $(JDK_TOPDIR)/src/share/native/sun/misc \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/misc \ - $(JDK_TOPDIR)/src/share/native/sun/reflect \ - $(JDK_TOPDIR)/src/share/native/java/util \ - $(JDK_TOPDIR)/src/share/native/java/util/concurrent/atomic \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/common \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/util +LIBJAVA_SRC_DIRS := $(call FindSrcDirsForLib, java.base, java) -ifeq ($(OPENJDK_TARGET_OS), windows) - LIBJAVA_SRC_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/util/locale/provider -else ifeq ($(OPENJDK_TARGET_OS), macosx) - LIBJAVA_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/util/locale/provider +ifeq ($(OPENJDK_TARGET_OS), macosx) + LIBJAVA_EXCLUDE_FILES += $(JDK_TOPDIR)/src/java.base/unix/native/libjava/HostLocaleProviderAdapter_md.c endif -ifeq ($(OPENJDK_TARGET_OS), windows) - LIBJAVA_SRC_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/provider \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/io -endif - -LIBJAVA_CFLAGS := $(foreach dir, $(LIBJAVA_SRC_DIRS), -I$(dir)) \ - -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include \ +LIBJAVA_CFLAGS := $(addprefix -I, $(LIBJAVA_SRC_DIRS)) \ + -I$(JDK_TOPDIR)/src/java.base/share/native/libfdlibm \ + -I$(JDK_OUTPUTDIR)/gensrc_headers/java.base \ -DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"' LIBJAVA_CFLAGS += -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \ @@ -154,8 +132,6 @@ ifneq (, $(JDK_UPDATE_VERSION)) LIBJAVA_CFLAGS += -DJDK_UPDATE_VERSION='"$(JDK_UPDATE_VERSION)"' endif -LIBJAVA_EXCLUDE_FILES := check_code.c check_format.c jspawnhelper.c - ifneq ($(OPENJDK_TARGET_OS), macosx) LIBJAVA_EXCLUDE_FILES += java_props_macosx.c else @@ -163,21 +139,6 @@ else BUILD_LIBJAVA_java_props_macosx.c_CFLAGS := -x objective-c endif -ifeq ($(OPENJDK_TARGET_OS), windows) - LIBJAVA_EXCLUDE_FILES += \ - UNIXProcess_md.c \ - UnixFileSystem_md.c \ - FileSystemPreferences.c -else - LIBJAVA_EXCLUDE_FILES += \ - ProcessImpl_md.c \ - WinNTFileSystem_md.c \ - dirent_md.c \ - WindowsPreferences.c \ - sun/security/provider/WinCAPISeedGenerator.c \ - sun/io/Win32ErrorMode.c -endif - ifeq ($(OPENJDK_TARGET_OS), solaris) ifneq ($(OPENJDK_TARGET_CPU), x86_64) LIBJAVA_REORDER := $(JDK_TOPDIR)/make/mapfiles/libjava/reorder-$(OPENJDK_TARGET_CPU) @@ -209,7 +170,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJAVA, \ jvm.lib $(BUILD_LIBFDLIBM) $(WIN_VERIFY_LIB) \ shell32.lib delayimp.lib -DELAYLOAD:shell32.dll \ advapi32.lib, \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=java.dll" \ -D "JDK_INTERNAL_NAME=java" \ @@ -218,9 +179,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJAVA, \ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjava, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) -BUILD_LIBRARIES += $(BUILD_LIBJAVA) - -$(BUILD_LIBJAVA): $(LIBJLI_BINARY) +BASE_LIBRARIES += $(BUILD_LIBJAVA) $(BUILD_LIBJAVA): $(BUILD_LIBVERIFY) @@ -230,10 +189,7 @@ $(BUILD_LIBJAVA): $(BUILD_LIBFDLIBM) BUILD_LIBZIP_EXCLUDES := ifeq ($(USE_EXTERNAL_LIBZ), true) - LIBZ := -lz LIBZIP_EXCLUDES += zlib-1.2.8 -else - ZLIB_CPPFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.8 endif BUILD_LIBZIP_REORDER := @@ -252,12 +208,13 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBZIP, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ LANG := C, \ OPTIMIZATION := LOW, \ - SRC := $(JDK_TOPDIR)/src/share/native/java/util/zip, \ + SRC := $(JDK_TOPDIR)/src/java.base/share/native/libzip, \ EXCLUDES := $(LIBZIP_EXCLUDES), \ CFLAGS := $(CFLAGS_JDKLIB) \ $(ZLIB_CPPFLAGS) \ - -I$(JDK_TOPDIR)/src/share/native/java/io \ - -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/io, \ + -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \ + -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjava \ + -I$(JDK_OUTPUTDIR)/gensrc_headers/java.base, \ CFLAGS_posix := $(BUILD_LIBZIP_MMAP) -UDEBUG, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libzip/mapfile-vers, \ REORDER := $(BUILD_LIBZIP_REORDER), \ @@ -271,7 +228,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBZIP, \ LDFLAGS_SUFFIX_solaris := -ljvm -ljava $(LIBZ) -lc, \ LDFLAGS_SUFFIX_aix := -ljvm -ljava $(LIBZ),\ LDFLAGS_SUFFIX_macosx := $(LIBZ) -ljava -ljvm, \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=zip.dll" \ -D "JDK_INTERNAL_NAME=zip" \ @@ -282,77 +239,14 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBZIP, \ $(BUILD_LIBZIP): $(BUILD_LIBJAVA) -BUILD_LIBRARIES += $(BUILD_LIBZIP) +BASE_LIBRARIES += $(BUILD_LIBZIP) ########################################################################################## -ifeq ($(OPENJDK_TARGET_OS), macosx) - LIBPREF_SRC_DIRS := $(JDK_TOPDIR)/src/macosx/native/java/util/prefs -else - LIBPREF_SRC_DIRS := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/util/prefs -endif +BUILD_LIBJLI_SRC_DIRS := $(JDK_TOPDIR)/src/java.base/share/native/libjli \ + $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjli -$(eval $(call SetupNativeCompilation,BUILD_LIBPREFS, \ - LIBRARY := prefs, \ - OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(LIBPREF_SRC_DIRS), \ - LANG := C, \ - OPTIMIZATION := HIGH, \ - CFLAGS := $(CFLAGS_JDKLIB), \ - MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libprefs/mapfile-vers, \ - LDFLAGS := $(LDFLAGS_JDKLIB) \ - $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX_linux := -ljvm -ljava, \ - LDFLAGS_SUFFIX_solaris := -ljvm -ljava -lc, \ - LDFLAGS_SUFFIX_aix := -ljvm -ljava, \ - LDFLAGS_SUFFIX_windows := advapi32.lib jvm.lib $(WIN_JAVA_LIB), \ - LDFLAGS_SUFFIX_macosx := -ljvm -framework CoreFoundation -framework Foundation, \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ - RC_FLAGS := $(RC_FLAGS) \ - -D "JDK_FNAME=prefs.dll" \ - -D "JDK_INTERNAL_NAME=prefs" \ - -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libprefs, \ - DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) - -$(BUILD_LIBPREFS): $(BUILD_LIBJAVA) - -BUILD_LIBRARIES += $(BUILD_LIBPREFS) - -########################################################################################## - -$(eval $(call SetupNativeCompilation,BUILD_LIBUNPACK, \ - LIBRARY := unpack, \ - OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(JDK_TOPDIR)/src/share/native/com/sun/java/util/jar/pack, \ - EXCLUDE_FILES := main.cpp, \ - LANG := C++, \ - OPTIMIZATION := LOW, \ - CFLAGS := $(CXXFLAGS_JDKLIB) \ - -DNO_ZLIB -DUNPACK_JNI -DFULL, \ - CFLAGS_release := -DPRODUCT, \ - MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libunpack/mapfile-vers, \ - LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \ - $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_windows := -map:$(JDK_OUTPUTDIR)/objs/unpack.map -debug \ - jvm.lib $(WIN_JAVA_LIB), \ - LDFLAGS_SUFFIX_posix := -ljvm $(LIBCXX) -ljava -lc, \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libunpack, \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ - RC_FLAGS := $(RC_FLAGS) \ - -D "JDK_FNAME=unpack.dll" \ - -D "JDK_INTERNAL_NAME=unpack" \ - -D "JDK_FTYPE=0x2L", \ - DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) - -$(BUILD_LIBUNPACK): $(BUILD_LIBJAVA) - -BUILD_LIBRARIES += $(BUILD_LIBUNPACK) - -########################################################################################## - -BUILD_LIBJLI_SRC_DIRS := $(JDK_TOPDIR)/src/share/bin $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin -LIBJLI_CFLAGS := $(CFLAGS_JDKLIB) $(foreach dir, $(BUILD_LIBJLI_SRC_DIRS), -I$(dir)) +LIBJLI_CFLAGS := $(CFLAGS_JDKLIB) BUILD_LIBJLI_FILES := \ java.c \ @@ -373,8 +267,7 @@ else endif ifeq ($(OPENJDK_TARGET_OS), macosx) - LIBJLI_CFLAGS += -I$(JDK_TOPDIR)/src/macosx/bin - BUILD_LIBJLI_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/bin + BUILD_LIBJLI_SRC_DIRS += $(JDK_TOPDIR)/src/java.base/macosx/native/libjli BUILD_LIBJLI_FILES += java_md_common.c java_md_macosx.c BUILD_LIBJLI_java_md_macosx.c_CFLAGS := -x objective-c @@ -395,13 +288,15 @@ else ifneq ($(OPENJDK_TARGET_OS), macosx) # if the architecture specific ergo file exists then # use it, else use the generic definitions from ergo.c - ifneq ($(wildcard $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/$(ERGO_ARCH_FILE)), ) + ifneq ($(wildcard $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjli/$(ERGO_ARCH_FILE)), ) BUILD_LIBJLI_FILES += $(ERGO_ARCH_FILE) else # !ERGO_ARCH_FILE LIBJLI_CFLAGS += -DUSE_GENERIC_ERGO endif # ERGO_ARCH_FILE endif #WINDOWS +LIBJLI_CFLAGS += $(foreach dir, $(BUILD_LIBJLI_SRC_DIRS), -I$(dir)) + # Append defines depending on target platform LIBJLI_CFLAGS += $(OPENJDK_TARGET_CPU_JLI_CFLAGS) @@ -410,7 +305,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) endif ifneq ($(USE_EXTERNAL_LIBZ), true) - BUILD_LIBJLI_SRC_DIRS += $(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.8 + BUILD_LIBJLI_SRC_DIRS += $(JDK_TOPDIR)/src/java.base/share/native/libzip/zlib-1.2.8 LIBJLI_CFLAGS += $(ZLIB_CPPFLAGS) BUILD_LIBJLI_FILES += \ inflate.c \ @@ -460,7 +355,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJLI, \ advapi32.lib \ comctl32.lib \ user32.lib, \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=jli.dll" \ -D "JDK_INTERNAL_NAME=jli" \ @@ -468,7 +363,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJLI, \ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjli, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) -BUILD_LIBRARIES += $(BUILD_LIBJLI) +BASE_LIBRARIES += $(BUILD_LIBJLI) # On windows, the static library has the same suffix as the import library created by # with the shared library, so the static library is given a different name. No harm @@ -487,6 +382,7 @@ ifeq ($(OPENJDK_TARGET_OS), windows) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) BUILD_LIBRARIES += $(BUILD_LIBJLI_STATIC) + BASE_STATIC_LIBRARIES += $(BUILD_LIBJLI_STATIC) else ifeq ($(OPENJDK_TARGET_OS), macosx) # @@ -509,6 +405,7 @@ else ifeq ($(OPENJDK_TARGET_OS), macosx) $(call install-file) BUILD_LIBRARIES += $(JDK_OUTPUTDIR)/objs/libjli_static.a + BASE_STATIC_LIBRARIES += $(JDK_OUTPUTDIR)/objs/libjli_static.a else ifeq ($(OPENJDK_TARGET_OS), aix) # AIX also requires a static libjli because the compiler doesn't support '-rpath' @@ -523,6 +420,8 @@ else ifeq ($(OPENJDK_TARGET_OS), aix) ARFLAGS:=$(ARFLAGS),\ OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjli_static)) - BUILD_LIBRARIES += $(JDK_OUTPUTDIR)/objs/libjli_static.a + BUILD_LIBRARIES += $(BUILD_LIBJLI_STATIC) + BASE_STATIC_LIBRARIES += $(BUILD_LIBJLI_STATIC) endif + diff --git a/jdk/make/lib/Lib-java.base.gmk b/jdk/make/lib/Lib-java.base.gmk new file mode 100644 index 00000000000..cf7f663d6fa --- /dev/null +++ b/jdk/make/lib/Lib-java.base.gmk @@ -0,0 +1,36 @@ +# +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LibCommon.gmk + +include CoreLibraries.gmk +include NetworkingLibraries.gmk +include NioLibraries.gmk + +java.base: $(BASE_LIBRARIES) $(BASE_STATIC_LIBRARIES) $(NPT_LIBRARIES) + +all: java.base + +.PHONY: all java.base diff --git a/jdk/test/sun/tools/jps/jps-Vm_2.sh b/jdk/make/lib/Lib-java.desktop.gmk similarity index 67% rename from jdk/test/sun/tools/jps/jps-Vm_2.sh rename to jdk/make/lib/Lib-java.desktop.gmk index ba9fa0f81df..bdd919cfeb7 100644 --- a/jdk/test/sun/tools/jps/jps-Vm_2.sh +++ b/jdk/make/lib/Lib-java.desktop.gmk @@ -1,10 +1,12 @@ # -# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. # # This code is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -21,16 +23,14 @@ # questions. # -# @test -# @bug 4990825 -# @run shell jps-Vm_2.sh -# @summary Test that output of 'jps -Vm' shows JVM flags and main args +include LibCommon.gmk -. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh +include PlatformLibraries.gmk +include Awt2dLibraries.gmk +include SoundLibraries.gmk -setup -verify_os +java.desktop: $(DESKTOP_LIBRARIES) -JPS="${TESTJAVA}/bin/jps" +all: java.desktop -${JPS} -J-XX:+UsePerfData -J-XX:Flags=${TESTSRC}/vmflags -Vm | awk -f ${TESTSRC}/jps-Vm_Output2.awk +.PHONY: all java.desktop diff --git a/jdk/make/lib/Lib-java.instrument.gmk b/jdk/make/lib/Lib-java.instrument.gmk new file mode 100644 index 00000000000..a54a743af39 --- /dev/null +++ b/jdk/make/lib/Lib-java.instrument.gmk @@ -0,0 +1,101 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LibCommon.gmk + +################################################################################ + +LIBINSTRUMENT_SRC := $(JDK_TOPDIR)/src/java.instrument/share/native/libinstrument \ + $(JDK_TOPDIR)/src/java.instrument/$(OPENJDK_TARGET_OS_API_DIR)/native/libinstrument \ + # +LIBINSTRUMENT_CFLAGS := $(CFLAGS_JDKLIB) \ + $(addprefix -I, $(LIBINSTRUMENT_SRC)) \ + -I$(JDK_OUTPUTDIR)/gensrc_headers/java.instrument \ + -I$(JDK_TOPDIR)/src/java.base/share/native/libjli \ + -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \ + # + +LIBINSTRUMENT_LDFLAGS := +LIBINSTRUMENT_LDFLAGS_SUFFIX := + +ifeq ($(OPENJDK_TARGET_OS), windows) + LIBINSTRUMENT_LDFLAGS += $(JDK_OUTPUTDIR)/objs/jli_static.lib $(WIN_JAVA_LIB) \ + -export:Agent_OnAttach advapi32.lib + # Statically link the C runtime so that there are not dependencies on modules + # not on the search patch when invoked from the Windows system directory + # (or elsewhere). + LIBINSTRUMENT_CFLAGS := $(filter-out -MD, $(LIBINSTRUMENT_CFLAGS)) + # equivalent of strcasecmp is stricmp on Windows + LIBINSTRUMENT_CFLAGS += -Dstrcasecmp=stricmp +else + LIBINSTRUMENT_LDFLAGS_SUFFIX := -ljava +endif + +$(eval $(call SetupNativeCompilation,BUILD_LIBINSTRUMENT, \ + LIBRARY := instrument, \ + OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ + SRC := $(LIBINSTRUMENT_SRC), \ + LANG := C, \ + OPTIMIZATION := LOW, \ + CFLAGS := $(LIBINSTRUMENT_CFLAGS) $(CFLAGS_WARNINGS_ARE_ERRORS), \ + CFLAGS_debug := -DJPLIS_LOGGING, \ + CFLAGS_release := -DNO_JPLIS_LOGGING, \ + MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libinstrument/mapfile-vers, \ + LDFLAGS := $(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN) \ + $(LIBINSTRUMENT_LDFLAGS), \ + LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \ + LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \ + LDFLAGS_macosx := -Xlinker -all_load $(JDK_OUTPUTDIR)/objs/libjli_static.a \ + -framework Cocoa -framework Security -framework ApplicationServices, \ + LDFLAGS_SUFFIX := $(LIBINSTRUMENT_LDFLAGS_SUFFIX), \ + LDFLAGS_SUFFIX_macosx := -liconv $(LIBZ), \ + LDFLAGS_SUFFIX_solaris := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL) -lc, \ + LDFLAGS_SUFFIX_linux := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL), \ + LDFLAGS_SUFFIX_aix := $(LIBZ) -L$(JDK_OUTPUTDIR)/objs -ljli_static $(LIBDL),\ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ + RC_FLAGS := $(RC_FLAGS) \ + -D "JDK_FNAME=instrument.dll" \ + -D "JDK_INTERNAL_NAME=instrument" \ + -D "JDK_FTYPE=0x2L", \ + OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libinstrument, \ + DEBUG_SYMBOLS := true)) + +ifneq (, $(findstring $(OPENJDK_TARGET_OS), macosx windows aix)) + $(BUILD_LIBINSTRUMENT): $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jli_static$(STATIC_LIBRARY_SUFFIX) +else + $(BUILD_LIBINSTRUMENT): $(INSTALL_LIBRARIES_HERE)/jli/$(LIBRARY_PREFIX)jli$(SHARED_LIBRARY_SUFFIX) +endif +$(BUILD_LIBINSTRUMENT): $(BUILD_LIBJAVA) + +INSTRUMENT_LIBRARIES += $(BUILD_LIBINSTRUMENT) + +################################################################################ + +java.instrument: $(INSTRUMENT_LIBRARIES) + +all: java.instrument + +.PHONY: all java.instrument diff --git a/jdk/make/lib/Lib-java.management.gmk b/jdk/make/lib/Lib-java.management.gmk new file mode 100644 index 00000000000..f057ab052c8 --- /dev/null +++ b/jdk/make/lib/Lib-java.management.gmk @@ -0,0 +1,92 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LibCommon.gmk + +################################################################################ + +BUILD_LIBMANAGEMENT_SRC := $(JDK_TOPDIR)/src/java.management/share/native/libmanagement \ + $(JDK_TOPDIR)/src/java.management/$(OPENJDK_TARGET_OS_API_DIR)/native/libmanagement +BUILD_LIBMANAGEMENT_CFLAGS := -I$(JDK_TOPDIR)/src/java.management/share/native/include \ + $(addprefix -I,$(BUILD_LIBMANAGEMENT_SRC)) \ + -I$(JDK_OUTPUTDIR)/gensrc_headers/java.management \ + $(LIBJAVA_HEADER_FLAGS) \ + # + +BUILD_LIBMANAGEMENT_EXCLUDES := + +ifneq ($(OPENJDK_TARGET_OS), solaris) + BUILD_LIBMANAGEMENT_EXCLUDES += SolarisOperatingSystem.c +endif + +ifneq ($(OPENJDK_TARGET_OS), linux) + BUILD_LIBMANAGEMENT_EXCLUDES += LinuxOperatingSystem.c +endif + +ifneq ($(OPENJDK_TARGET_OS), macosx) + BUILD_LIBMANAGEMENT_EXCLUDES += MacosxOperatingSystem.c +endif + +LIBMANAGEMENT_OPTIMIZATION := HIGH +ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), ) + ifeq ($(ENABLE_DEBUG_SYMBOLS), true) + LIBMANAGEMENT_OPTIMIZATION := LOW + endif +endif + +$(eval $(call SetupNativeCompilation,BUILD_LIBMANAGEMENT, \ + LIBRARY := management, \ + OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ + SRC := $(BUILD_LIBMANAGEMENT_SRC), \ + EXCLUDE_FILES := $(BUILD_LIBMANAGEMENT_EXCLUDES), \ + LANG := C, \ + OPTIMIZATION := $(LIBMANAGEMENT_OPTIMIZATION), \ + CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) $(BUILD_LIBMANAGEMENT_CFLAGS), \ + MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libmanagement/mapfile-vers, \ + LDFLAGS := $(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN), \ + LDFLAGS_solaris := -lkstat, \ + LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \ + LDFLAGS_SUFFIX_windows := jvm.lib psapi.lib $(WIN_JAVA_LIB) advapi32.lib, \ + LDFLAGS_SUFFIX_aix := -lperfstat,\ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ + RC_FLAGS := $(RC_FLAGS) \ + -D "JDK_FNAME=management.dll" \ + -D "JDK_INTERNAL_NAME=management" \ + -D "JDK_FTYPE=0x2L", \ + OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libmanagement, \ + DEBUG_SYMBOLS := true)) + +$(BUILD_LIBMANAGEMENT): $(BUILD_LIBJAVA) + +MANAGEMENT_LIBRARIES += $(BUILD_LIBMANAGEMENT) + +################################################################################ + +java.management: $(MANAGEMENT_LIBRARIES) + +all: java.management + +.PHONY: all java.management diff --git a/jdk/make/lib/Lib-java.prefs.gmk b/jdk/make/lib/Lib-java.prefs.gmk new file mode 100644 index 00000000000..c034b190f41 --- /dev/null +++ b/jdk/make/lib/Lib-java.prefs.gmk @@ -0,0 +1,70 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LibCommon.gmk + +################################################################################ + +ifeq ($(OPENJDK_TARGET_OS), macosx) + LIBPREF_SRC_DIRS := $(JDK_TOPDIR)/src/java.prefs/macosx/native/libprefs +else + LIBPREF_SRC_DIRS := $(JDK_TOPDIR)/src/java.prefs/$(OPENJDK_TARGET_OS_API_DIR)/native/libprefs +endif + +$(eval $(call SetupNativeCompilation,BUILD_LIBPREFS, \ + LIBRARY := prefs, \ + OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ + SRC := $(LIBPREF_SRC_DIRS), \ + LANG := C, \ + OPTIMIZATION := HIGH, \ + CFLAGS := $(CFLAGS_JDKLIB) $(addprefix -I, $(LIBPREF_SRC_DIRS)) \ + $(LIBJAVA_HEADER_FLAGS), \ + MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libprefs/mapfile-vers, \ + LDFLAGS := $(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN), \ + LDFLAGS_SUFFIX_linux := -ljvm -ljava, \ + LDFLAGS_SUFFIX_solaris := -ljvm -ljava -lc, \ + LDFLAGS_SUFFIX_aix := -ljvm -ljava, \ + LDFLAGS_SUFFIX_windows := advapi32.lib jvm.lib $(WIN_JAVA_LIB), \ + LDFLAGS_SUFFIX_macosx := -ljvm -framework CoreFoundation -framework Foundation, \ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ + RC_FLAGS := $(RC_FLAGS) \ + -D "JDK_FNAME=prefs.dll" \ + -D "JDK_INTERNAL_NAME=prefs" \ + -D "JDK_FTYPE=0x2L", \ + OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libprefs, \ + DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) + +$(BUILD_LIBPREFS): $(BUILD_LIBJAVA) + +PREFS_LIBRARIES += $(BUILD_LIBPREFS) + +################################################################################ + +java.prefs: $(PREFS_LIBRARIES) + +all: java.prefs + +.PHONY: all java.prefs diff --git a/jdk/make/lib/Lib-java.security.jgss.gmk b/jdk/make/lib/Lib-java.security.jgss.gmk new file mode 100644 index 00000000000..d6f986628ae --- /dev/null +++ b/jdk/make/lib/Lib-java.security.jgss.gmk @@ -0,0 +1,106 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LibCommon.gmk + +################################################################################ + +ifneq ($(OPENJDK_TARGET_OS), windows) + LIBJ2GSS_SRC := $(JDK_TOPDIR)/src/java.security.jgss/share/native/libj2gss \ + $(JDK_TOPDIR)/src/java.security.jgss/$(OPENJDK_TARGET_OS_API_DIR)/native/libj2gss \ + # + + $(eval $(call SetupNativeCompilation,BUILD_LIBJ2GSS, \ + LIBRARY := j2gss, \ + OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ + SRC := $(LIBJ2GSS_SRC), \ + LANG := C, \ + OPTIMIZATION := LOW, \ + CFLAGS := $(CFLAGS_JDKLIB) $(addprefix -I, $(LIBJ2GSS_SRC)) \ + $(LIBJAVA_HEADER_FLAGS) \ + -I$(JDK_OUTPUTDIR)/gensrc_headers/java.security.jgss, \ + MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2gss/mapfile-vers, \ + LDFLAGS := $(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN), \ + LDFLAGS_SUFFIX := $(LIBDL), \ + LDFLAGS_SUFFIX_solaris := -lc, \ + OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2gss, \ + DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) + + SECURITY_KERBEROS_LIBRARIES += $(BUILD_LIBJ2GSS) +endif + +################################################################################ + +ifneq ($(BUILD_CRYPTO), no) + BUILD_LIBKRB5_NAME := + ifeq ($(OPENJDK_TARGET_OS), windows) + BUILD_LIBKRB5_NAME := w2k_lsa_auth + BUILD_LIBKRB5_SRC := $(JDK_TOPDIR)/src/java.security.jgss/$(OPENJDK_TARGET_OS_API_DIR)/native/libw2k_lsa_auth + BUILD_LIBKRB5_LIBS := advapi32.lib Secur32.lib netapi32.lib kernel32.lib user32.lib \ + gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib \ + ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib + else ifeq ($(OPENJDK_TARGET_OS), macosx) + BUILD_LIBKRB5_NAME := osxkrb5 + BUILD_LIBKRB5_SRC := $(JDK_TOPDIR)/src/java.security.jgss/macosx/native/libosxkrb5 + BUILD_LIBKRB5_LIBS := \ + -framework JavaNativeFoundation \ + -framework Cocoa \ + -framework SystemConfiguration \ + -framework Kerberos + endif + + ifneq ($(BUILD_LIBKRB5_NAME), ) + $(eval $(call SetupNativeCompilation,BUILD_LIBKRB5, \ + LIBRARY := $(BUILD_LIBKRB5_NAME), \ + OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ + SRC := $(BUILD_LIBKRB5_SRC), \ + LANG := C, \ + OPTIMIZATION := LOW, \ + CFLAGS := $(CFLAGS_JDKLIB) \ + $(addprefix -I, $(BUILD_LIBKRB5_SRC)) \ + -I$(JDK_OUTPUTDIR)/gensrc_headers/java.security.jgss, \ + LDFLAGS := $(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN), \ + LDFLAGS_SUFFIX := $(BUILD_LIBKRB5_LIBS), \ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ + RC_FLAGS := $(RC_FLAGS) \ + -D "JDK_FNAME=$(BUILD_LIBKRB5_NAME).dll" \ + -D "JDK_INTERNAL_NAME=$(BUILD_LIBKRB5_NAME)" \ + -D "JDK_FTYPE=0x2L", \ + OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libkrb5, \ + DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) + + SECURITY_KERBEROS_LIBRARIES += $(BUILD_LIBKRB5) + endif +endif + +################################################################################ + +java.security.jgss: $(SECURITY_KERBEROS_LIBRARIES) + +all: java.security.jgss + +.PHONY: all java.security.jgss diff --git a/jdk/make/lib/Lib-java.smartcardio.gmk b/jdk/make/lib/Lib-java.smartcardio.gmk new file mode 100644 index 00000000000..7b7be4510b7 --- /dev/null +++ b/jdk/make/lib/Lib-java.smartcardio.gmk @@ -0,0 +1,66 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LibCommon.gmk + +################################################################################ + +LIBJ2PCSC_SRC := $(JDK_TOPDIR)/src/java.smartcardio/share/native/libj2pcsc \ + $(JDK_TOPDIR)/src/java.smartcardio/$(OPENJDK_TARGET_OS_API_DIR)/native/libj2pcsc +LIBJ2PCSC_CPPFLAGS := $(addprefix -I,$(LIBJ2PCSC_SRC)) \ + -I$(JDK_TOPDIR)/src/java.smartcardio/$(OPENJDK_TARGET_OS_API_DIR)/native/libj2pcsc/MUSCLE \ + -I$(JDK_OUTPUTDIR)/gensrc_headers/java.smartcardio + +$(eval $(call SetupNativeCompilation,BUILD_LIBJ2PCSC, \ + LIBRARY := j2pcsc, \ + OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ + SRC := $(LIBJ2PCSC_SRC), \ + LANG := C, \ + CFLAGS_posix := -D__sun_jdk, \ + OPTIMIZATION := LOW, \ + CFLAGS := $(CFLAGS_JDKLIB) $(LIBJ2PCSC_CPPFLAGS), \ + MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2pcsc/mapfile-vers, \ + LDFLAGS := $(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN), \ + LDFLAGS_SUFFIX_posix := $(LIBDL), \ + LDFLAGS_SUFFIX_windows := winscard.lib, \ + LDFLAGS_SUFFIX_solaris := -lc, \ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ + RC_FLAGS := $(RC_FLAGS) \ + -D "JDK_FNAME=j2pcsc.dll" \ + -D "JDK_INTERNAL_NAME=j2pcsc" \ + -D "JDK_FTYPE=0x2L", \ + OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2pcsc, \ + DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) + +SECURITY_SMARTCARDIO_LIBRARIES += $(BUILD_LIBJ2PCSC) + +################################################################################ + +java.smartcardio: $(SECURITY_SMARTCARDIO_LIBRARIES) + +all: java.smartcardio + +.PHONY: all java.smartcardio diff --git a/jdk/make/lib/Lib-jdk.attach.gmk b/jdk/make/lib/Lib-jdk.attach.gmk new file mode 100644 index 00000000000..65b7b1397d7 --- /dev/null +++ b/jdk/make/lib/Lib-jdk.attach.gmk @@ -0,0 +1,88 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LibCommon.gmk + +################################################################################ + +ifeq ($(OPENJDK_TARGET_OS), aix) + LIBATTACH_OS_API_DIR := aix +else + LIBATTACH_OS_API_DIR := $(OPENJDK_TARGET_OS_API_DIR) +endif + +LIBATTACH_SRC := $(JDK_TOPDIR)/src/jdk.attach/$(LIBATTACH_OS_API_DIR)/native/libattach + +LIBATTACH_EXCLUDE_FILES := +ifneq ($(OPENJDK_TARGET_OS), solaris) + LIBATTACH_EXCLUDE_FILES += SolarisVirtualMachine.c +endif +ifneq ($(OPENJDK_TARGET_OS), linux) + LIBATTACH_EXCLUDE_FILES += LinuxVirtualMachine.c +endif +ifneq ($(OPENJDK_TARGET_OS), macosx) + LIBATTACH_EXCLUDE_FILES += BsdVirtualMachine.c +endif +ifneq ($(OPENJDK_TARGET_OS),aix) + LIBATTACH_EXCLUDE_FILES += AixVirtualMachine.c +endif + +$(eval $(call SetupNativeCompilation,BUILD_LIBATTACH, \ + LIBRARY := attach, \ + OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ + SRC := $(LIBATTACH_SRC), \ + EXCLUDE_FILES := $(LIBATTACH_EXCLUDE_FILES), \ + LANG := C, \ + OPTIMIZATION := LOW, \ + CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) \ + -I$(JDK_OUTPUTDIR)/gensrc_headers/jdk.attach \ + $(LIBJAVA_HEADER_FLAGS), \ + CFLAGS_windows := /Gy, \ + MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libattach/mapfile-$(OPENJDK_TARGET_OS), \ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ + RC_FLAGS := $(RC_FLAGS) \ + -D "JDK_FNAME=attach.dll" \ + -D "JDK_INTERNAL_NAME=attach" \ + -D "JDK_FTYPE=0x2L", \ + LDFLAGS := $(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN), \ + LDFLAGS_solaris := -ldoor, \ + LDFLAGS_windows := /ORDER:@$(JDK_TOPDIR)/make/mapfiles/libattach/reorder-windows-$(OPENJDK_TARGET_CPU), \ + LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \ + LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib psapi.lib, \ + OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libattach, \ + DEBUG_SYMBOLS := true)) + +$(BUILD_LIBATTACH): $(BUILD_LIBJAVA) + +ATTACH_LIBRARIES += $(BUILD_LIBATTACH) + +################################################################################ + +jdk.attach: $(ATTACH_LIBRARIES) + +all: jdk.attach + +.PHONY: all jdk.attach diff --git a/jdk/make/lib/Lib-jdk.crypto.ec.gmk b/jdk/make/lib/Lib-jdk.crypto.ec.gmk new file mode 100644 index 00000000000..94267bf0d2a --- /dev/null +++ b/jdk/make/lib/Lib-jdk.crypto.ec.gmk @@ -0,0 +1,80 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LibCommon.gmk + +################################################################################ + +ifeq ($(ENABLE_INTREE_EC), yes) + + LIBSUNEC_SRC := $(JDK_TOPDIR)/src/jdk.crypto.ec/share/native/libsunec + BUILD_LIBSUNEC_FLAGS := $(addprefix -I, $(SUNEC_SRC)) + + # + # On sol-sparc...all libraries are compiled with -xregs=no%appl + # (set in CFLAGS_REQUIRED_sparc) + # + # except!!! libsunec.so + # + ECC_JNI_SOLSPARC_FILTER := + ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc) + ECC_JNI_SOLSPARC_FILTER := -xregs=no%appl + endif + + $(eval $(call SetupNativeCompilation,BUILD_LIBSUNEC, \ + LIBRARY := sunec, \ + OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ + SRC := $(LIBSUNEC_SRC), \ + LANG := C++, \ + OPTIMIZATION := LOW, \ + CFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CFLAGS_JDKLIB)) \ + $(BUILD_LIBSUNEC_FLAGS) \ + -DMP_API_COMPATIBLE -DNSS_ECC_MORE_THAN_SUITE_B, \ + CXXFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CXXFLAGS_JDKLIB)) \ + $(BUILD_LIBSUNEC_FLAGS), \ + MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsunec/mapfile-vers, \ + LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \ + LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \ + LDFLAGS_SUFFIX := $(LIBCXX), \ + LDFLAGS_SUFFIX_linux := -lc, \ + LDFLAGS_SUFFIX_solaris := -lc, \ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ + RC_FLAGS := $(RC_FLAGS) \ + -D "JDK_FNAME=sunec.dll" \ + -D "JDK_INTERNAL_NAME=sunec" \ + -D "JDK_FTYPE=0x2L", \ + OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsunec, \ + DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) + + SECURITY_SUNEC_LIBRARIES += $(BUILD_LIBSUNEC) +endif + +################################################################################ + +jdk.crypto.ec: $(SECURITY_SUNEC_LIBRARIES) + +all: jdk.crypto.ec + +.PHONY: all jdk.crypto.ec diff --git a/jdk/make/lib/Lib-jdk.crypto.mscapi.gmk b/jdk/make/lib/Lib-jdk.crypto.mscapi.gmk new file mode 100644 index 00000000000..a1e5fc0b15e --- /dev/null +++ b/jdk/make/lib/Lib-jdk.crypto.mscapi.gmk @@ -0,0 +1,62 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LibCommon.gmk + +################################################################################ + +ifeq ($(OPENJDK_TARGET_OS), windows) + + LIBSUNMSCAPI_SRC := $(JDK_TOPDIR)/src/jdk.crypto.mscapi/$(OPENJDK_TARGET_OS_API_DIR)/native/libsunmscapi + + $(eval $(call SetupNativeCompilation,BUILD_LIBSUNMSCAPI, \ + LIBRARY := sunmscapi, \ + OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ + SRC := $(LIBSUNMSCAPI_SRC), \ + LANG := C++, \ + OPTIMIZATION := LOW, \ + CFLAGS := $(CFLAGS_JDKLIB) \ + -I$(LIBSUNMSCAPI_SRC), \ + LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \ + $(call SET_SHARED_LIBRARY_ORIGIN), \ + LDFLAGS_SUFFIX := Crypt32.Lib advapi32.lib, \ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ + RC_FLAGS := $(RC_FLAGS) \ + -D "JDK_FNAME=sunmscapi.dll" \ + -D "JDK_INTERNAL_NAME=sunmscapi" \ + -D "JDK_FTYPE=0x2L", \ + OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsunmscapi, \ + DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) + + SECURITY_MSCAPI_LIBRARIES += $(BUILD_LIBSUNMSCAPI) +endif + +################################################################################ + +jdk.crypto.mscapi: $(SECURITY_MSCAPI_LIBRARIES) + +all: jdk.crypto.mscapi + +.PHONY: all jdk.crypto.mscapi diff --git a/jdk/make/lib/Lib-jdk.crypto.pkcs11.gmk b/jdk/make/lib/Lib-jdk.crypto.pkcs11.gmk new file mode 100644 index 00000000000..fd35a9d5f9b --- /dev/null +++ b/jdk/make/lib/Lib-jdk.crypto.pkcs11.gmk @@ -0,0 +1,63 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LibCommon.gmk + +################################################################################ + +LIBJ2PKCS11_SRC := $(JDK_TOPDIR)/src/jdk.crypto.pkcs11/share/native/libj2pkcs11 \ + $(JDK_TOPDIR)/src/jdk.crypto.pkcs11/$(OPENJDK_TARGET_OS_API_DIR)/native/libj2pkcs11 + +$(eval $(call SetupNativeCompilation,BUILD_LIBJ2PKCS11, \ + LIBRARY := j2pkcs11, \ + OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ + SRC := $(LIBJ2PKCS11_SRC), \ + LANG := C, \ + OPTIMIZATION := LOW, \ + CFLAGS := $(CFLAGS_JDKLIB) $(addprefix -I, $(LIBJ2PKCS11_SRC)) \ + $(LIBJAVA_HEADER_FLAGS) \ + -I$(JDK_OUTPUTDIR)/gensrc_headers/jdk.crypto.pkcs11, \ + MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2pkcs11/mapfile-vers, \ + LDFLAGS := $(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN), \ + LDFLAGS_SUFFIX_posix := $(LIBDL), \ + LDFLAGS_SUFFIX_solaris := -lc, \ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ + RC_FLAGS := $(RC_FLAGS) \ + -D "JDK_FNAME=j2pkcs11.dll" \ + -D "JDK_INTERNAL_NAME=j2pkcs11" \ + -D "JDK_FTYPE=0x2L", \ + OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2pkcs11, \ + DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) + +SECURITY_PKCS11_LIBRARIES += $(BUILD_LIBJ2PKCS11) + +################################################################################ + +jdk.crypto.pkcs11: $(SECURITY_PKCS11_LIBRARIES) + +all: jdk.crypto.pkcs11 + +.PHONY: all jdk.crypto.pkcs11 diff --git a/jdk/make/lib/Lib-jdk.deploy.osx.gmk b/jdk/make/lib/Lib-jdk.deploy.osx.gmk new file mode 100644 index 00000000000..3b209bf8101 --- /dev/null +++ b/jdk/make/lib/Lib-jdk.deploy.osx.gmk @@ -0,0 +1,102 @@ +# +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LibCommon.gmk + +ifeq ($(OPENJDK_TARGET_OS), macosx) + + ################################################################################ + + LIBAPPLESCRIPTENGINE_SRC := $(JDK_TOPDIR)/src/jdk.deploy.osx/macosx/native/libapplescriptengine + + $(eval $(call SetupNativeCompilation,BUILD_LIBAPPLESCRIPTENGINE, \ + LIBRARY := AppleScriptEngine, \ + OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ + SRC := $(LIBAPPLESCRIPTENGINE_SRC), \ + LANG := C, \ + OPTIMIZATION := LOW, \ + CFLAGS := $(CFLAGS_JDKLIB) \ + -I$(LIBAPPLESCRIPTENGINE_SRC) \ + -I$(JDK_OUTPUTDIR)/gensrc_headers/jdk.deploy.osx, \ + LDFLAGS := $(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN), \ + LDFLAGS_SUFFIX := -framework Cocoa \ + -framework Carbon \ + -framework JavaNativeFoundation \ + $(LDFLAGS_JDKLIB_SUFFIX), \ + OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libAppleScriptEngine, \ + DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) + + $(BUILD_LIBAPPLESCRIPTENGINE): $(BUILD_LIBJAVA) + + DEPLOY_OSX_LIBRARIES += $(BUILD_LIBAPPLESCRIPTENGINE) + + ################################################################################ + + LIBOSX_DIRS := $(JDK_TOPDIR)/src/jdk.deploy.osx/macosx/native/libosx + LIBOSX_CFLAGS := -I$(LIBOSX_DIRS) \ + -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp \ + $(LIBJAVA_HEADER_FLAGS) \ + -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \ + -I$(JDK_OUTPUTDIR)/gensrc_headers/jdk.deploy.osx \ + # + + $(eval $(call SetupNativeCompilation,BUILD_LIBOSX, \ + LIBRARY := osx, \ + OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ + SRC := $(LIBOSX_DIRS), \ + LANG := C, \ + OPTIMIZATION := LOW, \ + CFLAGS := $(CFLAGS_JDKLIB) \ + $(LIBOSX_CFLAGS), \ + LDFLAGS := $(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN), \ + LDFLAGS_SUFFIX_macosx := \ + -losxapp \ + -framework Cocoa \ + -framework ApplicationServices \ + -framework JavaNativeFoundation \ + -framework JavaRuntimeSupport \ + -framework Security \ + -framework SystemConfiguration \ + $(LDFLAGS_JDKLIB_SUFFIX), \ + OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libosx, \ + DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) + + DEPLOY_OSX_LIBRARIES += $(BUILD_LIBOSX) + + $(BUILD_LIBOSX): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)osxapp$(SHARED_LIBRARY_SUFFIX) + + $(BUILD_LIBOSX): $(BUILD_LIBJAVA) + + ################################################################################ + +endif + +jdk.deploy.osx: $(DEPLOY_OSX_LIBRARIES) + +all: jdk.deploy.osx + +.PHONY: all jdk.deploy.osx diff --git a/jdk/make/lib/Lib-jdk.hprof.agent.gmk b/jdk/make/lib/Lib-jdk.hprof.agent.gmk new file mode 100644 index 00000000000..7b7ef69b2e0 --- /dev/null +++ b/jdk/make/lib/Lib-jdk.hprof.agent.gmk @@ -0,0 +1,102 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LibCommon.gmk + +################################################################################ + +BUILD_LIBHPROF_SRC := $(JDK_TOPDIR)/src/demo/share/jvmti/hprof \ + $(JDK_TOPDIR)/src/demo/$(OPENJDK_TARGET_OS_API_DIR)/jvmti/hprof +BUILD_LIBHPROF_CFLAGS := $(addprefix -I, $(BUILD_LIBHPROF_SRC)) \ + -I$(JDK_TOPDIR)/src/demo/share/jvmti/java_crw_demo + +BUILD_LIBHPROF_LDFLAGS := + +LIBHPROF_OPTIMIZATION := HIGHEST +ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), ) + ifeq ($(ENABLE_DEBUG_SYMBOLS), true) + LIBHPROF_OPTIMIZATION := LOW + endif +endif + +$(eval $(call SetupNativeCompilation,BUILD_LIBHPROF, \ + LIBRARY := hprof, \ + OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ + SRC := $(BUILD_LIBHPROF_SRC), \ + LANG := C, \ + OPTIMIZATION := $(LIBHPROF_OPTIMIZATION), \ + CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) \ + $(BUILD_LIBHPROF_CFLAGS), \ + CFLAGS_debug := -DHPROF_LOGGING, \ + MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libhprof/mapfile-vers, \ + LDFLAGS := $(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN), \ + LDFLAGS_windows := wsock32.lib winmm.lib advapi32.lib, \ + LDFLAGS_SUFFIX_linux := $(LIBDL), \ + LDFLAGS_SUFFIX_macosx := $(LIBDL), \ + LDFLAGS_SUFFIX_solaris := -lsocket -lnsl $(LIBDL) -lc, \ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ + RC_FLAGS := $(RC_FLAGS) \ + -D "JDK_FNAME=hprof.dll" \ + -D "JDK_INTERNAL_NAME=hprof" \ + -D "JDK_FTYPE=0x2L", \ + OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libhprof_jvmti, \ + DEBUG_SYMBOLS := true)) + +HPROF_LIBRARIES += $(BUILD_LIBHPROF) + +################################################################################ + +LIBJAVA_CRW_DEMO_SRC := $(JDK_TOPDIR)/src/demo/share/jvmti/java_crw_demo + +$(eval $(call SetupNativeCompilation,BUILD_LIBJAVA_CRW_DEMO, \ + LIBRARY := java_crw_demo, \ + OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ + SRC := $(LIBJAVA_CRW_DEMO_SRC), \ + LANG := C, \ + OPTIMIZATION := LOW, \ + CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) \ + $(addprefix -I, $(LIBJAVA_CRW_DEMO_SRC)), \ + MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjava_crw_demo/mapfile-vers, \ + LDFLAGS := $(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN), \ + LDFLAGS_SUFFIX_solaris := -lc, \ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ + RC_FLAGS := $(RC_FLAGS) \ + -D "JDK_FNAME=java_crw_demo.dll" \ + -D "JDK_INTERNAL_NAME=java_crw_demo" \ + -D "JDK_FTYPE=0x2L", \ + OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjava_crw_demo, \ + DEBUG_SYMBOLS := true)) + +CRW_LIBRARIES += $(BUILD_LIBJAVA_CRW_DEMO) + +################################################################################ + +jdk.hprof.agent: $(HPROF_LIBRARIES) $(CRW_LIBRARIES) + +all: jdk.hprof.agent + +.PHONY: all jdk.hprof.agent diff --git a/jdk/make/lib/Lib-jdk.jdi.gmk b/jdk/make/lib/Lib-jdk.jdi.gmk new file mode 100644 index 00000000000..8dc731bbf6c --- /dev/null +++ b/jdk/make/lib/Lib-jdk.jdi.gmk @@ -0,0 +1,71 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LibCommon.gmk + +################################################################################ + +ifeq ($(OPENJDK_TARGET_OS), windows) + + LIBDT_SHMEM_SRC := $(JDK_TOPDIR)/src/jdk.jdi/share/native/libdt_shmem \ + $(JDK_TOPDIR)/src/jdk.jdi/$(OPENJDK_TARGET_OS_API_DIR)/native/libdt_shmem \ + # + LIBDT_SHMEM_CPPFLAGS := -I$(INCLUDEDIR) -I$(JDK_OUTPUTDIR)/include/$(OPENJDK_TARGET_OS) \ + $(addprefix -I, $(LIBDT_SHMEM_SRC)) \ + -I$(JDK_TOPDIR)/src/jdk.jdwp.agent/share/native/libjdwp/export \ + -I$(JDK_TOPDIR)/src/jdk.jdwp.agent/share/native/include \ + -I$(JDK_OUTPUTDIR)/gensrc_headers/jdk.jdi \ + # + + $(eval $(call SetupNativeCompilation,BUILD_LIBDT_SHMEM, \ + LIBRARY := dt_shmem, \ + OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ + SRC := $(LIBDT_SHMEM_SRC), \ + LANG := C, \ + OPTIMIZATION := LOW, \ + CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) -DUSE_MMAP \ + $(LIBDT_SHMEM_CPPFLAGS), \ + LDFLAGS := $(LDFLAGS_JDKLIB), \ + LDFLAGS_windows := -export:jdwpTransport_OnLoad, \ + LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ + RC_FLAGS := $(RC_FLAGS) \ + -D "JDK_FNAME=dt_shmem.dll" \ + -D "JDK_INTERNAL_NAME=dt_shmem" \ + -D "JDK_FTYPE=0x2L", \ + OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libdt_shmem, \ + DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) + + JDI_TRANSPORT_LIBRARIES += $(BUILD_LIBDT_SHMEM) + +endif # OPENJDK_TARGET_OS + +################################################################################ + +jdk.jdi: $(JDI_TRANSPORT_LIBRARIES) + +all: jdk.jdi + +.PHONY: all jdk.jdi diff --git a/jdk/make/lib/Lib-jdk.jdwp.agent.gmk b/jdk/make/lib/Lib-jdk.jdwp.agent.gmk new file mode 100644 index 00000000000..7b13248a9be --- /dev/null +++ b/jdk/make/lib/Lib-jdk.jdwp.agent.gmk @@ -0,0 +1,110 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LibCommon.gmk + +################################################################################ + +LIBDT_SOCKET_SRC := $(JDK_TOPDIR)/src/jdk.jdwp.agent/share/native/libdt_socket \ + $(JDK_TOPDIR)/src/jdk.jdwp.agent/$(OPENJDK_TARGET_OS_API_DIR)/native/libdt_socket +LIBDT_SOCKET_CPPFLAGS := \ + $(addprefix -I, $(LIBDT_SOCKET_SRC)) \ + -I$(JDK_TOPDIR)/src/jdk.jdwp.agent/share/native/libjdwp/export \ + -I$(JDK_TOPDIR)/src/jdk.jdwp.agent/share/native/libjdwp \ + -I$(JDK_TOPDIR)/src/jdk.jdwp.agent/share/native/include \ + # + +$(eval $(call SetupNativeCompilation,BUILD_LIBDT_SOCKET, \ + LIBRARY := dt_socket, \ + OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ + SRC := $(LIBDT_SOCKET_SRC), \ + LANG := C, \ + OPTIMIZATION := LOW, \ + CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_CFLAGS_WARNINGS_ARE_ERRORS) -DUSE_MMAP \ + $(LIBDT_SOCKET_CPPFLAGS), \ + MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libdt_socket/mapfile-vers, \ + LDFLAGS := $(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN), \ + LDFLAGS_SUFFIX_linux := -lpthread, \ + LDFLAGS_SUFFIX_solaris := -lnsl -lsocket -lc, \ + LDFLAGS_SUFFIX_windows := $(LDFLAGS_JDKLIB_SUFFIX) -export:jdwpTransport_OnLoad ws2_32.lib, \ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ + RC_FLAGS := $(RC_FLAGS) \ + -D "JDK_FNAME=dt_socket.dll" \ + -D "JDK_INTERNAL_NAME=dt_socket" \ + -D "JDK_FTYPE=0x2L", \ + OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libdt_socket, \ + DEBUG_SYMBOLS := true)) + +$(BUILD_LIBDT_SOCKET): $(BUILD_LIBJAVA) + +# Include socket transport with JDWP agent to allow for remote debugging +JDWP_LIBRARIES += $(BUILD_LIBDT_SOCKET) + +################################################################################ + +LIBJDWP_SRC := $(JDK_TOPDIR)/src/jdk.jdwp.agent/share/native/libjdwp \ + $(JDK_TOPDIR)/src/jdk.jdwp.agent/$(OPENJDK_TARGET_OS_API_DIR)/native/libjdwp +LIBJDWP_CPPFLAGS := \ + -I$(JDK_TOPDIR)/src/jdk.jdwp.agent/share/native/libjdwp/export \ + -I$(JDK_TOPDIR)/src/jdk.jdwp.agent/share/native/include \ + $(addprefix -I, $(LIBJDWP_SRC)) + +# JDWP_LOGGING causes log messages to be compiled into the library. +$(eval $(call SetupNativeCompilation,BUILD_LIBJDWP, \ + LIBRARY := jdwp, \ + OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ + SRC := $(LIBJDWP_SRC), \ + LANG := C, \ + OPTIMIZATION := LOW, \ + CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) -DJDWP_LOGGING \ + $(LIBJDWP_CPPFLAGS) \ + -I$(JDK_OUTPUTDIR)/gensrc_jdwp_headers, \ + MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjdwp/mapfile-vers, \ + LDFLAGS := $(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN), \ + LDFLAGS_SUFFIX_linux := $(LIBDL), \ + LDFLAGS_SUFFIX_solaris := $(LIBDL) -lc, \ + LDFLAGS_SUFFIX_windows := $(LDFLAGS_JDKLIB_SUFFIX), \ + LDFLAGS_SUFFIX_macosx := -liconv, \ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ + RC_FLAGS := $(RC_FLAGS) \ + -D "JDK_FNAME=jdwp.dll" \ + -D "JDK_INTERNAL_NAME=jdwp" \ + -D "JDK_FTYPE=0x2L", \ + OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjdwp, \ + DEBUG_SYMBOLS := true)) + +$(BUILD_LIBJDWP): $(BUILD_LIBJAVA) + +JDWP_LIBRARIES += $(BUILD_LIBJDWP) + +################################################################################ + +jdk.jdwp.agent: $(JDWP_LIBRARIES) + +all: jdk.jdwp.agent + +.PHONY: all jdk.jdwp.agent diff --git a/jdk/make/lib/Lib-jdk.runtime.gmk b/jdk/make/lib/Lib-jdk.runtime.gmk new file mode 100644 index 00000000000..3ffaa72570a --- /dev/null +++ b/jdk/make/lib/Lib-jdk.runtime.gmk @@ -0,0 +1,101 @@ +# +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LibCommon.gmk + +################################################################################ + +$(eval $(call SetupNativeCompilation,BUILD_LIBUNPACK, \ + LIBRARY := unpack, \ + OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ + SRC := $(JDK_TOPDIR)/src/jdk.runtime/share/native/libunpack \ + $(JDK_TOPDIR)/src/jdk.runtime/share/native/common-unpack, \ + LANG := C++, \ + OPTIMIZATION := LOW, \ + CFLAGS := $(CXXFLAGS_JDKLIB) \ + -DNO_ZLIB -DUNPACK_JNI -DFULL \ + -I$(JDK_OUTPUTDIR)/gensrc_headers/java.base \ + -I$(JDK_TOPDIR)/src/jdk.runtime/share/native/common-unpack \ + $(LIBJAVA_HEADER_FLAGS), \ + CFLAGS_release := -DPRODUCT, \ + MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libunpack/mapfile-vers, \ + LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \ + $(call SET_SHARED_LIBRARY_ORIGIN), \ + LDFLAGS_windows := -map:$(JDK_OUTPUTDIR)/objs/unpack.map -debug \ + jvm.lib $(WIN_JAVA_LIB), \ + LDFLAGS_SUFFIX_posix := -ljvm $(LIBCXX) -ljava -lc, \ + OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libunpack, \ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ + RC_FLAGS := $(RC_FLAGS) \ + -D "JDK_FNAME=unpack.dll" \ + -D "JDK_INTERNAL_NAME=unpack" \ + -D "JDK_FTYPE=0x2L", \ + DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) + +$(BUILD_LIBUNPACK): $(BUILD_LIBJAVA) + +UNPACK_LIBRARIES += $(BUILD_LIBUNPACK) + +################################################################################ + +LIBJSDT_SRC := $(JDK_TOPDIR)/src/jdk.runtime/share/native/libjsdt \ + $(JDK_TOPDIR)/src/jdk.runtime/$(OPENJDK_TARGET_OS_API_DIR)/native/libjsdt + +$(eval $(call SetupNativeCompilation,BUILD_LIBJSDT, \ + LIBRARY := jsdt, \ + OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ + SRC := $(LIBJSDT_SRC), \ + LANG := C, \ + OPTIMIZATION := LOW, \ + CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) \ + $(addprefix -I, $(LIBJSDT_SRC)) \ + $(LIBJAVA_HEADER_FLAGS) \ + -I$(JDK_OUTPUTDIR)/gensrc_headers/jdk.runtime, \ + MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjsdt/mapfile-vers, \ + LDFLAGS := $(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN), \ + LDFLAGS_SUFFIX_linux := $(LIBDL), \ + LDFLAGS_SUFFIX_windows := $(LDFLAGS_JDKLIB_SUFFIX) $(LIBDL), \ + LDFLAGS_SUFFIX_macosx := $(LIBDL), \ + LDFLAGS_SUFFIX_solaris := -lc, \ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ + RC_FLAGS := $(RC_FLAGS) \ + -D "JDK_FNAME=jsdt.dll" \ + -D "JDK_INTERNAL_NAME=jsdt" \ + -D "JDK_FTYPE=0x2L", \ + OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjsdt, \ + DEBUG_SYMBOLS := true)) + +$(BUILD_LIBJSDT): $(BUILD_LIBJAVA) + +JSDT_LIBRARIES += $(BUILD_LIBJSDT) + +################################################################################ + +jdk.runtime: $(JSDT_LIBRARIES) $(UNPACK_LIBRARIES) + +all: jdk.runtime + +.PHONY: all jdk.runtime diff --git a/jdk/make/lib/Lib-jdk.sctp.gmk b/jdk/make/lib/Lib-jdk.sctp.gmk new file mode 100644 index 00000000000..7afd0020be7 --- /dev/null +++ b/jdk/make/lib/Lib-jdk.sctp.gmk @@ -0,0 +1,76 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LibCommon.gmk + +################################################################################ + +ifeq ($(OPENJDK_TARGET_OS_API), posix) + + ifeq (, $(filter $(OPENJDK_TARGET_OS), macosx aix)) + + # Suppress unused parameters required by exported JNI functions. + SCTP_WERROR := -Werror -Wno-error=unused-parameter + ifeq ($(OPENJDK_TARGET_CPU_ARCH), ppc) + SCTP_WERROR := + endif + + $(eval $(call SetupNativeCompilation,BUILD_LIBSCTP, \ + LIBRARY := sctp, \ + OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ + SRC := $(JDK_TOPDIR)/src/jdk.sctp/$(OPENJDK_TARGET_OS_API_DIR)/native/libsctp, \ + LANG := C, \ + OPTIMIZATION := LOW, \ + CFLAGS := $(CFLAGS_JDKLIB) \ + -I $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libnio/ch \ + -I $(JDK_TOPDIR)/src/java.base/share/native/libnio/ch \ + $(addprefix -I, $(call FindSrcDirsForLib, java.base, net)) \ + $(LIBJAVA_HEADER_FLAGS) \ + -I$(JDK_OUTPUTDIR)/gensrc_headers/jdk.sctp \ + -I$(JDK_OUTPUTDIR)/gensrc_headers/java.base, \ + CFLAGS_linux := $(SCTP_WERROR), \ + MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsctp/mapfile-vers, \ + LDFLAGS := $(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN), \ + LDFLAGS_SUFFIX_linux := -lpthread $(LIBDL) -ljava -ljvm, \ + LDFLAGS_SUFFIX_posix := -lnio -lnet, \ + LDFLAGS_SUFFIX_solaris := -lsocket -ljava -ljvm -lc, \ + LDFLAGS_SUFFIX_macosx := -ljava -ljvm, \ + OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsctp, \ + DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) + + SCTP_LIBRARIES += $(BUILD_LIBSCTP) + + $(BUILD_LIBSCTP): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)nio$(SHARED_LIBRARY_SUFFIX) + endif +endif + +################################################################################ + +jdk.sctp: $(SCTP_LIBRARIES) + +all: jdk.sctp + +.PHONY: all jdk.sctp diff --git a/jdk/make/lib/Lib-jdk.security.auth.gmk b/jdk/make/lib/Lib-jdk.security.auth.gmk new file mode 100644 index 00000000000..52151773886 --- /dev/null +++ b/jdk/make/lib/Lib-jdk.security.auth.gmk @@ -0,0 +1,75 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LibCommon.gmk + +################################################################################ + +LIBJAAS_MAPFILE := +ifneq ($(OPENJDK_TARGET_OS), solaris) + LIBJAAS_EXCLUDE_FILES := Solaris.c +else + # only on solaris...wonder why + LIBJAAS_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjaas/mapfile-vers +endif + +LIBJAAS_NAME := jaas_unix +ifeq ($(OPENJDK_TARGET_OS), windows) + LIBJAAS_NAME := jaas_nt +endif + +$(eval $(call SetupNativeCompilation,BUILD_LIBJAAS, \ + LIBRARY := $(LIBJAAS_NAME), \ + OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ + SRC := $(JDK_TOPDIR)/src/jdk.security.auth/$(OPENJDK_TARGET_OS_API_DIR)/native/libjaas, \ + LANG := C, \ + OPTIMIZATION := LOW, \ + CFLAGS := $(CFLAGS_JDKLIB) -I$(JDK_OUTPUTDIR)/gensrc_headers/jdk.security.auth, \ + MAPFILE := $(LIBJAAS_MAPFILE), \ + LDFLAGS := $(filter-out -ljava, $(LDFLAGS_JDKLIB)) \ + $(call SET_SHARED_LIBRARY_ORIGIN), \ + LDFLAGS_windows := netapi32.lib user32.lib mpr.lib advapi32.lib, \ + LDFLAGS_SUFFIX_windows := $(LDFLAGS_JDKLIB_SUFFIX), \ + LDFLAGS_SUFFIX_solaris := -lc, \ + EXCLUDE_FILES := $(LIBJAAS_EXCLUDE_FILES), \ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ + RC_FLAGS := $(RC_FLAGS) \ + -D "JDK_FNAME=$(LIBJAAS_NAME).dll" \ + -D "JDK_INTERNAL_NAME=$(LIBJAAS_NAME)" \ + -D "JDK_FTYPE=0x2L", \ + OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjaas, \ + DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) + +$(BUILD_LIBJAAS): $(BUILD_LIBJAVA) + +SECURITY_JAAS_LIBRARIES += $(BUILD_LIBJAAS) + +################################################################################ + +jdk.security.auth: $(SECURITY_JAAS_LIBRARIES) + +all: jdk.security.auth + +.PHONY: all jdk.security.auth diff --git a/jdk/make/CompileNativeLibraries.gmk b/jdk/make/lib/LibCommon.gmk similarity index 61% rename from jdk/make/CompileNativeLibraries.gmk rename to jdk/make/lib/LibCommon.gmk index c8926da9582..7fadd1c781f 100644 --- a/jdk/make/CompileNativeLibraries.gmk +++ b/jdk/make/lib/LibCommon.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -29,21 +29,13 @@ include $(SPEC) include MakeBase.gmk include NativeCompilation.gmk -# Setup the java compilers for the JDK build. -include Setup.gmk - -# Copy files (can now depend on $(COPY_FILES)) -include CopyFiles.gmk - # Prepare the find cache. -$(eval $(call FillCacheFind, $(JDK_TOPDIR)/src)) +$(eval $(call FillCacheFind, $(wildcard $(JDK_TOPDIR)/src/*/*/native))) # Build tools include Tools.gmk -# Include the javah generated headers. -CFLAGS_JDKLIB += -I$(JDK_OUTPUTDIR)/gensrc_headers -CXXFLAGS_JDKLIB += -I$(JDK_OUTPUTDIR)/gensrc_headers +GLOBAL_VERSION_INFO_RESOURCE := $(JDK_TOPDIR)/src/java.base/windows/native/common/version.rc # Put the libraries here. Different locations for different target apis. ifeq ($(OPENJDK_TARGET_OS_API), posix) @@ -52,8 +44,6 @@ else INSTALL_LIBRARIES_HERE := $(JDK_OUTPUTDIR)/bin endif -BUILD_LIBRARIES = - # Absolute paths to lib files on windows for use in LDFLAGS. Should figure out a more # elegant solution to this. WIN_JAVA_LIB := $(JDK_OUTPUTDIR)/objs/libjava/java.lib @@ -69,26 +59,30 @@ ifdef OPENJDK DEBUG_ALL_BINARIES := true endif -########################################################################################## +################################################################################ -include lib/CoreLibraries.gmk +# Find the default set of src dirs for a native library. +# Param 1 - module name +# Param 2 - library name +FindSrcDirsForLib = $(call uniq, $(wildcard \ + $(JDK_TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS)/native/lib$(strip $2) \ + $(JDK_TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS_API_DIR)/native/lib$(strip $2) \ + $(JDK_TOPDIR)/src/$(strip $1)/share/native/lib$(strip $2))) -include lib/PlatformLibraries.gmk +################################################################################ -include lib/NetworkingLibraries.gmk +# A lot of libraries are dependent on libjava. Define the name of that +# library here to make dependency declarations to it possible in other files. +BUILD_LIBJAVA := $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)java$(SHARED_LIBRARY_SUFFIX) -include lib/NioLibraries.gmk +# Also define the header include flags needed to compile against it. +LIBJAVA_HEADER_FLAGS := $(addprefix -I, $(call FindSrcDirsForLib, java.base, java)) -include lib/SecurityLibraries.gmk +################################################################################ -include lib/ServiceabilityLibraries.gmk - -include lib/Awt2dLibraries.gmk - -include lib/SoundLibraries.gmk - -########################################################################################## - -all: $(COPY_FILES) $(BUILD_LIBRARIES) - -.PHONY: all +# Define it here since there are multiple uses. +ifeq ($(USE_EXTERNAL_LIBZ), true) + LIBZ := -lz +else + ZLIB_CPPFLAGS := -I$(JDK_TOPDIR)/src/java.base/share/native/libzip/zlib-1.2.8 +endif diff --git a/jdk/make/lib/NetworkingLibraries.gmk b/jdk/make/lib/NetworkingLibraries.gmk index 1bd2680eb54..e61f80be925 100644 --- a/jdk/make/lib/NetworkingLibraries.gmk +++ b/jdk/make/lib/NetworkingLibraries.gmk @@ -23,19 +23,12 @@ # questions. # -LIBNET_SRC_DIRS := $(JDK_TOPDIR)/src/share/native/java/net \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/net \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/ \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/dns \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/spi +LIBNET_SRC_DIRS := $(JDK_TOPDIR)/src/java.base/share/native/libnet \ + $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libnet +LIBNET_CFLAGS += -I$(JDK_OUTPUTDIR)/gensrc_headers/java.base \ + $(LIBJAVA_HEADER_FLAGS) -ifeq ($(OPENJDK_TARGET_OS), windows) - LIBNET_SRC_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/www/protocol/http/ntlm -else - LIBNET_SRC_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/sdp -endif - -LIBNET_CFLAGS := $(foreach dir, $(LIBNET_SRC_DIRS), -I$(dir)) +LIBNET_CFLAGS += $(foreach dir, $(LIBNET_SRC_DIRS), -I$(dir)) LIBNET_EXCLUDE_FILES := ifneq ($(OPENJDK_TARGET_OS), solaris) @@ -54,14 +47,6 @@ ifeq ($(OPENJDK_TARGET_OS), aix) LIBNET_SRC_DIRS += $(JDK_TOPDIR)/src/aix/native/java/net/ endif -ifeq ($(OPENJDK_TARGET_OS), windows) - LIBNET_EXCLUDE_FILES += PlainSocketImpl.c PlainDatagramSocketImpl.c SdpSupport.c -else - LIBNET_EXCLUDE_FILES += TwoStacksPlainSocketImpl.c DualStackPlainSocketImpl.c \ - TwoStacksPlainDatagramSocketImpl.c DualStackPlainDatagramSocketImpl.c \ - NTLMAuthSequence.c NetworkInterface_winXP.c -endif - $(eval $(call SetupNativeCompilation,BUILD_LIBNET, \ LIBRARY := net, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ @@ -81,7 +66,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBNET, \ LDFLAGS_SUFFIX_windows := ws2_32.lib jvm.lib secur32.lib iphlpapi.lib \ delayimp.lib $(WIN_JAVA_LIB) advapi32.lib \ -DELAYLOAD:secur32.dll -DELAYLOAD:iphlpapi.dll, \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=net.dll" \ -D "JDK_INTERNAL_NAME=net" \ @@ -91,18 +76,5 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBNET, \ $(BUILD_LIBNET): $(BUILD_LIBJAVA) -BUILD_LIBRARIES += $(BUILD_LIBNET) +BASE_LIBRARIES += $(BUILD_LIBNET) -$(JDK_OUTPUTDIR)/lib/net.properties: $(JDK_TOPDIR)/src/share/lib/net.properties - $(ECHO) $(LOG_INFO) Copying $(@F) - $(call install-file) - -COPY_FILES += $(JDK_OUTPUTDIR)/lib/net.properties - -ifeq ($(OPENJDK_TARGET_OS), solaris) - $(JDK_OUTPUTDIR)/lib/sdp/sdp.conf.template: $(JDK_TOPDIR)/src/${OPENJDK_TARGET_OS_API_DIR}/lib/sdp/sdp.conf.template - $(ECHO) $(LOG_INFO) Copying $(@F) - $(call install-file) - - COPY_FILES += $(JDK_OUTPUTDIR)/lib/sdp/sdp.conf.template -endif diff --git a/jdk/make/lib/NioLibraries.gmk b/jdk/make/lib/NioLibraries.gmk index 6c9c46a3f3d..259517c2aad 100644 --- a/jdk/make/lib/NioLibraries.gmk +++ b/jdk/make/lib/NioLibraries.gmk @@ -24,99 +24,38 @@ # BUILD_LIBNIO_SRC := \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/nio \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/ch \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/fs + $(JDK_TOPDIR)/src/java.base/share/native/libnio/ch \ + $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libnio \ + $(sort $(wildcard \ + $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libnio/ch \ + $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libnio/fs \ + $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libnio/ch \ + $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libnio/fs)) \ + # BUILD_LIBNIO_CFLAGS := \ - -I$(JDK_TOPDIR)/src/share/native/sun/nio/ch \ - -I$(JDK_TOPDIR)/src/share/native/java/io \ - -I$(JDK_TOPDIR)/src/share/native/java/net \ - -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/net - -BUILD_LIBNIO_FILES := \ - DatagramChannelImpl.c \ - DatagramDispatcher.c \ - FileChannelImpl.c \ - FileDispatcherImpl.c \ - FileKey.c \ - IOUtil.c \ - MappedByteBuffer.c \ - Net.c \ - ServerSocketChannelImpl.c \ - SocketChannelImpl.c \ - SocketDispatcher.c - -ifeq ($(OPENJDK_TARGET_OS), windows) - BUILD_LIBNIO_FILES += \ - Iocp.c \ - RegistryFileTypeDetector.c \ - WindowsAsynchronousFileChannelImpl.c \ - WindowsAsynchronousServerSocketChannelImpl.c \ - WindowsAsynchronousSocketChannelImpl.c \ - WindowsNativeDispatcher.c \ - WindowsSelectorImpl.c -endif + $(addprefix -I, $(BUILD_LIBNIO_SRC)) \ + -I$(JDK_OUTPUTDIR)/gensrc_headers/java.base \ + $(LIBJAVA_HEADER_FLAGS) \ + $(addprefix -I, $(BUILD_LIBNET_SRC)) ifeq ($(OPENJDK_TARGET_OS), linux) BUILD_LIBNIO_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS) - BUILD_LIBNIO_FILES += \ - EPoll.c \ - EPollArrayWrapper.c \ - EPollPort.c \ - InheritedChannel.c \ - NativeThread.c \ - PollArrayWrapper.c \ - UnixAsynchronousServerSocketChannelImpl.c \ - UnixAsynchronousSocketChannelImpl.c \ - GnomeFileTypeDetector.c \ - MagicFileTypeDetector.c \ - LinuxNativeDispatcher.c \ - LinuxWatchService.c \ - UnixCopyFile.c \ - UnixNativeDispatcher.c endif ifeq ($(OPENJDK_TARGET_OS), macosx) BUILD_LIBNIO_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS) - BUILD_LIBNIO_SRC += $(JDK_TOPDIR)/src/macosx/native/sun/nio/ch - BUILD_LIBNIO_FILES += \ - InheritedChannel.c \ - NativeThread.c \ - PollArrayWrapper.c \ - UnixAsynchronousServerSocketChannelImpl.c \ - UnixAsynchronousSocketChannelImpl.c \ - BsdNativeDispatcher.c \ - MacOSXNativeDispatcher.c \ - UnixCopyFile.c \ - UnixNativeDispatcher.c \ - KQueue.c \ - KQueuePort.c \ - KQueueArrayWrapper.c + BUILD_LIBNIO_EXFILES += \ + GnomeFileTypeDetector.c \ + # endif ifeq ($(OPENJDK_TARGET_OS), solaris) BUILD_LIBNIO_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS) - BUILD_LIBNIO_FILES += \ - DevPollArrayWrapper.c \ - InheritedChannel.c \ - NativeThread.c \ - PollArrayWrapper.c \ - SolarisEventPort.c \ - UnixAsynchronousServerSocketChannelImpl.c \ - UnixAsynchronousSocketChannelImpl.c \ - GnomeFileTypeDetector.c \ - SolarisNativeDispatcher.c \ - SolarisWatchService.c \ - UnixCopyFile.c \ - UnixNativeDispatcher.c endif ifeq ($(OPENJDK_TARGET_OS), aix) BUILD_LIBNIO_MAPFILE:=$(JDK_TOPDIR)/make/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS) - BUILD_LIBNIO_SRC += \ - $(JDK_TOPDIR)/src/aix/native/sun/nio/ch \ - $(JDK_TOPDIR)/src/aix/native/sun/nio/fs BUILD_LIBNIO_FILES += \ AixPollPort.c \ InheritedChannel.c \ @@ -134,7 +73,8 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBNIO, \ LIBRARY := nio, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ SRC := $(BUILD_LIBNIO_SRC), \ - INCLUDE_FILES := $(BUILD_LIBNIO_FILES), \ + EXCLUDE_FILES := $(BUILD_LIBNIO_EXFILES), \ + EXCLUDES := sctp, \ LANG := C, \ OPTIMIZATION := HIGH, \ CFLAGS := $(CFLAGS_JDKLIB) \ @@ -151,7 +91,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBNIO, \ advapi32.lib, \ LDFLAGS_SUFFIX_macosx := -ljava -lnet -pthread -framework CoreFoundation, \ LDFLAGS_SUFFIX :=, \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=nio.dll" \ -D "JDK_INTERNAL_NAME=nio" \ @@ -159,47 +99,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBNIO, \ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libnio, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) -BUILD_LIBRARIES += $(BUILD_LIBNIO) +BASE_LIBRARIES += $(BUILD_LIBNIO) $(BUILD_LIBNIO): $(BUILD_LIBNET) -########################################################################################## - -ifeq ($(OPENJDK_TARGET_OS_API), posix) - - ifeq (, $(filter $(OPENJDK_TARGET_OS), macosx aix)) - - # Suppress unused parameters required by exported JNI functions. - SCTP_WERROR := -Werror -Wno-error=unused-parameter - ifeq ($(OPENJDK_TARGET_CPU_ARCH), ppc) - SCTP_WERROR := - endif - - $(eval $(call SetupNativeCompilation,BUILD_LIBSCTP, \ - LIBRARY := sctp, \ - OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/ch/sctp, \ - LANG := C, \ - OPTIMIZATION := LOW, \ - CFLAGS := $(CFLAGS_JDKLIB) \ - -I$(JDK_TOPDIR)/src/share/native/sun/nio/ch \ - -I$(JDK_TOPDIR)/src/share/native/sun/nio/ch/sctp \ - -I$(JDK_TOPDIR)/src/share/native/java/net \ - -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/ch \ - -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/net, \ - CFLAGS_linux := $(SCTP_WERROR), \ - MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsctp/mapfile-vers, \ - LDFLAGS := $(LDFLAGS_JDKLIB) \ - $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX_linux := -lpthread $(LIBDL) -ljava -ljvm, \ - LDFLAGS_SUFFIX_posix := -lnio -lnet, \ - LDFLAGS_SUFFIX_solaris := -lsocket -ljava -ljvm -lc, \ - LDFLAGS_SUFFIX_macosx := -ljava -ljvm, \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsctp, \ - DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) - - BUILD_LIBRARIES += $(BUILD_LIBSCTP) - - $(BUILD_LIBSCTP): $(BUILD_LIBNIO) - endif -endif diff --git a/jdk/make/lib/PlatformLibraries.gmk b/jdk/make/lib/PlatformLibraries.gmk index 3f0a408fab7..b9135df0acb 100644 --- a/jdk/make/lib/PlatformLibraries.gmk +++ b/jdk/make/lib/PlatformLibraries.gmk @@ -23,43 +23,20 @@ # questions. # -ifeq ($(OPENJDK_TARGET_OS), macosx) - - $(eval $(call SetupNativeCompilation,BUILD_LIBAPPLESCRIPTENGINE, \ - LIBRARY := AppleScriptEngine, \ - OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(JDK_TOPDIR)/src/macosx/native/apple/applescript, \ - LANG := C, \ - OPTIMIZATION := LOW, \ - CFLAGS := $(CFLAGS_JDKLIB) \ - -I$(JDK_TOPDIR)/src/macosx/native/apple/applescript, \ - LDFLAGS := $(LDFLAGS_JDKLIB) \ - $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX := -framework Cocoa \ - -framework Carbon \ - -framework JavaNativeFoundation \ - $(LDFLAGS_JDKLIB_SUFFIX), \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libAppleScriptEngine, \ - DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) - - $(BUILD_LIBAPPLESCRIPTENGINE): $(BUILD_LIBJAVA) - - BUILD_LIBRARIES += $(BUILD_LIBAPPLESCRIPTENGINE) - -endif - ########################################################################################## ifeq ($(OPENJDK_TARGET_OS), macosx) + LIBOSXAPP_SRC := $(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp + $(eval $(call SetupNativeCompilation,BUILD_LIBOSXAPP, \ LIBRARY := osxapp, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(JDK_TOPDIR)/src/macosx/native/sun/osxapp, \ + SRC := $(LIBOSXAPP_SRC), \ LANG := C, \ OPTIMIZATION := LOW, \ CFLAGS := $(CFLAGS_JDKLIB) \ - -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \ + $(addprefix -I, $(LIBOSXAPP_SRC)) \ -I$(JDK_OUTPUTDIR)/gensrc_headers_icons, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ @@ -79,149 +56,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libosxapp, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) - BUILD_LIBRARIES += $(BUILD_LIBOSXAPP) + DESKTOP_LIBRARIES += $(BUILD_LIBOSXAPP) endif -########################################################################################## - -ifeq ($(OPENJDK_TARGET_OS), macosx) - - LIBOSX_DIRS := \ - $(JDK_TOPDIR)/src/macosx/native/com/apple/concurrent \ - $(JDK_TOPDIR)/src/macosx/native/com/apple/eio \ - $(JDK_TOPDIR)/src/macosx/native/apple/security - - $(eval $(call SetupNativeCompilation,BUILD_LIBOSX, \ - LIBRARY := osx, \ - OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(LIBOSX_DIRS), \ - LANG := C, \ - OPTIMIZATION := LOW, \ - CFLAGS := $(CFLAGS_JDKLIB) \ - $(foreach dir, $(LIBOSX_DIRS), -I$(dir)) \ - -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp, \ - LDFLAGS := $(LDFLAGS_JDKLIB) \ - $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX_macosx := \ - -losxapp \ - -framework Cocoa \ - -framework ApplicationServices \ - -framework JavaNativeFoundation \ - -framework JavaRuntimeSupport \ - -framework Security \ - -framework SystemConfiguration \ - $(LDFLAGS_JDKLIB_SUFFIX), \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libosx, \ - DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) - - BUILD_LIBRARIES += $(BUILD_LIBOSX) - - $(BUILD_LIBOSX): $(BUILD_LIBOSXAPP) - - $(BUILD_LIBOSX): $(BUILD_LIBJAVA) - -endif - -########################################################################################## - -ifndef OPENJDK - ifeq ($(OPENJDK_TARGET_OS), windows) - - ACCESSBRIDGE_SRCDIR := $(JDK_TOPDIR)/src/closed/windows/native/sun/bridge - - define SetupAccessBridge - # Parameter 1 Suffix - # Parameter 2 Machine - # Parameter 3 ACCESSBRIDGE_ARCH_ suffix and name of directory where gensrc headers - # are found. - - $(call SetupNativeCompilation,BUILD_JAWTACCESSBRIDGE$1, \ - LIBRARY = JAWTAccessBridge$1, \ - OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(ACCESSBRIDGE_SRCDIR), \ - INCLUDE_FILES := JAWTAccessBridge.cpp, \ - LANG := C++, \ - OPTIMIZATION := LOW, \ - CFLAGS := $(CFLAGS_JDKLIB) \ - -DACCESSBRIDGE_ARCH_$3 \ - -I$(JDK_OUTPUTDIR)/gensrc_headers_ab/$3, \ - LDFLAGS := $(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \ - winspool.lib jawt.lib comdlg32.lib advapi32.lib shell32.lib \ - ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \ - -subsystem:windows -machine:$2 \ - -def:$(ACCESSBRIDGE_SRCDIR)/JAWTAccessBridge.DEF, \ - VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc, \ - RC_FLAGS := $(RC_FLAGS) \ - -D "JDK_FNAME=JAWTAccessBridge$1.dll" \ - -D "JDK_INTERNAL_NAME=JAWTAccessBridge$1" \ - -D "JDK_FTYPE=0x02L", \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjawtaccessbridge$1, \ - DEBUG_SYMBOLS := true) - - $$(BUILD_JAWTACCESSBRIDGE$1): $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX) - - $(call SetupNativeCompilation,BUILD_JAVAACCESSBRIDGE$1, \ - LIBRARY = JavaAccessBridge$1, \ - OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(ACCESSBRIDGE_SRCDIR), \ - INCLUDE_FILES := AccessBridgeATInstance.cpp AccessBridgeDebug.cpp \ - AccessBridgeJavaEntryPoints.cpp \ - AccessBridgeMessages.cpp JavaAccessBridge.cpp, \ - LANG := C++, \ - OPTIMIZATION := LOW, \ - CFLAGS := $(CFLAGS_JDKLIB) \ - -DACCESSBRIDGE_ARCH_$3 \ - -I$(JDK_OUTPUTDIR)/gensrc_headers_ab/$3, \ - LDFLAGS := $(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \ - winspool.lib comdlg32.lib advapi32.lib shell32.lib \ - ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \ - -subsystem:windows -machine:$2 \ - -def:$(ACCESSBRIDGE_SRCDIR)/JavaAccessBridge.DEF, \ - VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc, \ - RC_FLAGS := $(RC_FLAGS) \ - -D "JDK_FNAME=JavaAccessBridge$1.dll" \ - -D "JDK_INTERNAL_NAME=JavaAccessBridge$1" \ - -D "JDK_FTYPE=0x02L", \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjavaaccessbridge$1, \ - DEBUG_SYMBOLS := true) - - $(call SetupNativeCompilation,BUILD_WINDOWSACCESSBRIDGE$1, \ - LIBRARY = WindowsAccessBridge$1, \ - OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(ACCESSBRIDGE_SRCDIR), \ - INCLUDE_FILES := AccessBridgeJavaVMInstance.cpp AccessBridgeMessageQueue.cpp \ - AccessBridgeMessages.cpp AccessBridgeWindowsEntryPoints.cpp \ - WinAccessBridge.cpp AccessBridgeDebug.cpp \ - AccessBridgeEventHandler.cpp, \ - LANG := C++, \ - OPTIMIZATION := LOW, \ - CFLAGS := $(filter-out -MD, $(CFLAGS_JDKLIB)) -MT \ - -DACCESSBRIDGE_ARCH_$3 \ - -I$(JDK_OUTPUTDIR)/gensrc_headers_ab/$3, \ - LDFLAGS := $(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \ - winspool.lib comdlg32.lib advapi32.lib shell32.lib \ - ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \ - -subsystem:windows -machine:$2 \ - -def:$(ACCESSBRIDGE_SRCDIR)/WinAccessBridge.DEF, \ - VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc, \ - RC_FLAGS := $(RC_FLAGS) \ - -D "JDK_FNAME=WindowsAccessBridge$1.dll" \ - -D "JDK_INTERNAL_NAME=WindowsAccessBridge$1" \ - -D "JDK_FTYPE=0x02L", \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libwindowsaccessbridge$1, \ - DEBUG_SYMBOLS := true) - - BUILD_LIBRARIES += $$(BUILD_JAWTACCESSBRIDGE$1) $$(BUILD_JAVAACCESSBRIDGE$1) \ - $$(BUILD_WINDOWSACCESSBRIDGE$1) - - endef - - ifeq ($(OPENJDK_TARGET_CPU_BITS), 32) - $(eval $(call SetupAccessBridge,-32,I386,32)) - $(eval $(call SetupAccessBridge,,I386,legacy)) - else - $(eval $(call SetupAccessBridge,-64,X64,64)) - endif - endif -endif diff --git a/jdk/make/lib/SecurityLibraries.gmk b/jdk/make/lib/SecurityLibraries.gmk deleted file mode 100644 index eeb062a30da..00000000000 --- a/jdk/make/lib/SecurityLibraries.gmk +++ /dev/null @@ -1,294 +0,0 @@ -# -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -LIBJAAS_MAPFILE := -ifneq ($(OPENJDK_TARGET_OS), solaris) - LIBJAAS_EXCLUDE_FILES := Solaris.c -else - # only on solaris...wonder why - LIBJAAS_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjaas/mapfile-vers -endif - -LIBJAAS_NAME := jaas_unix -ifeq ($(OPENJDK_TARGET_OS), windows) - LIBJAAS_NAME := jaas_nt -endif - -$(eval $(call SetupNativeCompilation,BUILD_LIBJAAS, \ - LIBRARY := $(LIBJAAS_NAME), \ - OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/com/sun/security/auth/module, \ - LANG := C, \ - OPTIMIZATION := LOW, \ - CFLAGS := $(CFLAGS_JDKLIB), \ - MAPFILE := $(LIBJAAS_MAPFILE), \ - LDFLAGS := $(filter-out -ljava, $(LDFLAGS_JDKLIB)) \ - $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_windows := netapi32.lib user32.lib mpr.lib advapi32.lib, \ - LDFLAGS_SUFFIX_windows := $(LDFLAGS_JDKLIB_SUFFIX), \ - LDFLAGS_SUFFIX_solaris := -lc, \ - EXCLUDE_FILES := $(LIBJAAS_EXCLUDE_FILES), \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ - RC_FLAGS := $(RC_FLAGS) \ - -D "JDK_FNAME=$(LIBJAAS_NAME).dll" \ - -D "JDK_INTERNAL_NAME=$(LIBJAAS_NAME)" \ - -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjaas, \ - DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) - -$(BUILD_LIBJAAS): $(BUILD_LIBJAVA) - -BUILD_LIBRARIES += $(BUILD_LIBJAAS) - -########################################################################################## - -$(eval $(call SetupNativeCompilation,BUILD_LIBJ2PCSC, \ - LIBRARY := j2pcsc, \ - OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(JDK_TOPDIR)/src/share/native/sun/security/smartcardio \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/smartcardio, \ - LANG := C, \ - CFLAGS_posix := -D__sun_jdk, \ - OPTIMIZATION := LOW, \ - CFLAGS := $(CFLAGS_JDKLIB) \ - -I$(JDK_TOPDIR)/src/share/native/sun/security/smartcardio \ - -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/smartcardio \ - -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/smartcardio/MUSCLE, \ - MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2pcsc/mapfile-vers, \ - LDFLAGS := $(LDFLAGS_JDKLIB) \ - $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX_posix := $(LIBDL), \ - LDFLAGS_SUFFIX_windows := winscard.lib, \ - LDFLAGS_SUFFIX_solaris := -lc, \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ - RC_FLAGS := $(RC_FLAGS) \ - -D "JDK_FNAME=j2pcsc.dll" \ - -D "JDK_INTERNAL_NAME=j2pcsc" \ - -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2pcsc, \ - DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) - -BUILD_LIBRARIES += $(BUILD_LIBJ2PCSC) - -########################################################################################## - -ifneq ($(OPENJDK_TARGET_OS), windows) - $(eval $(call SetupNativeCompilation,BUILD_LIBJ2GSS, \ - LIBRARY := j2gss, \ - OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(JDK_TOPDIR)/src/share/native/sun/security/jgss/wrapper \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/jgss/wrapper, \ - LANG := C, \ - OPTIMIZATION := LOW, \ - CFLAGS := $(CFLAGS_JDKLIB) \ - -I$(JDK_TOPDIR)/src/share/native/sun/security/jgss/wrapper \ - -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/jgss/wrapper, \ - MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2gss/mapfile-vers, \ - LDFLAGS := $(LDFLAGS_JDKLIB) \ - $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX := $(LIBDL), \ - LDFLAGS_SUFFIX_solaris := -lc, \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2gss, \ - DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) - - BUILD_LIBRARIES += $(BUILD_LIBJ2GSS) -endif - -########################################################################################## - -ifneq ($(BUILD_CRYPTO), no) - BUILD_LIBKRB5_NAME := - ifeq ($(OPENJDK_TARGET_OS), windows) - BUILD_LIBKRB5_NAME := w2k_lsa_auth - BUILD_LIBKRB5_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/krb5 - BUILD_LIBKRB5_LIBS := advapi32.lib Secur32.lib netapi32.lib kernel32.lib user32.lib \ - gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib \ - ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib - else ifeq ($(OPENJDK_TARGET_OS), macosx) - BUILD_LIBKRB5_NAME := osxkrb5 - BUILD_LIBKRB5_SRC := $(JDK_TOPDIR)/src/share/native/sun/security/krb5 \ - $(JDK_TOPDIR)/src/macosx/native/sun/security/krb5 - BUILD_LIBKRB5_LIBS := \ - -framework JavaNativeFoundation \ - -framework Cocoa \ - -framework SystemConfiguration \ - -framework Kerberos - endif - - ifneq ($(BUILD_LIBKRB5_NAME), ) - $(eval $(call SetupNativeCompilation,BUILD_LIBKRB5, \ - LIBRARY := $(BUILD_LIBKRB5_NAME), \ - OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(BUILD_LIBKRB5_SRC), \ - LANG := C, \ - OPTIMIZATION := LOW, \ - CFLAGS := $(CFLAGS_JDKLIB) \ - -I$(JDK_TOPDIR)/src/share/native/sun/security/krb5, \ - CFLAGS_windows := -I$(JDK_TOPDIR)/src/windows/native/sun/security/krb5, \ - LDFLAGS := $(LDFLAGS_JDKLIB) \ - $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX := $(BUILD_LIBKRB5_LIBS), \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ - RC_FLAGS := $(RC_FLAGS) \ - -D "JDK_FNAME=$(BUILD_LIBKRB5_NAME).dll" \ - -D "JDK_INTERNAL_NAME=$(BUILD_LIBKRB5_NAME)" \ - -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libkrb5, \ - DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) - - BUILD_LIBRARIES += $(BUILD_LIBKRB5) - endif -endif - -########################################################################################## - -ifeq ($(OPENJDK_TARGET_OS), windows) - - $(eval $(call SetupNativeCompilation,BUILD_LIBSUNMSCAPI, \ - LIBRARY := sunmscapi, \ - OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/mscapi, \ - LANG := C++, \ - OPTIMIZATION := LOW, \ - CFLAGS := $(CFLAGS_JDKLIB) \ - -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/mscapi, \ - LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \ - $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX := Crypt32.Lib advapi32.lib, \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ - RC_FLAGS := $(RC_FLAGS) \ - -D "JDK_FNAME=sunmscapi.dll" \ - -D "JDK_INTERNAL_NAME=sunmscapi" \ - -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsunmscapi, \ - DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) - - BUILD_LIBRARIES += $(BUILD_LIBSUNMSCAPI) -endif - -########################################################################################## - -$(eval $(call SetupNativeCompilation,BUILD_LIBJ2PKCS11, \ - LIBRARY := j2pkcs11, \ - OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(JDK_TOPDIR)/src/share/native/sun/security/pkcs11 \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11 \ - $(JDK_TOPDIR)/src/share/native/sun/security/pkcs11/wrapper \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11/wrapper, \ - LANG := C, \ - OPTIMIZATION := LOW, \ - CFLAGS := $(CFLAGS_JDKLIB) \ - -I$(JDK_TOPDIR)/src/share/native/sun/security/pkcs11 \ - -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11 \ - -I$(JDK_TOPDIR)/src/share/native/sun/security/pkcs11/wrapper \ - -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11/wrapper, \ - MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2pkcs11/mapfile-vers, \ - LDFLAGS := $(LDFLAGS_JDKLIB) \ - $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX_posix := $(LIBDL), \ - LDFLAGS_SUFFIX_solaris := -lc, \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ - RC_FLAGS := $(RC_FLAGS) \ - -D "JDK_FNAME=j2pkcs11.dll" \ - -D "JDK_INTERNAL_NAME=j2pkcs11" \ - -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2pkcs11, \ - DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) - -BUILD_LIBRARIES += $(BUILD_LIBJ2PKCS11) - -########################################################################################## - -ifeq ($(ENABLE_INTREE_EC), yes) - - BUILD_LIBSUNEC_FLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/security/ec \ - -I$(JDK_TOPDIR)/src/share/native/sun/security/ec/impl - - # - # On sol-sparc...all libraries are compiled with -xregs=no%appl - # (set in CFLAGS_REQUIRED_sparc) - # - # except!!! libsunec.so - # - ECC_JNI_SOLSPARC_FILTER := - ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc) - ECC_JNI_SOLSPARC_FILTER := -xregs=no%appl - endif - - $(eval $(call SetupNativeCompilation,BUILD_LIBSUNEC, \ - LIBRARY := sunec, \ - OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(JDK_TOPDIR)/src/share/native/sun/security/ec \ - $(JDK_TOPDIR)/src/share/native/sun/security/ec/impl, \ - LANG := C++, \ - OPTIMIZATION := LOW, \ - CFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CFLAGS_JDKLIB)) \ - $(BUILD_LIBSUNEC_FLAGS) \ - -DMP_API_COMPATIBLE -DNSS_ECC_MORE_THAN_SUITE_B, \ - CXXFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CXXFLAGS_JDKLIB)) \ - $(BUILD_LIBSUNEC_FLAGS), \ - MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsunec/mapfile-vers, \ - LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \ - LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX := $(LIBCXX), \ - LDFLAGS_SUFFIX_linux := -lc, \ - LDFLAGS_SUFFIX_solaris := -lc, \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ - RC_FLAGS := $(RC_FLAGS) \ - -D "JDK_FNAME=sunec.dll" \ - -D "JDK_INTERNAL_NAME=sunec" \ - -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsunec, \ - DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) - - BUILD_LIBRARIES += $(BUILD_LIBSUNEC) -endif - -########################################################################################## - -ifeq ($(OPENJDK_TARGET_OS), solaris) - ifndef OPENJDK - - $(eval $(call SetupNativeCompilation,BUILD_LIBJ2UCRYPTO, \ - LIBRARY := j2ucrypto, \ - OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(JDK_TOPDIR)/src/closed/solaris/native/com/oracle/security/ucrypto, \ - LANG := C, \ - OPTIMIZATION := LOW, \ - CFLAGS := $(CFLAGS_JDKLIB) \ - -I$(JDK_TOPDIR)/src/closed/solaris/native/com/oracle/security/ucrypto, \ - MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2ucrypto/mapfile-vers, \ - LDFLAGS := $(LDFLAGS_JDKLIB), \ - LDFLAGS_SUFFIX := $(LIBDL), \ - LDFLAGS_SUFFIX_solaris := -lc, \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2ucrypto, \ - DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) - - $(BUILD_LIBJ2UCRYPTO): $(BUILD_LIBJAVA) - - BUILD_LIBRARIES += $(BUILD_LIBJ2UCRYPTO) - - endif -endif diff --git a/jdk/make/lib/ServiceabilityLibraries.gmk b/jdk/make/lib/ServiceabilityLibraries.gmk deleted file mode 100644 index a39a2815904..00000000000 --- a/jdk/make/lib/ServiceabilityLibraries.gmk +++ /dev/null @@ -1,436 +0,0 @@ -# -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -LIBATTACH_EXCLUDE_FILES := -ifneq ($(OPENJDK_TARGET_OS), solaris) - LIBATTACH_EXCLUDE_FILES += SolarisVirtualMachine.c -endif -ifneq ($(OPENJDK_TARGET_OS), linux) - LIBATTACH_EXCLUDE_FILES += LinuxVirtualMachine.c -endif -ifneq ($(OPENJDK_TARGET_OS), macosx) - LIBATTACH_EXCLUDE_FILES += BsdVirtualMachine.c -endif -ifneq ($(OPENJDK_TARGET_OS),aix) - LIBATTACH_EXCLUDE_FILES += AixVirtualMachine.c -endif - -LIBATTACH_SRC_FILES := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/tools/attach -ifeq ($(OPENJDK_TARGET_OS),aix) - LIBATTACH_SRC_FILES += $(JDK_TOPDIR)/src/aix/native/sun/tools/attach -endif - -$(eval $(call SetupNativeCompilation,BUILD_LIBATTACH, \ - LIBRARY := attach, \ - OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(LIBATTACH_SRC_FILES), \ - EXCLUDE_FILES := $(LIBATTACH_EXCLUDE_FILES), \ - LANG := C, \ - OPTIMIZATION := LOW, \ - CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS), \ - CFLAGS_windows := /Gy, \ - MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libattach/mapfile-$(OPENJDK_TARGET_OS), \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ - RC_FLAGS := $(RC_FLAGS) \ - -D "JDK_FNAME=attach.dll" \ - -D "JDK_INTERNAL_NAME=attach" \ - -D "JDK_FTYPE=0x2L", \ - LDFLAGS := $(LDFLAGS_JDKLIB) \ - $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_solaris := -ldoor, \ - LDFLAGS_windows := /ORDER:@$(JDK_TOPDIR)/make/mapfiles/libattach/reorder-windows-$(OPENJDK_TARGET_CPU), \ - LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \ - LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib psapi.lib, \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libattach, \ - DEBUG_SYMBOLS := true)) - -$(BUILD_LIBATTACH): $(BUILD_LIBJAVA) - -BUILD_LIBRARIES += $(BUILD_LIBATTACH) - -########################################################################################## - -$(eval $(call SetupNativeCompilation,BUILD_LIBDT_SOCKET, \ - LIBRARY := dt_socket, \ - OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(JDK_TOPDIR)/src/share/transport/socket \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/socket, \ - LANG := C, \ - OPTIMIZATION := LOW, \ - CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_CFLAGS_WARNINGS_ARE_ERRORS) -DUSE_MMAP \ - -I$(INCLUDEDIR) -I$(JDK_OUTPUTDIR)/include/$(OPENJDK_TARGET_OS) \ - -I$(JDK_TOPDIR)/src/share/transport/socket \ - -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/socket \ - -I$(JDK_TOPDIR)/src/share/back/export \ - -I$(JDK_TOPDIR)/src/share/back, \ - MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libdt_socket/mapfile-vers, \ - LDFLAGS := $(LDFLAGS_JDKLIB) \ - $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX_linux := -lpthread, \ - LDFLAGS_SUFFIX_solaris := -lnsl -lsocket -lc, \ - LDFLAGS_SUFFIX_windows := $(LDFLAGS_JDKLIB_SUFFIX) -export:jdwpTransport_OnLoad ws2_32.lib, \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ - RC_FLAGS := $(RC_FLAGS) \ - -D "JDK_FNAME=dt_socket.dll" \ - -D "JDK_INTERNAL_NAME=dt_socket" \ - -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libdt_socket, \ - DEBUG_SYMBOLS := true)) - -$(BUILD_LIBDT_SOCKET): $(BUILD_LIBJAVA) - -BUILD_LIBRARIES += $(BUILD_LIBDT_SOCKET) - -########################################################################################## - -ifeq ($(OPENJDK_TARGET_OS), windows) - - $(eval $(call SetupNativeCompilation,BUILD_LIBDT_SHMEM, \ - LIBRARY := dt_shmem, \ - OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(JDK_TOPDIR)/src/share/native/com/sun/tools/jdi \ - $(JDK_TOPDIR)/src/share/transport/shmem \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/shmem, \ - LANG := C, \ - OPTIMIZATION := LOW, \ - CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) -DUSE_MMAP \ - -I$(INCLUDEDIR) -I$(JDK_OUTPUTDIR)/include/$(OPENJDK_TARGET_OS) \ - -I$(JDK_TOPDIR)/src/share/transport/shmem \ - -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/shmem \ - -I$(JDK_TOPDIR)/src/share/back/export, \ - LDFLAGS := $(LDFLAGS_JDKLIB), \ - LDFLAGS_windows := -export:jdwpTransport_OnLoad, \ - LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ - RC_FLAGS := $(RC_FLAGS) \ - -D "JDK_FNAME=dt_shmem.dll" \ - -D "JDK_INTERNAL_NAME=dt_shmem" \ - -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libdt_shmem, \ - DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) - - BUILD_LIBRARIES += $(BUILD_LIBDT_SHMEM) - -endif # OPENJDK_TARGET_OS - -########################################################################################## - -# JDWP_LOGGING causes log messages to be compiled into the library. -$(eval $(call SetupNativeCompilation,BUILD_LIBJDWP, \ - LIBRARY := jdwp, \ - OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(JDK_TOPDIR)/src/share/back $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/back, \ - LANG := C, \ - OPTIMIZATION := LOW, \ - CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) -DJDWP_LOGGING \ - -I$(JDK_TOPDIR)/src/share/transport/export \ - -I$(JDK_TOPDIR)/src/share/back/export \ - -I$(JDK_TOPDIR)/src/share/back \ - -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/back \ - -I$(JDK_OUTPUTDIR)/gensrc_jdwp_headers, \ - MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjdwp/mapfile-vers, \ - LDFLAGS := $(LDFLAGS_JDKLIB) \ - $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX_linux := $(LIBDL), \ - LDFLAGS_SUFFIX_solaris := $(LIBDL) -lc, \ - LDFLAGS_SUFFIX_windows := $(LDFLAGS_JDKLIB_SUFFIX), \ - LDFLAGS_SUFFIX_macosx := -liconv, \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ - RC_FLAGS := $(RC_FLAGS) \ - -D "JDK_FNAME=jdwp.dll" \ - -D "JDK_INTERNAL_NAME=jdwp" \ - -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjdwp, \ - DEBUG_SYMBOLS := true)) - -$(BUILD_LIBJDWP): $(BUILD_LIBJAVA) - -BUILD_LIBRARIES += $(BUILD_LIBJDWP) - -########################################################################################## - -$(eval $(call SetupNativeCompilation,BUILD_LIBJSDT, \ - LIBRARY := jsdt, \ - OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(JDK_TOPDIR)/src/share/native/sun/tracing/dtrace \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/tracing/dtrace, \ - LANG := C, \ - OPTIMIZATION := LOW, \ - CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) \ - -I$(JDK_TOPDIR)/src/share/native/sun/tracing/dtrace, \ - MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjsdt/mapfile-vers, \ - LDFLAGS := $(LDFLAGS_JDKLIB) \ - $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX_linux := $(LIBDL), \ - LDFLAGS_SUFFIX_windows := $(LDFLAGS_JDKLIB_SUFFIX) $(LIBDL), \ - LDFLAGS_SUFFIX_macosx := $(LIBDL), \ - LDFLAGS_SUFFIX_solaris := -lc, \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ - RC_FLAGS := $(RC_FLAGS) \ - -D "JDK_FNAME=jsdt.dll" \ - -D "JDK_INTERNAL_NAME=jsdt" \ - -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjsdt, \ - DEBUG_SYMBOLS := true)) - -$(BUILD_LIBJSDT): $(BUILD_LIBJAVA) - -BUILD_LIBRARIES += $(BUILD_LIBJSDT) - -########################################################################################## - -LIBINSTRUMENT_SRC := $(JDK_TOPDIR)/src/share/instrument \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/instrument - -LIBINSTRUMENT_FILES := \ - EncodingSupport.c \ - EncodingSupport_md.c \ - FileSystemSupport_md.c \ - InstrumentationImplNativeMethods.c \ - InvocationAdapter.c \ - JarFacade.c \ - JPLISAgent.c \ - JPLISAssert.c \ - JavaExceptions.c \ - PathCharsValidator.c \ - Reentrancy.c \ - Utilities.c - -LIBINSTRUMENT_DIR := $(JDK_OUTPUTDIR)/objs/libinstrument -LIBINSTRUMENT_CFLAGS := $(CFLAGS_JDKLIB) \ - -I$(JDK_TOPDIR)/src/share/instrument \ - -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/instrument \ - -I$(JDK_TOPDIR)/src/share/bin - -LIBINSTRUMENT_LDFLAGS := -LIBINSTRUMENT_LDFLAGS_SUFFIX := - -ifeq ($(OPENJDK_TARGET_OS), windows) - LIBINSTRUMENT_LDFLAGS += $(JDK_OUTPUTDIR)/objs/jli_static.lib $(WIN_JAVA_LIB) \ - -export:Agent_OnAttach advapi32.lib - # Statically link the C runtime so that there are not dependencies on modules - # not on the search patch when invoked from the Windows system directory - # (or elsewhere). - LIBINSTRUMENT_CFLAGS := $(filter-out -MD, $(LIBINSTRUMENT_CFLAGS)) - # equivalent of strcasecmp is stricmp on Windows - LIBINSTRUMENT_CFLAGS += -Dstrcasecmp=stricmp -else - LIBINSTRUMENT_LDFLAGS_SUFFIX := -ljava -endif - -$(eval $(call SetupNativeCompilation,BUILD_LIBINSTRUMENT, \ - LIBRARY := instrument, \ - OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(LIBINSTRUMENT_SRC), \ - INCLUDE_FILES := $(LIBINSTRUMENT_FILES), \ - LANG := C, \ - OPTIMIZATION := LOW, \ - CFLAGS := $(LIBINSTRUMENT_CFLAGS) $(CFLAGS_WARNINGS_ARE_ERRORS), \ - CFLAGS_debug := -DJPLIS_LOGGING, \ - CFLAGS_release := -DNO_JPLIS_LOGGING, \ - MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libinstrument/mapfile-vers, \ - LDFLAGS := $(LDFLAGS_JDKLIB) \ - $(call SET_SHARED_LIBRARY_ORIGIN) \ - $(LIBINSTRUMENT_LDFLAGS), \ - LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \ - LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \ - LDFLAGS_macosx := -Xlinker -all_load $(JDK_OUTPUTDIR)/objs/libjli_static.a \ - -framework Cocoa -framework Security -framework ApplicationServices, \ - LDFLAGS_SUFFIX := $(LIBINSTRUMENT_LDFLAGS_SUFFIX), \ - LDFLAGS_SUFFIX_macosx := -liconv $(LIBZ), \ - LDFLAGS_SUFFIX_solaris := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL) -lc, \ - LDFLAGS_SUFFIX_linux := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL), \ - LDFLAGS_SUFFIX_aix := $(LIBZ) -L$(JDK_OUTPUTDIR)/objs -ljli_static $(LIBDL),\ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ - RC_FLAGS := $(RC_FLAGS) \ - -D "JDK_FNAME=instrument.dll" \ - -D "JDK_INTERNAL_NAME=instrument" \ - -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(LIBINSTRUMENT_DIR), \ - DEBUG_SYMBOLS := true)) - -ifneq (, $(findstring $(OPENJDK_TARGET_OS), macosx windows aix)) - $(BUILD_LIBINSTRUMENT): $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jli_static$(STATIC_LIBRARY_SUFFIX) -else - $(BUILD_LIBINSTRUMENT): $(INSTALL_LIBRARIES_HERE)/jli/$(LIBRARY_PREFIX)jli$(SHARED_LIBRARY_SUFFIX) -endif -$(BUILD_LIBINSTRUMENT): $(BUILD_LIBJAVA) - -BUILD_LIBRARIES += $(BUILD_LIBINSTRUMENT) - -########################################################################################## - -BUILD_LIBMANAGEMENT_SRC := $(JDK_TOPDIR)/src/share/native/sun/management \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/management - -BUILD_LIBMANAGEMENT_EXCLUDES := - -BUILD_LIBMANAGEMENT_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/management - -ifneq ($(OPENJDK_TARGET_OS), solaris) - BUILD_LIBMANAGEMENT_EXCLUDES += SolarisOperatingSystem.c -endif - -ifneq ($(OPENJDK_TARGET_OS), linux) - BUILD_LIBMANAGEMENT_EXCLUDES += LinuxOperatingSystem.c -endif - -ifneq ($(OPENJDK_TARGET_OS), macosx) - BUILD_LIBMANAGEMENT_EXCLUDES += MacosxOperatingSystem.c -endif - -LIBMANAGEMENT_OPTIMIZATION := HIGH -ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), ) - ifeq ($(ENABLE_DEBUG_SYMBOLS), true) - LIBMANAGEMENT_OPTIMIZATION := LOW - endif -endif - -$(eval $(call SetupNativeCompilation,BUILD_LIBMANAGEMENT, \ - LIBRARY := management, \ - OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(BUILD_LIBMANAGEMENT_SRC), \ - EXCLUDE_FILES := $(BUILD_LIBMANAGEMENT_EXCLUDES), \ - LANG := C, \ - OPTIMIZATION := $(LIBMANAGEMENT_OPTIMIZATION), \ - CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) $(BUILD_LIBMANAGEMENT_CFLAGS), \ - MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libmanagement/mapfile-vers, \ - LDFLAGS := $(LDFLAGS_JDKLIB) \ - $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_solaris := -lkstat, \ - LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \ - LDFLAGS_SUFFIX_windows := jvm.lib psapi.lib $(WIN_JAVA_LIB) advapi32.lib, \ - LDFLAGS_SUFFIX_aix := -lperfstat,\ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ - RC_FLAGS := $(RC_FLAGS) \ - -D "JDK_FNAME=management.dll" \ - -D "JDK_INTERNAL_NAME=management" \ - -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libmanagement, \ - DEBUG_SYMBOLS := true)) - -$(BUILD_LIBMANAGEMENT): $(BUILD_LIBJAVA) - -BUILD_LIBRARIES += $(BUILD_LIBMANAGEMENT) - -########################################################################################## - -BUILD_LIBHPROF_SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/hprof $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/demo/jvmti/hprof -BUILD_LIBHPROF_CFLAGS := -I$(JDK_TOPDIR)/src/share/demo/jvmti/hprof \ - -I$(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo - -ifeq ($(OPENJDK_TARGET_OS), aix) - BUILD_LIBHPROF_SRC += $(JDK_TOPDIR)/src/aix/porting - BUILD_LIBHPROF_CFLAGS += -I$(JDK_TOPDIR)/src/aix/porting -endif - -BUILD_LIBHPROF_LDFLAGS := - -LIBHPROF_OPTIMIZATION := HIGHEST -ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), ) - ifeq ($(ENABLE_DEBUG_SYMBOLS), true) - LIBHPROF_OPTIMIZATION := LOW - endif -endif - -$(eval $(call SetupNativeCompilation,BUILD_LIBHPROF, \ - LIBRARY := hprof, \ - OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(BUILD_LIBHPROF_SRC), \ - LANG := C, \ - OPTIMIZATION := $(LIBHPROF_OPTIMIZATION), \ - CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) \ - $(BUILD_LIBHPROF_CFLAGS), \ - CFLAGS_debug := -DHPROF_LOGGING, \ - MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libhprof/mapfile-vers, \ - LDFLAGS := $(LDFLAGS_JDKLIB) \ - $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_windows := wsock32.lib winmm.lib advapi32.lib, \ - LDFLAGS_SUFFIX_linux := $(LIBDL), \ - LDFLAGS_SUFFIX_macosx := $(LIBDL), \ - LDFLAGS_SUFFIX_solaris := -lsocket -lnsl $(LIBDL) -lc, \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ - RC_FLAGS := $(RC_FLAGS) \ - -D "JDK_FNAME=hprof.dll" \ - -D "JDK_INTERNAL_NAME=hprof" \ - -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libhprof_jvmti, \ - DEBUG_SYMBOLS := true)) - -BUILD_LIBRARIES += $(BUILD_LIBHPROF) - -########################################################################################## - -$(eval $(call SetupNativeCompilation,BUILD_LIBJAVA_CRW_DEMO, \ - LIBRARY := java_crw_demo, \ - OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo, \ - LANG := C, \ - OPTIMIZATION := LOW, \ - CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) \ - -I$(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo, \ - MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjava_crw_demo/mapfile-vers, \ - LDFLAGS := $(LDFLAGS_JDKLIB) \ - $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX_solaris := -lc, \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ - RC_FLAGS := $(RC_FLAGS) \ - -D "JDK_FNAME=java_crw_demo.dll" \ - -D "JDK_INTERNAL_NAME=java_crw_demo" \ - -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjava_crw_demo, \ - DEBUG_SYMBOLS := true)) - -BUILD_LIBRARIES += $(BUILD_LIBJAVA_CRW_DEMO) - -########################################################################################## - -ifndef OPENJDK - ifeq ($(ENABLE_JFR), true) - - $(eval $(call SetupNativeCompilation,BUILD_LIBJFR, \ - LIBRARY := jfr, \ - OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(JDK_TOPDIR)/src/closed/share/native/oracle/jfr, \ - LANG := C, \ - OPTIMIZATION := LOW, \ - CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) \ - -I$(JDK_TOPDIR)/src/closed/share/javavm/export, \ - MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjfr/mapfile-vers, \ - LDFLAGS := $(LDFLAGS_JDKLIB) \ - $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX_solaris := -lc, \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ - RC_FLAGS := $(RC_FLAGS) \ - -D "JDK_FNAME=jfr.dll" \ - -D "JDK_INTERNAL_NAME=jfr" \ - -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjfr, \ - DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) - - BUILD_LIBRARIES += $(BUILD_LIBJFR) - - endif -endif diff --git a/jdk/make/lib/SoundLibraries.gmk b/jdk/make/lib/SoundLibraries.gmk index 14580959ccc..6348f7a7d7b 100644 --- a/jdk/make/lib/SoundLibraries.gmk +++ b/jdk/make/lib/SoundLibraries.gmk @@ -24,13 +24,18 @@ # LIBJSOUND_SRC_DIRS := \ - $(JDK_TOPDIR)/src/share/native/com/sun/media/sound \ - $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/com/sun/media/sound + $(JDK_TOPDIR)/src/java.desktop/share/native/libjsound \ + $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libjsound \ + # +LIBJSOUND_CFLAGS := \ + -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \ + $(LIBJAVA_HEADER_FLAGS) \ + $(foreach dir, $(LIBJSOUND_SRC_DIRS), -I$(dir)) \ + # LIBJSOUND_SRC_FILES := Utilities.c Platform.c LIBJSOUND_LANG := C -LIBJSOUND_CFLAGS := $(foreach dir, $(LIBJSOUND_SRC_DIRS), -I$(dir)) EXTRA_SOUND_JNI_LIBS := @@ -82,7 +87,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) -DUSE_DAUDIO=TRUE \ -DUSE_PLATFORM_MIDI_OUT=TRUE \ -DUSE_PLATFORM_MIDI_IN=TRUE - LIBJSOUND_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/native/com/sun/media/sound + LIBJSOUND_SRC_DIRS += $(JDK_TOPDIR)/src/java.desktop/macosx/native/libjsound LIBJSOUND_SRC_FILES += \ PLATFORM_API_MacOSX_Utils.cpp \ PLATFORM_API_MacOSX_PCM.cpp \ @@ -162,7 +167,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJSOUND, \ LDFLAGS_windows := $(WIN_JAVA_LIB) advapi32.lib winmm.lib, \ LDFLAGS_SUFFIX_posix := -ljava -ljvm, \ LDFLAGS_SUFFIX_solaris := -lc, \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=jsound.dll" \ -D "JDK_INTERNAL_NAME=jsound" \ @@ -172,7 +177,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJSOUND, \ $(BUILD_LIBJSOUND): $(BUILD_LIBJAVA) -BUILD_LIBRARIES += $(BUILD_LIBJSOUND) +DESKTOP_LIBRARIES += $(BUILD_LIBJSOUND) ########################################################################################## @@ -208,7 +213,7 @@ ifneq ($(filter jsoundalsa, $(EXTRA_SOUND_JNI_LIBS)), ) $(BUILD_LIBJSOUNDALSA): $(BUILD_LIBJAVA) - BUILD_LIBRARIES += $(BUILD_LIBJSOUNDALSA) + DESKTOP_LIBRARIES += $(BUILD_LIBJSOUNDALSA) endif @@ -230,7 +235,7 @@ ifneq ($(filter jsoundds, $(EXTRA_SOUND_JNI_LIBS)), ) LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX) dsound.lib winmm.lib user32.lib ole32.lib, \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=jsoundds.dll" \ -D "JDK_INTERNAL_NAME=jsoundds" \ @@ -240,6 +245,6 @@ ifneq ($(filter jsoundds, $(EXTRA_SOUND_JNI_LIBS)), ) $(BUILD_LIBJSOUNDDS): $(BUILD_LIBJAVA) - BUILD_LIBRARIES += $(BUILD_LIBJSOUNDDS) + DESKTOP_LIBRARIES += $(BUILD_LIBJSOUNDDS) endif diff --git a/jdk/make/GenerateClasses.gmk b/jdk/make/rmic/Rmic-java.management.gmk similarity index 50% rename from jdk/make/GenerateClasses.gmk rename to jdk/make/rmic/Rmic-java.management.gmk index 1ae80cd27d0..07a9f35eee5 100644 --- a/jdk/make/GenerateClasses.gmk +++ b/jdk/make/rmic/Rmic-java.management.gmk @@ -25,67 +25,13 @@ default: all -include $(SPEC) -include MakeBase.gmk -include RMICompilation.gmk -include JavaCompilation.gmk -include Setup.gmk - -########################################################################################## - -RMIC_PKGS := \ - sun/rmi/rmic \ - sun/tools/asm \ - sun/tools/java \ - sun/tools/javac \ - sun/tools/tree \ - sun/tools/util \ - # - -$(eval $(call SetupJavaCompilation,BUILD_BOOTSTRAP_RMIC, \ - SETUP := GENERATE_OLDBYTECODE, \ - SRC := $(JDK_TOPDIR)/src/share/classes, \ - INCLUDES := $(RMIC_PKGS), \ - BIN := $(JDK_OUTPUTDIR)/btclasses_rmic, \ - COPY := .properties, \ - JAVAC_SOURCE_PATH_OVERRIDE := $(addprefix $(JDK_TOPDIR)/src/share/classes/, $(RMIC_PKGS)))) - -########################################################################################## - -BTRMIC_CP := $(INTERIM_CORBA_JAR)$(PATH_SEP)$(JDK_OUTPUTDIR)/btclasses_rmic$(PATH_SEP)$(INTERIM_LANGTOOLS_JAR) -BTRMIC_ARGS := "-Xbootclasspath/p:$(BTRMIC_CP)" -cp "$(BTRMIC_CP)" -RMIC := $(JAVA) $(BTRMIC_ARGS) sun.rmi.rmic.Main - -CLASSES_DIR := $(JDK_OUTPUTDIR)/classes -# NOTE: If the smart javac dependency management is reintroduced, these classes risk -# interfering with the dependency checking. In that case they will need to be kept separate. -STUB_CLASSES_DIR := $(JDK_OUTPUTDIR)/classes -RMIC_GENSRC_DIR := $(JDK_OUTPUTDIR)/gendocsrc_rmic - -GENCLASSES := +include RmicCommon.gmk ########################################################################################## # # Generate RMI stubs # -$(eval $(call SetupRMICompilation,RMI_12, \ - CLASSES := sun.rmi.server.Activation$$$$ActivationSystemImpl \ - java.rmi.activation.ActivationGroup \ - com.sun.jndi.rmi.registry.ReferenceWrapper, \ - CLASSES_DIR := $(CLASSES_DIR), \ - STUB_CLASSES_DIR := $(STUB_CLASSES_DIR), \ - RUN_V12 := true)) -GENCLASSES += $(RMI_12) - -$(eval $(call SetupRMICompilation,RMI_11, \ - CLASSES := sun.rmi.registry.RegistryImpl \ - sun.rmi.transport.DGCImpl, \ - CLASSES_DIR := $(CLASSES_DIR), \ - STUB_CLASSES_DIR := $(STUB_CLASSES_DIR), \ - RUN_V11 := true)) -GENCLASSES += $(RMI_11) - # For RMI/IIOP call rmic a second time with -standardPackage option # so that *_tie classes are generated in package without the prefix # org.omg.stub (6375696) @@ -97,31 +43,27 @@ ifneq ($(RMICONNECTOR_IIOP), false) endif $(eval $(call SetupRMICompilation,RMI_IIOP, \ CLASSES := $(JMX_RMI_CLASSES), \ - CLASSES_DIR := $(CLASSES_DIR), \ - STUB_CLASSES_DIR := $(STUB_CLASSES_DIR), \ + CLASSES_DIR := $(CLASSES_DIR)/java.management, \ + STUB_CLASSES_DIR := $(STUB_CLASSES_DIR)/java.management, \ RUN_V12 := true, \ RUN_IIOP := $(GENRMIIIOPCLASSES), \ RUN_IIOP_STDPKG := $(GENRMIIIOPCLASSES))) -GENCLASSES += $(RMI_IIOP) # Keep generated RMI/JRMP Stub source files and copy them to RMIC_GENSRC_DIR # so that javadoc can include them in the API (4997471) $(eval $(call SetupRMICompilation,RMI_SRC, \ CLASSES := $(JMX_RMI_CLASSES), \ - CLASSES_DIR := $(CLASSES_DIR), \ + CLASSES_DIR := $(CLASSES_DIR)/java.management, \ STUB_CLASSES_DIR := $(RMIC_GENSRC_DIR), \ RUN_V12 := true, \ KEEP_GENERATED := true)) -GENCLASSES += $(filter %.java, $(RMI_SRC)) ########################################################################################## -$(RMI_12) $(RMI_11) $(RMI_IIOP) $(RMI_SRC): $(BUILD_BOOTSTRAP_RMIC) - -$(RMIC_GENSRC_DIR)/_the.classes.removed: $(GENCLASSES) +$(RMIC_GENSRC_DIR)/_the.classes.removed: $(RMI_IIOP) $(RMI_SRC) $(FIND) $(RMIC_GENSRC_DIR) -name "*.class" $(FIND_DELETE) $(TOUCH) $@ -all: $(RMIC_GENSRC_DIR)/_the.classes.removed $(GENCLASSES) +all: $(RMIC_GENSRC_DIR)/_the.classes.removed $(RMI_IIOP) $(RMI_SRC) .PHONY: all diff --git a/jdk/make/rmic/Rmic-java.rmi.gmk b/jdk/make/rmic/Rmic-java.rmi.gmk new file mode 100644 index 00000000000..44eb8f3de74 --- /dev/null +++ b/jdk/make/rmic/Rmic-java.rmi.gmk @@ -0,0 +1,55 @@ +# +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +default: all + +include RmicCommon.gmk + +################################################################################ +# +# Generate RMI stubs +# + +$(eval $(call SetupRMICompilation,RMI_12, \ + CLASSES := sun.rmi.server.Activation$$$$ActivationSystemImpl \ + java.rmi.activation.ActivationGroup, \ + CLASSES_DIR := $(CLASSES_DIR)/java.rmi, \ + STUB_CLASSES_DIR := $(STUB_CLASSES_DIR)/java.rmi, \ + RUN_V12 := true)) +GENCLASSES += $(RMI_12) + +$(eval $(call SetupRMICompilation,RMI_11, \ + CLASSES := sun.rmi.registry.RegistryImpl \ + sun.rmi.transport.DGCImpl, \ + CLASSES_DIR := $(CLASSES_DIR)/java.rmi, \ + STUB_CLASSES_DIR := $(STUB_CLASSES_DIR)/java.rmi, \ + RUN_V11 := true)) +GENCLASSES += $(RMI_11) + +################################################################################ + +all: $(RMI_11) $(RMI_12) + +.PHONY: all diff --git a/langtools/make/BuildLangtools.gmk b/jdk/make/rmic/Rmic-jdk.naming.rmi.gmk similarity index 67% rename from langtools/make/BuildLangtools.gmk rename to jdk/make/rmic/Rmic-jdk.naming.rmi.gmk index f59ef574f4d..21556ce1745 100644 --- a/langtools/make/BuildLangtools.gmk +++ b/jdk/make/rmic/Rmic-jdk.naming.rmi.gmk @@ -23,25 +23,23 @@ # questions. # -# This must be the first rule default: all -include $(SPEC) +include RmicCommon.gmk -gensrc-langtools: - +$(MAKE) -f $(LANGTOOLS_TOPDIR)/make/GensrcLangtools.gmk +########################################################################################## +# +# Generate RMI stubs +# -interim-langtools: gensrc-langtools - +$(MAKE) -f $(LANGTOOLS_TOPDIR)/make/CompileInterim.gmk +$(eval $(call SetupRMICompilation,RMI_12, \ + CLASSES := com.sun.jndi.rmi.registry.ReferenceWrapper, \ + CLASSES_DIR := $(CLASSES_DIR)/jdk.naming.rmi, \ + STUB_CLASSES_DIR := $(STUB_CLASSES_DIR)/jdk.naming.rmi, \ + RUN_V12 := true)) -genstubs-langtools: interim-langtools - +$(MAKE) -f $(LANGTOOLS_TOPDIR)/make/GenstubsLangtools.gmk +########################################################################################## -compile-langtools: gensrc-langtools interim-langtools genstubs-langtools - +$(MAKE) -f $(LANGTOOLS_TOPDIR)/make/CompileLangtools.gmk - -all: compile-langtools - -.PHONY: default all -.PHONY: gensrc-langtools interim-langtools genstubs-langtools compile-langtools +all: $(RMI_12) +.PHONY: all diff --git a/jdk/make/rmic/RmicCommon.gmk b/jdk/make/rmic/RmicCommon.gmk new file mode 100644 index 00000000000..2affa75a800 --- /dev/null +++ b/jdk/make/rmic/RmicCommon.gmk @@ -0,0 +1,44 @@ +# +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +default: all + +include $(SPEC) +include MakeBase.gmk +include RMICompilation.gmk + +########################################################################################## + +BTRMIC_CP := $(INTERIM_CORBA_JAR)$(PATH_SEP)$(JDK_OUTPUTDIR)/interim_rmic_classes$(PATH_SEP)$(INTERIM_LANGTOOLS_JAR) +BTRMIC_ARGS := "-Xbootclasspath/p:$(BTRMIC_CP)" -cp "$(BTRMIC_CP)" +RMIC := $(JAVA) $(BTRMIC_ARGS) sun.rmi.rmic.Main + +CLASSES_DIR := $(JDK_OUTPUTDIR)/modules +# NOTE: If the smart javac dependency management is reintroduced, these classes risk +# interfering with the dependency checking. In that case they will need to be kept separate. +STUB_CLASSES_DIR := $(JDK_OUTPUTDIR)/modules +RMIC_GENSRC_DIR := $(JDK_OUTPUTDIR)/gendocsrc_rmic + +########################################################################################## diff --git a/jdk/make/src/classes/build/tools/addtorestrictedpkgs/AddToRestrictedPkgs.java b/jdk/make/src/classes/build/tools/addtorestrictedpkgs/AddToRestrictedPkgs.java deleted file mode 100644 index ee9deb4b75f..00000000000 --- a/jdk/make/src/classes/build/tools/addtorestrictedpkgs/AddToRestrictedPkgs.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package build.tools.addtorestrictedpkgs; - -import java.io.*; - -/** - * Adds additional packages to the package.access and package.definition - * security properties. - */ -public class AddToRestrictedPkgs { - - private static final String PKG_ACC = "package.access"; - private static final String PKG_DEF = "package.definition"; - private static final int PKG_ACC_INDENT = 15; - private static final int PKG_DEF_INDENT = 19; - - public static void main(String[] args) throws Exception { - - if (args.length < 3) { - System.err.println("Usage: java AddToRestrictedPkgs " + - "[input java.security file name] " + - "[output java.security file name] " + - "[packages ...]"); - System.exit(1); - } - - try (FileReader fr = new FileReader(args[0]); - BufferedReader br = new BufferedReader(fr); - FileWriter fw = new FileWriter(args[1]); - BufferedWriter bw = new BufferedWriter(fw)) - { - // parse the file line-by-line, looking for pkg access properties - String line = br.readLine(); - while (line != null) { - if (line.startsWith(PKG_ACC)) { - writePackages(br, bw, line, PKG_ACC_INDENT, args); - } else if (line.startsWith(PKG_DEF)) { - writePackages(br, bw, line, PKG_DEF_INDENT, args); - } else { - writeLine(bw, line); - } - line = br.readLine(); - } - bw.flush(); - } - } - - private static void writePackages(BufferedReader br, BufferedWriter bw, - String line, int numSpaces, - String[] args) throws IOException { - // parse property until EOL, not including line breaks - while (line.endsWith("\\")) { - writeLine(bw, line); - line = br.readLine(); - } - // append comma and line-break to last package - writeLine(bw, line + ",\\"); - // add new packages, one per line - for (int i = 2; i < args.length - 1; i++) { - indent(bw, numSpaces); - writeLine(bw, args[i] + ",\\"); - } - indent(bw, numSpaces); - writeLine(bw, args[args.length - 1]); - } - - private static void writeLine(BufferedWriter bw, String line) - throws IOException - { - bw.write(line); - bw.newLine(); - } - - private static void indent(BufferedWriter bw, int numSpaces) - throws IOException - { - for (int i = 0; i < numSpaces; i++) { - bw.append(' '); - } - } -} diff --git a/jdk/make/src/classes/build/tools/compileproperties/CompileProperties.java b/jdk/make/src/classes/build/tools/compileproperties/CompileProperties.java index fa3b9f776f9..83e1782b72f 100644 --- a/jdk/make/src/classes/build/tools/compileproperties/CompileProperties.java +++ b/jdk/make/src/classes/build/tools/compileproperties/CompileProperties.java @@ -369,6 +369,9 @@ public class CompileProperties { if (inputs[i].equals("classes") && outputs[j].equals("classes")) { ++i; } + if (i > 0 && inputs[i-1].equals("modules")) { + ++i; + } inStart = i; StringBuffer buf = new StringBuffer(); for (i = inStart; i <= inEnd; i++) { diff --git a/jdk/make/src/classes/build/tools/jarreorder/JarReorder.java b/jdk/make/src/classes/build/tools/jarreorder/JarReorder.java index d5cc91dc89d..589cb227d9e 100644 --- a/jdk/make/src/classes/build/tools/jarreorder/JarReorder.java +++ b/jdk/make/src/classes/build/tools/jarreorder/JarReorder.java @@ -51,7 +51,10 @@ public class JarReorder { private void usage() { String help; help = - "Usage: jar JarReorder [-o ] ...\n" + "Usage: jar JarReorder [-m] [-o ] ...\n" + + " -m activate module mode, where every direct sub\n" + + " directory of the current working directory\n" + + " will be assumed to be a separate source root\n" + " order_list is a file containing names of files to load\n" + " in order at the end of a jar file unless\n" + " excluded in the exclude list.\n" @@ -74,6 +77,7 @@ public class JarReorder { * files and directories to be excluded. * * Command path arguments are + * - optional -m for module mode. * - optional -o outputfile * - name of a file containing a set of files to be included in a jar file. * - name of a file containing a set of files (or directories) to be @@ -91,11 +95,19 @@ public class JarReorder { int arglen = args.length; int argpos = 0; - // Look for "-o outputfilename" option + boolean moduleMode = false; + if (arglen > 0) { - if (arglen >= 2 && args[0].equals("-o")) { + // Check for module mode + if (args[argpos].equals("-m")) { + moduleMode = true; + argpos++; + arglen--; + } + // Look for "-o outputfilename" option + if (arglen >= 2 && args[argpos].equals("-o")) { try { - out = new PrintStream(new FileOutputStream(args[1])); + out = new PrintStream(new FileOutputStream(args[argpos+1])); } catch (FileNotFoundException e) { System.err.println("Error: " + e.getMessage()); e.printStackTrace(System.err); @@ -124,9 +136,14 @@ public class JarReorder { argpos += 2; arglen -= 2; + // If we run module mode, this will contain the list of subdirs to use + // as source roots. Otherwise it will just contain the current working + // dir. + List moduleDirs = findModuleDirs(moduleMode); + // Create 2 lists and a set of processed files - List orderList = readListFromFile(classListFile, true); - List excludeList = readListFromFile(excludeListFile, false); + List orderList = readListFromFile(classListFile, true, moduleDirs); + List excludeList = readListFromFile(excludeListFile, false, moduleDirs); Set processed = new HashSet(); // Create set of all files and directories excluded, then expand @@ -142,9 +159,11 @@ public class JarReorder { Set inputSet = new HashSet(); for (int i = 0; i < arglen; ++i) { String name = args[argpos + i]; - name = cleanPath(new File(name)); - if ( name != null && name.length() > 0 && !inputSet.contains(name) ) { - inputSet.add(name); + for (File dir : moduleDirs) { + String cleanName = cleanPath(new File(dir, name)); + if ( cleanName != null && cleanName.length() > 0 && !inputSet.contains(cleanName) ) { + inputSet.add(cleanName); + } } } @@ -175,7 +194,22 @@ public class JarReorder { // Print final results. for (String str : allFiles) { - out.println(str); + // If running in module mode, each line must be prepended with a + // '-C dir ' which points to the source root where that file is + // found. + if (moduleMode) { + int firstPathSep = str.indexOf(File.separator); + String moduleDir; + if (firstPathSep < 0) { + moduleDir = "."; + } else { + moduleDir = str.substring(0, firstPathSep); + } + String filePath = str.substring(firstPathSep + 1); + out.println("-C " + moduleDir + " " + filePath); + } else { + out.println(str); + } } out.flush(); out.close(); @@ -185,7 +219,7 @@ public class JarReorder { * Read a file containing a list of files and directories into a List. */ private List readListFromFile(String fileName, - boolean addClassSuffix) { + boolean addClassSuffix, List moduleDirs) { BufferedReader br = null; List list = new ArrayList(); @@ -211,11 +245,22 @@ public class JarReorder { if (addClassSuffix && !path.endsWith(".class")) { path = path + ".class"; } - // Normalize the path - path = cleanPath(new File(path)); - // Add to list - if (path != null && path.length() > 0 && !list.contains(path)) { - list.add(path); + // Look for file in each module source root + boolean pathFound = false; + for (File dir : moduleDirs) { + File file = new File(dir, path); + if (file.exists()) { + pathFound = true; + // Normalize the path + String cleanPath = cleanPath(new File(dir, path)); + // Add to list + if (cleanPath != null && cleanPath.length() > 0 && !list.contains(cleanPath)) { + list.add(cleanPath); + } + } + } + if (!pathFound) { + System.err.println("WARNING: Path does not exist as file or directory: " + path); } } br.close(); @@ -273,6 +318,27 @@ public class JarReorder { return includedFiles; } + /** + * Find all module sub directories to be used as source roots. + * @param moduleMode If true, assume sub directories are modules, otherwise + * just use current working directory. + * @return List of all found source roots + */ + private List findModuleDirs(boolean moduleMode) { + File cwd = new File("."); + List moduleDirs = new ArrayList(); + if (moduleMode) { + for (File f : cwd.listFiles()) { + if (f.isDirectory()) { + moduleDirs.add(f); + } + } + } else { + moduleDirs.add(cwd); + } + return moduleDirs; + } + private String cleanPath(File f) { String path = f.getPath(); if (f.isFile()) { @@ -296,7 +362,7 @@ public class JarReorder { path = path.replace('/', '\\'); } // Remove leading ./ - if (path.startsWith("." + File.separator)) { + while (path.startsWith("." + File.separator)) { path = path.substring(2); } return path; @@ -308,6 +374,10 @@ public class JarReorder { if (!path.endsWith(File.separator)) { path = path + File.separator; } + // Remove any /./ in the path. + if (path.endsWith(File.separator + "." + File.separator)) { + path = path.substring(0, path.length() - 2); + } return path; } diff --git a/jdk/make/src/classes/build/tools/makejavasecurity/MakeJavaSecurity.java b/jdk/make/src/classes/build/tools/makejavasecurity/MakeJavaSecurity.java new file mode 100644 index 00000000000..d5c6e14c7b1 --- /dev/null +++ b/jdk/make/src/classes/build/tools/makejavasecurity/MakeJavaSecurity.java @@ -0,0 +1,168 @@ +/* + * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package build.tools.makejavasecurity; + +import java.io.*; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.*; + +/** + * Builds the java.security file, including + * + * 1. Adds additional packages to the package.access and + * package.definition security properties. + * 2. Filter out platform-unrelated parts + * + * In order to easily maintain platform-related entries, every item + * (including the last line) in package.access and package.definition + * MUST end with ',\'. A blank line MUST exist after the last line. + */ +public class MakeJavaSecurity { + + private static final String PKG_ACC = "package.access"; + private static final String PKG_DEF = "package.definition"; + private static final int PKG_ACC_INDENT = 15; + private static final int PKG_DEF_INDENT = 19; + + public static void main(String[] args) throws Exception { + + if (args.length < 3) { + System.err.println("Usage: java MakeJavaSecurity " + + "[input java.security file name] " + + "[output java.security file name] " + + "[openjdk target os] " + + "[more restricted packages file name?]"); + System.exit(1); + } + + // more restricted packages + List extraLines; + if (args.length == 4) { + extraLines = Files.readAllLines(Paths.get(args[3])); + } else { + extraLines = Collections.emptyList(); + } + + List lines = new ArrayList<>(); + + // read raw java.security and add more restricted packages + try (FileReader fr = new FileReader(args[0]); + BufferedReader br = new BufferedReader(fr)) { + // looking for pkg access properties + String line = br.readLine(); + while (line != null) { + if (line.startsWith(PKG_ACC)) { + addPackages(br, lines, line, PKG_ACC_INDENT, extraLines); + } else if (line.startsWith(PKG_DEF)) { + addPackages(br, lines, line, PKG_DEF_INDENT, extraLines); + } else { + lines.add(line); + } + line = br.readLine(); + } + } + + // Filter out platform-unrelated ones. We only support + // #ifdef, #ifndef, and #endif. + int mode = 0; // 0: out of block, 1: in match, 2: in non-match + Iterator iter = lines.iterator(); + while (iter.hasNext()) { + String line = iter.next(); + if (line.startsWith("#endif")) { + mode = 0; + iter.remove(); + } else if (line.startsWith("#ifdef ")) { + mode = line.endsWith(args[2])?1:2; + iter.remove(); + } else if (line.startsWith("#ifndef ")) { + mode = line.endsWith(args[2])?2:1; + iter.remove(); + } else { + if (mode == 2) iter.remove(); + } + } + + // Update .tbd to .1, .2, etc. + Map count = new HashMap<>(); + for (int i=0; i= 0) { + String prefix = line.substring(0, index); + int n = count.getOrDefault(prefix, 1); + count.put(prefix, n+1); + lines.set(i, prefix + "." + n + line.substring(index+4)); + } + } + + // Clean up the last line of PKG_ACC and PKG_DEF blocks. + // Not really necessary since a blank line follows. + boolean inBlock = false; + for (int i=0; i lines, + String line, int numSpaces, + List args) throws IOException { + // parse property until EOL, not including line breaks + boolean first = true; + while (!line.isEmpty()) { + if (!line.startsWith("#")) { + if (!line.endsWith(",\\") || + (!first && line.contains("="))) { + throw new IOException("Invalid line: " + line); + } + } + lines.add(line); + line = br.readLine(); + first = false; + } + // add new packages, one per line + for (String arg: args) { + if (arg.startsWith("#")) { + lines.add(arg); + } else { + lines.add(String.format("%"+numSpaces+"s", "") + arg + ",\\"); + } + } + lines.add(line); + } +} diff --git a/jdk/make/src/classes/build/tools/module/GenerateModulesXml.java b/jdk/make/src/classes/build/tools/module/GenerateModulesXml.java new file mode 100644 index 00000000000..c2fdf4ae9d1 --- /dev/null +++ b/jdk/make/src/classes/build/tools/module/GenerateModulesXml.java @@ -0,0 +1,475 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package build.tools.module; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.nio.file.Files; +import java.nio.file.NoSuchFileException; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.attribute.BasicFileAttributes; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.jar.JarEntry; +import java.util.jar.JarFile; +import javax.xml.namespace.QName; +import javax.xml.stream.*; +import javax.xml.stream.events.Attribute; +import javax.xml.stream.events.XMLEvent; + +/** + * This tool is used to generate com/sun/tools/jdeps/resources/modules.xml + * for jdeps to analyze dependencies and enforce module boundaries. + * + * $ java build.tools.module.GenerateModulesXml \ + * com/sun/tools/jdeps/resources/modules.xml $OUTPUTDIR/modules + * + * This will generate modules.xml as jdeps resources that extend + * the metadata to include module membership (jdeps needs the + * membership information to determine which module a type belongs to.) + */ +public final class GenerateModulesXml { + private final static String USAGE = + "Usage: GenerateModulesXml build/modules"; + + public static void main(String[] args) throws Exception { + if (args.length < 2) { + System.err.println(USAGE); + System.exit(-1); + } + + Path outfile = Paths.get(args[0]); + Path modulepath = Paths.get(args[1]); + + if (!Files.isDirectory(modulepath)) { + System.err.println(modulepath + " is not a directory"); + System.exit(1); + } + GenerateModulesXml gentool = + new GenerateModulesXml(modulepath); + Set modules; + try (InputStream in = GenerateModulesXml.class.getResourceAsStream("modules.xml")) { + modules = gentool.load(in); + } + + InputStream in = GenerateModulesXml.class.getResourceAsStream("closed/modules.xml"); + if (in != null) { + try { + Set mods = gentool.load(in); + modules.addAll(mods); + } finally { + in.close(); + } + } + + Files.createDirectories(outfile.getParent()); + gentool.writeXML(modules, outfile); + } + + final Path modulepath; + public GenerateModulesXml(Path modulepath) { + this.modulepath = modulepath; + } + + private static final String MODULES = "modules"; + private static final String MODULE = "module"; + private static final String NAME = "name"; + private static final String DEPEND = "depend"; + private static final String EXPORT = "export"; + private static final String TO = "to"; + private static final String INCLUDE = "include"; + private static final QName REEXPORTS = new QName("re-exports"); + private Set load(InputStream in) throws XMLStreamException, IOException { + Set modules = new HashSet<>(); + XMLInputFactory factory = XMLInputFactory.newInstance(); + XMLEventReader stream = factory.createXMLEventReader(in); + Module.Builder mb = null; + String modulename = null; + String pkg = null; + Set permits = new HashSet<>(); + while (stream.hasNext()) { + XMLEvent event = stream.nextEvent(); + if (event.isStartElement()) { + String startTag = event.asStartElement().getName().getLocalPart(); + switch (startTag) { + case MODULES: + break; + case MODULE: + if (mb != null) { + throw new RuntimeException("end tag for module is missing"); + } + modulename = getNextTag(stream, NAME); + mb = new Module.Builder(); + mb.name(modulename); + break; + case NAME: + throw new RuntimeException(event.toString()); + case DEPEND: + boolean reexports = false; + Attribute attr = event.asStartElement().getAttributeByName(REEXPORTS); + if (attr != null) { + String value = attr.getValue(); + if (value.equals("true") || value.equals("false")) { + reexports = Boolean.parseBoolean(value); + } else { + throw new RuntimeException("unexpected attribute " + attr.toString()); + } + } + mb.require(getData(stream), reexports); + break; + case INCLUDE: + throw new RuntimeException("unexpected " + event); + case EXPORT: + pkg = getNextTag(stream, NAME); + break; + case TO: + permits.add(getData(stream)); + break; + default: + } + } else if (event.isEndElement()) { + String endTag = event.asEndElement().getName().getLocalPart(); + switch (endTag) { + case MODULE: + buildIncludes(mb, modulename); + modules.add(mb.build()); + mb = null; + break; + case EXPORT: + if (pkg == null) { + throw new RuntimeException("export-to is malformed"); + } + mb.exportTo(pkg, permits); + pkg = null; + permits.clear(); + break; + default: + } + } else if (event.isCharacters()) { + String s = event.asCharacters().getData(); + if (!s.trim().isEmpty()) { + throw new RuntimeException("export-to is malformed"); + } + } + } + return modules; + } + + private String getData(XMLEventReader reader) throws XMLStreamException { + XMLEvent e = reader.nextEvent(); + if (e.isCharacters()) { + return e.asCharacters().getData(); + } + throw new RuntimeException(e.toString()); + } + + private String getNextTag(XMLEventReader reader, String tag) throws XMLStreamException { + XMLEvent e = reader.nextTag(); + if (e.isStartElement()) { + String t = e.asStartElement().getName().getLocalPart(); + if (!tag.equals(t)) { + throw new RuntimeException(e + " expected: " + tag); + } + return getData(reader); + } + throw new RuntimeException("export-to name is missing:" + e); + } + private void writeXML(Set modules, Path path) + throws IOException, XMLStreamException + { + XMLOutputFactory xof = XMLOutputFactory.newInstance(); + try (OutputStream out = Files.newOutputStream(path)) { + int depth = 0; + XMLStreamWriter xtw = xof.createXMLStreamWriter(out, "UTF-8"); + xtw.writeStartDocument("utf-8","1.0"); + writeStartElement(xtw, MODULES, depth); + modules.stream() + .sorted(Comparator.comparing(Module::name)) + .forEach(m -> writeModuleElement(xtw, m, depth+1)); + writeEndElement(xtw, depth); + xtw.writeCharacters("\n"); + xtw.writeEndDocument(); + xtw.flush(); + xtw.close(); + } + } + + private void writeElement(XMLStreamWriter xtw, String element, String value, int depth) { + try { + writeStartElement(xtw, element, depth); + xtw.writeCharacters(value); + xtw.writeEndElement(); + } catch (XMLStreamException e) { + throw new RuntimeException(e); + } + } + + private void writeDependElement(XMLStreamWriter xtw, Module.Dependence d, int depth) { + try { + writeStartElement(xtw, DEPEND, depth); + if (d.reexport) { + xtw.writeAttribute("re-exports", "true"); + } + xtw.writeCharacters(d.name); + xtw.writeEndElement(); + } catch (XMLStreamException e) { + throw new RuntimeException(e); + } + } + + private void writeExportElement(XMLStreamWriter xtw, String pkg, int depth) { + writeExportElement(xtw, pkg, Collections.emptySet(), depth); + } + + private void writeExportElement(XMLStreamWriter xtw, String pkg, + Set permits, int depth) { + try { + writeStartElement(xtw, EXPORT, depth); + writeElement(xtw, NAME, pkg, depth+1); + if (!permits.isEmpty()) { + permits.stream().sorted() + .forEach(m -> writeElement(xtw, TO, m, depth + 1)); + } + writeEndElement(xtw, depth); + } catch (XMLStreamException e) { + throw new RuntimeException(e); + } + } + private void writeModuleElement(XMLStreamWriter xtw, Module m, int depth) { + try { + writeStartElement(xtw, MODULE, depth); + writeElement(xtw, NAME, m.name(), depth+1); + m.requires().stream().sorted(Comparator.comparing(d -> d.name)) + .forEach(d -> writeDependElement(xtw, d, depth+1)); + m.exports().keySet().stream() + .filter(pn -> m.exports().get(pn).isEmpty()) + .sorted() + .forEach(pn -> GenerateModulesXml.this.writeExportElement(xtw, pn, depth+1)); + m.exports().entrySet().stream() + .filter(e -> !e.getValue().isEmpty()) + .sorted(Map.Entry.comparingByKey()) + .forEach(e -> writeExportElement(xtw, e.getKey(), e.getValue(), depth+1)); + m.packages().stream().sorted() + .forEach(p -> writeElement(xtw, INCLUDE, p, depth+1)); + writeEndElement(xtw, depth); + } catch (XMLStreamException e) { + throw new RuntimeException(e); + + } + } + + /** Two spaces; the default indentation. */ + public static final String DEFAULT_INDENT = " "; + + /** stack[depth] indicates what's been written into the current scope. */ + private static String[] stack = new String[] { "\n", + "\n" + DEFAULT_INDENT, + "\n" + DEFAULT_INDENT + DEFAULT_INDENT, + "\n" + DEFAULT_INDENT + DEFAULT_INDENT + DEFAULT_INDENT}; + + private void writeStartElement(XMLStreamWriter xtw, String name, int depth) + throws XMLStreamException + { + xtw.writeCharacters(stack[depth]); + xtw.writeStartElement(name); + } + + private void writeEndElement(XMLStreamWriter xtw, int depth) throws XMLStreamException { + xtw.writeCharacters(stack[depth]); + xtw.writeEndElement(); + } + + private String packageName(Path p) { + return packageName(p.toString().replace(File.separatorChar, '/')); + } + private String packageName(String name) { + int i = name.lastIndexOf('/'); + return (i > 0) ? name.substring(0, i).replace('/', '.') : ""; + } + + private boolean includes(String name) { + return name.endsWith(".class") && !name.equals("module-info.class"); + } + + public void buildIncludes(Module.Builder mb, String modulename) throws IOException { + Path mclasses = modulepath.resolve(modulename); + try { + Files.find(mclasses, Integer.MAX_VALUE, (Path p, BasicFileAttributes attr) + -> includes(p.getFileName().toString())) + .map(p -> packageName(mclasses.relativize(p))) + .forEach(mb::include); + } catch (NoSuchFileException e) { + // aggregate module may not have class + } + } + + static class Module { + static class Dependence { + final String name; + final boolean reexport; + Dependence(String name) { + this(name, false); + } + Dependence(String name, boolean reexport) { + this.name = name; + this.reexport = reexport; + } + + @Override + public int hashCode() { + int hash = 5; + hash = 11 * hash + Objects.hashCode(this.name); + hash = 11 * hash + (this.reexport ? 1 : 0); + return hash; + } + + public boolean equals(Object o) { + Dependence d = (Dependence)o; + return this.name.equals(d.name) && this.reexport == d.reexport; + } + } + private final String moduleName; + private final Set requires; + private final Map> exports; + private final Set packages; + + private Module(String name, + Set requires, + Map> exports, + Set packages) { + this.moduleName = name; + this.requires = Collections.unmodifiableSet(requires); + this.exports = Collections.unmodifiableMap(exports); + this.packages = Collections.unmodifiableSet(packages); + } + + public String name() { + return moduleName; + } + + public Set requires() { + return requires; + } + + public Map> exports() { + return exports; + } + + public Set packages() { + return packages; + } + + @Override + public boolean equals(Object ob) { + if (!(ob instanceof Module)) { + return false; + } + Module that = (Module) ob; + return (moduleName.equals(that.moduleName) + && requires.equals(that.requires) + && exports.equals(that.exports) + && packages.equals(that.packages)); + } + + @Override + public int hashCode() { + int hc = moduleName.hashCode(); + hc = hc * 43 + requires.hashCode(); + hc = hc * 43 + exports.hashCode(); + hc = hc * 43 + packages.hashCode(); + return hc; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("module ").append(moduleName).append(" {").append("\n"); + requires.stream().sorted().forEach(d -> + sb.append(String.format(" requires %s%s%n", d.reexport ? "public " : "", d.name))); + exports.entrySet().stream().filter(e -> e.getValue().isEmpty()) + .sorted(Map.Entry.comparingByKey()) + .forEach(e -> sb.append(String.format(" exports %s%n", e.getKey()))); + exports.entrySet().stream().filter(e -> !e.getValue().isEmpty()) + .sorted(Map.Entry.comparingByKey()) + .forEach(e -> sb.append(String.format(" exports %s to %s%n", e.getKey(), e.getValue()))); + packages.stream().sorted().forEach(pn -> sb.append(String.format(" includes %s%n", pn))); + sb.append("}"); + return sb.toString(); + } + + static class Builder { + private String name; + private final Set requires = new HashSet<>(); + private final Map> exports = new HashMap<>(); + private final Set packages = new HashSet<>(); + + public Builder() { + } + + public Builder name(String n) { + name = n; + return this; + } + + public Builder require(String d, boolean reexport) { + requires.add(new Dependence(d, reexport)); + return this; + } + + public Builder include(String p) { + packages.add(p); + return this; + } + + public Builder export(String p) { + return exportTo(p, Collections.emptySet()); + } + + public Builder exportTo(String p, Set ms) { + Objects.requireNonNull(p); + Objects.requireNonNull(ms); + if (exports.containsKey(p)) { + throw new RuntimeException(name + " already exports " + p); + } + exports.put(p, new HashSet<>(ms)); + return this; + } + + public Module build() { + Module m = new Module(name, requires, exports, packages); + return m; + } + } + } +} diff --git a/jdk/src/aix/porting/porting_aix.c b/jdk/src/demo/aix/jvmti/hprof/porting_aix.c similarity index 100% rename from jdk/src/aix/porting/porting_aix.c rename to jdk/src/demo/aix/jvmti/hprof/porting_aix.c diff --git a/jdk/src/aix/porting/porting_aix.h b/jdk/src/demo/aix/jvmti/hprof/porting_aix.h similarity index 100% rename from jdk/src/aix/porting/porting_aix.h rename to jdk/src/demo/aix/jvmti/hprof/porting_aix.h diff --git a/jdk/src/share/demo/README b/jdk/src/demo/share/README similarity index 100% rename from jdk/src/share/demo/README rename to jdk/src/demo/share/README diff --git a/jdk/src/share/demo/applets.html b/jdk/src/demo/share/applets.html similarity index 100% rename from jdk/src/share/demo/applets.html rename to jdk/src/demo/share/applets.html diff --git a/jdk/src/share/demo/applets/ArcTest/ArcTest.java b/jdk/src/demo/share/applets/ArcTest/ArcTest.java similarity index 100% rename from jdk/src/share/demo/applets/ArcTest/ArcTest.java rename to jdk/src/demo/share/applets/ArcTest/ArcTest.java diff --git a/jdk/src/share/demo/applets/ArcTest/example1.html b/jdk/src/demo/share/applets/ArcTest/example1.html similarity index 100% rename from jdk/src/share/demo/applets/ArcTest/example1.html rename to jdk/src/demo/share/applets/ArcTest/example1.html diff --git a/jdk/src/share/demo/applets/BarChart/BarChart.java b/jdk/src/demo/share/applets/BarChart/BarChart.java similarity index 100% rename from jdk/src/share/demo/applets/BarChart/BarChart.java rename to jdk/src/demo/share/applets/BarChart/BarChart.java diff --git a/jdk/src/share/demo/applets/BarChart/example1.html b/jdk/src/demo/share/applets/BarChart/example1.html similarity index 100% rename from jdk/src/share/demo/applets/BarChart/example1.html rename to jdk/src/demo/share/applets/BarChart/example1.html diff --git a/jdk/src/share/demo/applets/BarChart/example2.html b/jdk/src/demo/share/applets/BarChart/example2.html similarity index 100% rename from jdk/src/share/demo/applets/BarChart/example2.html rename to jdk/src/demo/share/applets/BarChart/example2.html diff --git a/jdk/src/share/demo/applets/Blink/Blink.java b/jdk/src/demo/share/applets/Blink/Blink.java similarity index 100% rename from jdk/src/share/demo/applets/Blink/Blink.java rename to jdk/src/demo/share/applets/Blink/Blink.java diff --git a/jdk/src/share/demo/applets/Blink/example1.html b/jdk/src/demo/share/applets/Blink/example1.html similarity index 100% rename from jdk/src/share/demo/applets/Blink/example1.html rename to jdk/src/demo/share/applets/Blink/example1.html diff --git a/jdk/src/share/demo/applets/CardTest/CardTest.java b/jdk/src/demo/share/applets/CardTest/CardTest.java similarity index 100% rename from jdk/src/share/demo/applets/CardTest/CardTest.java rename to jdk/src/demo/share/applets/CardTest/CardTest.java diff --git a/jdk/src/share/demo/applets/CardTest/example1.html b/jdk/src/demo/share/applets/CardTest/example1.html similarity index 100% rename from jdk/src/share/demo/applets/CardTest/example1.html rename to jdk/src/demo/share/applets/CardTest/example1.html diff --git a/jdk/src/share/demo/applets/Clock/Clock.java b/jdk/src/demo/share/applets/Clock/Clock.java similarity index 100% rename from jdk/src/share/demo/applets/Clock/Clock.java rename to jdk/src/demo/share/applets/Clock/Clock.java diff --git a/jdk/src/share/demo/applets/Clock/example1.html b/jdk/src/demo/share/applets/Clock/example1.html similarity index 100% rename from jdk/src/share/demo/applets/Clock/example1.html rename to jdk/src/demo/share/applets/Clock/example1.html diff --git a/jdk/src/share/demo/applets/DitherTest/DitherTest.java b/jdk/src/demo/share/applets/DitherTest/DitherTest.java similarity index 100% rename from jdk/src/share/demo/applets/DitherTest/DitherTest.java rename to jdk/src/demo/share/applets/DitherTest/DitherTest.java diff --git a/jdk/src/share/demo/applets/DitherTest/example1.html b/jdk/src/demo/share/applets/DitherTest/example1.html similarity index 100% rename from jdk/src/share/demo/applets/DitherTest/example1.html rename to jdk/src/demo/share/applets/DitherTest/example1.html diff --git a/jdk/src/share/demo/applets/DrawTest/DrawTest.java b/jdk/src/demo/share/applets/DrawTest/DrawTest.java similarity index 100% rename from jdk/src/share/demo/applets/DrawTest/DrawTest.java rename to jdk/src/demo/share/applets/DrawTest/DrawTest.java diff --git a/jdk/src/share/demo/applets/DrawTest/example1.html b/jdk/src/demo/share/applets/DrawTest/example1.html similarity index 100% rename from jdk/src/share/demo/applets/DrawTest/example1.html rename to jdk/src/demo/share/applets/DrawTest/example1.html diff --git a/jdk/src/share/demo/applets/Fractal/CLSFractal.java b/jdk/src/demo/share/applets/Fractal/CLSFractal.java similarity index 100% rename from jdk/src/share/demo/applets/Fractal/CLSFractal.java rename to jdk/src/demo/share/applets/Fractal/CLSFractal.java diff --git a/jdk/src/share/demo/applets/Fractal/example1.html b/jdk/src/demo/share/applets/Fractal/example1.html similarity index 100% rename from jdk/src/share/demo/applets/Fractal/example1.html rename to jdk/src/demo/share/applets/Fractal/example1.html diff --git a/jdk/src/share/demo/applets/GraphicsTest/AppletFrame.java b/jdk/src/demo/share/applets/GraphicsTest/AppletFrame.java similarity index 100% rename from jdk/src/share/demo/applets/GraphicsTest/AppletFrame.java rename to jdk/src/demo/share/applets/GraphicsTest/AppletFrame.java diff --git a/jdk/src/share/demo/applets/GraphicsTest/GraphicsTest.java b/jdk/src/demo/share/applets/GraphicsTest/GraphicsTest.java similarity index 100% rename from jdk/src/share/demo/applets/GraphicsTest/GraphicsTest.java rename to jdk/src/demo/share/applets/GraphicsTest/GraphicsTest.java diff --git a/jdk/src/share/demo/applets/GraphicsTest/example1.html b/jdk/src/demo/share/applets/GraphicsTest/example1.html similarity index 100% rename from jdk/src/share/demo/applets/GraphicsTest/example1.html rename to jdk/src/demo/share/applets/GraphicsTest/example1.html diff --git a/jdk/src/share/demo/applets/MoleculeViewer/Matrix3D.java b/jdk/src/demo/share/applets/MoleculeViewer/Matrix3D.java similarity index 100% rename from jdk/src/share/demo/applets/MoleculeViewer/Matrix3D.java rename to jdk/src/demo/share/applets/MoleculeViewer/Matrix3D.java diff --git a/jdk/src/share/demo/applets/MoleculeViewer/XYZApp.java b/jdk/src/demo/share/applets/MoleculeViewer/XYZApp.java similarity index 100% rename from jdk/src/share/demo/applets/MoleculeViewer/XYZApp.java rename to jdk/src/demo/share/applets/MoleculeViewer/XYZApp.java diff --git a/jdk/src/share/demo/applets/MoleculeViewer/example1.html b/jdk/src/demo/share/applets/MoleculeViewer/example1.html similarity index 100% rename from jdk/src/share/demo/applets/MoleculeViewer/example1.html rename to jdk/src/demo/share/applets/MoleculeViewer/example1.html diff --git a/jdk/src/share/demo/applets/MoleculeViewer/example2.html b/jdk/src/demo/share/applets/MoleculeViewer/example2.html similarity index 100% rename from jdk/src/share/demo/applets/MoleculeViewer/example2.html rename to jdk/src/demo/share/applets/MoleculeViewer/example2.html diff --git a/jdk/src/share/demo/applets/MoleculeViewer/example3.html b/jdk/src/demo/share/applets/MoleculeViewer/example3.html similarity index 100% rename from jdk/src/share/demo/applets/MoleculeViewer/example3.html rename to jdk/src/demo/share/applets/MoleculeViewer/example3.html diff --git a/jdk/src/share/demo/applets/MoleculeViewer/models/HyaluronicAcid.xyz b/jdk/src/demo/share/applets/MoleculeViewer/models/HyaluronicAcid.xyz similarity index 100% rename from jdk/src/share/demo/applets/MoleculeViewer/models/HyaluronicAcid.xyz rename to jdk/src/demo/share/applets/MoleculeViewer/models/HyaluronicAcid.xyz diff --git a/jdk/src/share/demo/applets/MoleculeViewer/models/benzene.xyz b/jdk/src/demo/share/applets/MoleculeViewer/models/benzene.xyz similarity index 100% rename from jdk/src/share/demo/applets/MoleculeViewer/models/benzene.xyz rename to jdk/src/demo/share/applets/MoleculeViewer/models/benzene.xyz diff --git a/jdk/src/share/demo/applets/MoleculeViewer/models/buckminsterfullerine.xyz b/jdk/src/demo/share/applets/MoleculeViewer/models/buckminsterfullerine.xyz similarity index 100% rename from jdk/src/share/demo/applets/MoleculeViewer/models/buckminsterfullerine.xyz rename to jdk/src/demo/share/applets/MoleculeViewer/models/buckminsterfullerine.xyz diff --git a/jdk/src/share/demo/applets/MoleculeViewer/models/cyclohexane.xyz b/jdk/src/demo/share/applets/MoleculeViewer/models/cyclohexane.xyz similarity index 100% rename from jdk/src/share/demo/applets/MoleculeViewer/models/cyclohexane.xyz rename to jdk/src/demo/share/applets/MoleculeViewer/models/cyclohexane.xyz diff --git a/jdk/src/share/demo/applets/MoleculeViewer/models/ethane.xyz b/jdk/src/demo/share/applets/MoleculeViewer/models/ethane.xyz similarity index 100% rename from jdk/src/share/demo/applets/MoleculeViewer/models/ethane.xyz rename to jdk/src/demo/share/applets/MoleculeViewer/models/ethane.xyz diff --git a/jdk/src/share/demo/applets/MoleculeViewer/models/water.xyz b/jdk/src/demo/share/applets/MoleculeViewer/models/water.xyz similarity index 100% rename from jdk/src/share/demo/applets/MoleculeViewer/models/water.xyz rename to jdk/src/demo/share/applets/MoleculeViewer/models/water.xyz diff --git a/jdk/src/share/demo/applets/NervousText/NervousText.java b/jdk/src/demo/share/applets/NervousText/NervousText.java similarity index 100% rename from jdk/src/share/demo/applets/NervousText/NervousText.java rename to jdk/src/demo/share/applets/NervousText/NervousText.java diff --git a/jdk/src/share/demo/applets/NervousText/example1.html b/jdk/src/demo/share/applets/NervousText/example1.html similarity index 100% rename from jdk/src/share/demo/applets/NervousText/example1.html rename to jdk/src/demo/share/applets/NervousText/example1.html diff --git a/jdk/src/share/demo/applets/SimpleGraph/GraphApplet.java b/jdk/src/demo/share/applets/SimpleGraph/GraphApplet.java similarity index 100% rename from jdk/src/share/demo/applets/SimpleGraph/GraphApplet.java rename to jdk/src/demo/share/applets/SimpleGraph/GraphApplet.java diff --git a/jdk/src/share/demo/applets/SimpleGraph/example1.html b/jdk/src/demo/share/applets/SimpleGraph/example1.html similarity index 100% rename from jdk/src/share/demo/applets/SimpleGraph/example1.html rename to jdk/src/demo/share/applets/SimpleGraph/example1.html diff --git a/jdk/src/share/demo/applets/SortDemo/BidirBubbleSortAlgorithm.java b/jdk/src/demo/share/applets/SortDemo/BidirBubbleSortAlgorithm.java similarity index 100% rename from jdk/src/share/demo/applets/SortDemo/BidirBubbleSortAlgorithm.java rename to jdk/src/demo/share/applets/SortDemo/BidirBubbleSortAlgorithm.java diff --git a/jdk/src/share/demo/applets/SortDemo/BubbleSortAlgorithm.java b/jdk/src/demo/share/applets/SortDemo/BubbleSortAlgorithm.java similarity index 100% rename from jdk/src/share/demo/applets/SortDemo/BubbleSortAlgorithm.java rename to jdk/src/demo/share/applets/SortDemo/BubbleSortAlgorithm.java diff --git a/jdk/src/share/demo/applets/SortDemo/QSortAlgorithm.java b/jdk/src/demo/share/applets/SortDemo/QSortAlgorithm.java similarity index 100% rename from jdk/src/share/demo/applets/SortDemo/QSortAlgorithm.java rename to jdk/src/demo/share/applets/SortDemo/QSortAlgorithm.java diff --git a/jdk/src/share/demo/applets/SortDemo/SortAlgorithm.java b/jdk/src/demo/share/applets/SortDemo/SortAlgorithm.java similarity index 100% rename from jdk/src/share/demo/applets/SortDemo/SortAlgorithm.java rename to jdk/src/demo/share/applets/SortDemo/SortAlgorithm.java diff --git a/jdk/src/share/demo/applets/SortDemo/SortItem.java b/jdk/src/demo/share/applets/SortDemo/SortItem.java similarity index 100% rename from jdk/src/share/demo/applets/SortDemo/SortItem.java rename to jdk/src/demo/share/applets/SortDemo/SortItem.java diff --git a/jdk/src/share/demo/applets/SortDemo/example1.html b/jdk/src/demo/share/applets/SortDemo/example1.html similarity index 100% rename from jdk/src/share/demo/applets/SortDemo/example1.html rename to jdk/src/demo/share/applets/SortDemo/example1.html diff --git a/jdk/src/share/demo/applets/SpreadSheet/SpreadSheet.java b/jdk/src/demo/share/applets/SpreadSheet/SpreadSheet.java similarity index 100% rename from jdk/src/share/demo/applets/SpreadSheet/SpreadSheet.java rename to jdk/src/demo/share/applets/SpreadSheet/SpreadSheet.java diff --git a/jdk/src/share/demo/applets/SpreadSheet/example1.html b/jdk/src/demo/share/applets/SpreadSheet/example1.html similarity index 100% rename from jdk/src/share/demo/applets/SpreadSheet/example1.html rename to jdk/src/demo/share/applets/SpreadSheet/example1.html diff --git a/jdk/src/share/demo/applets/WireFrame/Matrix3D.java b/jdk/src/demo/share/applets/WireFrame/Matrix3D.java similarity index 100% rename from jdk/src/share/demo/applets/WireFrame/Matrix3D.java rename to jdk/src/demo/share/applets/WireFrame/Matrix3D.java diff --git a/jdk/src/share/demo/applets/WireFrame/ThreeD.java b/jdk/src/demo/share/applets/WireFrame/ThreeD.java similarity index 100% rename from jdk/src/share/demo/applets/WireFrame/ThreeD.java rename to jdk/src/demo/share/applets/WireFrame/ThreeD.java diff --git a/jdk/src/share/demo/applets/WireFrame/example1.html b/jdk/src/demo/share/applets/WireFrame/example1.html similarity index 100% rename from jdk/src/share/demo/applets/WireFrame/example1.html rename to jdk/src/demo/share/applets/WireFrame/example1.html diff --git a/jdk/src/share/demo/applets/WireFrame/example2.html b/jdk/src/demo/share/applets/WireFrame/example2.html similarity index 100% rename from jdk/src/share/demo/applets/WireFrame/example2.html rename to jdk/src/demo/share/applets/WireFrame/example2.html diff --git a/jdk/src/share/demo/applets/WireFrame/example3.html b/jdk/src/demo/share/applets/WireFrame/example3.html similarity index 100% rename from jdk/src/share/demo/applets/WireFrame/example3.html rename to jdk/src/demo/share/applets/WireFrame/example3.html diff --git a/jdk/src/share/demo/applets/WireFrame/example4.html b/jdk/src/demo/share/applets/WireFrame/example4.html similarity index 100% rename from jdk/src/share/demo/applets/WireFrame/example4.html rename to jdk/src/demo/share/applets/WireFrame/example4.html diff --git a/jdk/src/share/demo/applets/WireFrame/models/cube.obj b/jdk/src/demo/share/applets/WireFrame/models/cube.obj similarity index 100% rename from jdk/src/share/demo/applets/WireFrame/models/cube.obj rename to jdk/src/demo/share/applets/WireFrame/models/cube.obj diff --git a/jdk/src/share/demo/applets/WireFrame/models/dinasaur.obj b/jdk/src/demo/share/applets/WireFrame/models/dinasaur.obj similarity index 100% rename from jdk/src/share/demo/applets/WireFrame/models/dinasaur.obj rename to jdk/src/demo/share/applets/WireFrame/models/dinasaur.obj diff --git a/jdk/src/share/demo/applets/WireFrame/models/hughes_500.obj b/jdk/src/demo/share/applets/WireFrame/models/hughes_500.obj similarity index 100% rename from jdk/src/share/demo/applets/WireFrame/models/hughes_500.obj rename to jdk/src/demo/share/applets/WireFrame/models/hughes_500.obj diff --git a/jdk/src/share/demo/applets/WireFrame/models/knoxS.obj b/jdk/src/demo/share/applets/WireFrame/models/knoxS.obj similarity index 100% rename from jdk/src/share/demo/applets/WireFrame/models/knoxS.obj rename to jdk/src/demo/share/applets/WireFrame/models/knoxS.obj diff --git a/jdk/src/share/demo/java2d/J2DBench/Makefile b/jdk/src/demo/share/java2d/J2DBench/Makefile similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/Makefile rename to jdk/src/demo/share/java2d/J2DBench/Makefile diff --git a/jdk/src/share/demo/java2d/J2DBench/README b/jdk/src/demo/share/java2d/J2DBench/README similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/README rename to jdk/src/demo/share/java2d/J2DBench/README diff --git a/jdk/src/share/demo/java2d/J2DBench/build.xml b/jdk/src/demo/share/java2d/J2DBench/build.xml similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/build.xml rename to jdk/src/demo/share/java2d/J2DBench/build.xml diff --git a/jdk/src/share/demo/java2d/J2DBench/nbproject/project.xml b/jdk/src/demo/share/java2d/J2DBench/nbproject/project.xml similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/nbproject/project.xml rename to jdk/src/demo/share/java2d/J2DBench/nbproject/project.xml diff --git a/jdk/src/share/demo/java2d/J2DBench/options/default.opt b/jdk/src/demo/share/java2d/J2DBench/options/default.opt similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/options/default.opt rename to jdk/src/demo/share/java2d/J2DBench/options/default.opt diff --git a/jdk/src/share/demo/java2d/J2DBench/resources/cmm_images/img_icc_large.jpg b/jdk/src/demo/share/java2d/J2DBench/resources/cmm_images/img_icc_large.jpg similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/resources/cmm_images/img_icc_large.jpg rename to jdk/src/demo/share/java2d/J2DBench/resources/cmm_images/img_icc_large.jpg diff --git a/jdk/src/share/demo/java2d/J2DBench/resources/cmm_images/img_icc_medium.jpg b/jdk/src/demo/share/java2d/J2DBench/resources/cmm_images/img_icc_medium.jpg similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/resources/cmm_images/img_icc_medium.jpg rename to jdk/src/demo/share/java2d/J2DBench/resources/cmm_images/img_icc_medium.jpg diff --git a/jdk/src/share/demo/java2d/J2DBench/resources/cmm_images/img_icc_small.jpg b/jdk/src/demo/share/java2d/J2DBench/resources/cmm_images/img_icc_small.jpg similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/resources/cmm_images/img_icc_small.jpg rename to jdk/src/demo/share/java2d/J2DBench/resources/cmm_images/img_icc_small.jpg diff --git a/jdk/src/share/demo/java2d/J2DBench/resources/images/photo.jpg b/jdk/src/demo/share/java2d/J2DBench/resources/images/photo.jpg similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/resources/images/photo.jpg rename to jdk/src/demo/share/java2d/J2DBench/resources/images/photo.jpg diff --git a/jdk/src/share/demo/java2d/J2DBench/resources/textdata/arabic.ut8.txt b/jdk/src/demo/share/java2d/J2DBench/resources/textdata/arabic.ut8.txt similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/resources/textdata/arabic.ut8.txt rename to jdk/src/demo/share/java2d/J2DBench/resources/textdata/arabic.ut8.txt diff --git a/jdk/src/share/demo/java2d/J2DBench/resources/textdata/english.ut8.txt b/jdk/src/demo/share/java2d/J2DBench/resources/textdata/english.ut8.txt similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/resources/textdata/english.ut8.txt rename to jdk/src/demo/share/java2d/J2DBench/resources/textdata/english.ut8.txt diff --git a/jdk/src/share/demo/java2d/J2DBench/resources/textdata/greek.ut8.txt b/jdk/src/demo/share/java2d/J2DBench/resources/textdata/greek.ut8.txt similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/resources/textdata/greek.ut8.txt rename to jdk/src/demo/share/java2d/J2DBench/resources/textdata/greek.ut8.txt diff --git a/jdk/src/share/demo/java2d/J2DBench/resources/textdata/hebrew.ut8.txt b/jdk/src/demo/share/java2d/J2DBench/resources/textdata/hebrew.ut8.txt similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/resources/textdata/hebrew.ut8.txt rename to jdk/src/demo/share/java2d/J2DBench/resources/textdata/hebrew.ut8.txt diff --git a/jdk/src/share/demo/java2d/J2DBench/resources/textdata/hindi.ut8.txt b/jdk/src/demo/share/java2d/J2DBench/resources/textdata/hindi.ut8.txt similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/resources/textdata/hindi.ut8.txt rename to jdk/src/demo/share/java2d/J2DBench/resources/textdata/hindi.ut8.txt diff --git a/jdk/src/share/demo/java2d/J2DBench/resources/textdata/japanese.ut8.txt b/jdk/src/demo/share/java2d/J2DBench/resources/textdata/japanese.ut8.txt similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/resources/textdata/japanese.ut8.txt rename to jdk/src/demo/share/java2d/J2DBench/resources/textdata/japanese.ut8.txt diff --git a/jdk/src/share/demo/java2d/J2DBench/resources/textdata/korean.ut8.txt b/jdk/src/demo/share/java2d/J2DBench/resources/textdata/korean.ut8.txt similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/resources/textdata/korean.ut8.txt rename to jdk/src/demo/share/java2d/J2DBench/resources/textdata/korean.ut8.txt diff --git a/jdk/src/share/demo/java2d/J2DBench/resources/textdata/thai.ut8.txt b/jdk/src/demo/share/java2d/J2DBench/resources/textdata/thai.ut8.txt similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/resources/textdata/thai.ut8.txt rename to jdk/src/demo/share/java2d/J2DBench/resources/textdata/thai.ut8.txt diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/Destinations.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/Destinations.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/Destinations.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/Destinations.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/Group.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/Group.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/Group.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/Group.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/J2DBench.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/J2DBench.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/J2DBench.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/J2DBench.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/Modifier.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/Modifier.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/Modifier.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/Modifier.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/Node.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/Node.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/Node.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/Node.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/Option.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/Option.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/Option.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/Option.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/Result.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/Result.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/Result.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/Result.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/ResultSet.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/ResultSet.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/ResultSet.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/ResultSet.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/Test.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/Test.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/Test.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/Test.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/TestEnvironment.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/TestEnvironment.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/TestEnvironment.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/TestEnvironment.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/report/HTMLSeriesReporter.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/report/HTMLSeriesReporter.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/report/HTMLSeriesReporter.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/report/HTMLSeriesReporter.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/report/IIOComparator.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/report/IIOComparator.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/report/IIOComparator.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/report/IIOComparator.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/report/J2DAnalyzer.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/report/J2DAnalyzer.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/report/J2DAnalyzer.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/report/J2DAnalyzer.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/report/XMLHTMLReporter.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/report/XMLHTMLReporter.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/report/XMLHTMLReporter.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/report/XMLHTMLReporter.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/GraphicsTests.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/GraphicsTests.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/GraphicsTests.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/GraphicsTests.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/ImageTests.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/ImageTests.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/ImageTests.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/ImageTests.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/MiscTests.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/MiscTests.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/MiscTests.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/MiscTests.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/PixelTests.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/PixelTests.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/PixelTests.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/PixelTests.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/RenderTests.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/RenderTests.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/RenderTests.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/RenderTests.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/cmm/CMMTests.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/CMMTests.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/cmm/CMMTests.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/CMMTests.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/cmm/ColorConversionTests.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/ColorConversionTests.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/cmm/ColorConversionTests.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/ColorConversionTests.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/cmm/ColorConvertOpTests.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/ColorConvertOpTests.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/cmm/ColorConvertOpTests.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/ColorConvertOpTests.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/cmm/DataConversionTests.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/DataConversionTests.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/cmm/DataConversionTests.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/DataConversionTests.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/cmm/EmbeddedProfileTests.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/EmbeddedProfileTests.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/cmm/EmbeddedProfileTests.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/EmbeddedProfileTests.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/cmm/ProfileTests.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/ProfileTests.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/cmm/ProfileTests.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/ProfileTests.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/IIOTests.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/IIOTests.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/IIOTests.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/IIOTests.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/InputImageTests.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/InputImageTests.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/InputImageTests.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/InputImageTests.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/InputStreamTests.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/InputStreamTests.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/InputStreamTests.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/InputStreamTests.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/InputTests.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/InputTests.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/InputTests.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/InputTests.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/OutputImageTests.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/OutputImageTests.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/OutputImageTests.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/OutputImageTests.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/OutputStreamTests.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/OutputStreamTests.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/OutputStreamTests.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/OutputStreamTests.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/OutputTests.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/OutputTests.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/OutputTests.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/OutputTests.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/text/TextConstructionTests.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/text/TextConstructionTests.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/text/TextConstructionTests.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/text/TextConstructionTests.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/text/TextMeasureTests.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/text/TextMeasureTests.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/text/TextMeasureTests.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/text/TextMeasureTests.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/text/TextRenderTests.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/text/TextRenderTests.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/text/TextRenderTests.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/text/TextRenderTests.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/text/TextTests.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/text/TextTests.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/text/TextTests.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/text/TextTests.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/ui/CompactLayout.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/ui/CompactLayout.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/ui/CompactLayout.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/ui/CompactLayout.java diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/ui/EnableButton.java b/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/ui/EnableButton.java similarity index 100% rename from jdk/src/share/demo/java2d/J2DBench/src/j2dbench/ui/EnableButton.java rename to jdk/src/demo/share/java2d/J2DBench/src/j2dbench/ui/EnableButton.java diff --git a/jdk/src/share/demo/jfc/CodePointIM/CodePointIM.java b/jdk/src/demo/share/jfc/CodePointIM/CodePointIM.java similarity index 100% rename from jdk/src/share/demo/jfc/CodePointIM/CodePointIM.java rename to jdk/src/demo/share/jfc/CodePointIM/CodePointIM.java diff --git a/jdk/src/share/demo/jfc/CodePointIM/README.html b/jdk/src/demo/share/jfc/CodePointIM/README.html similarity index 100% rename from jdk/src/share/demo/jfc/CodePointIM/README.html rename to jdk/src/demo/share/jfc/CodePointIM/README.html diff --git a/jdk/src/share/demo/jfc/CodePointIM/README_ja.html b/jdk/src/demo/share/jfc/CodePointIM/README_ja.html similarity index 100% rename from jdk/src/share/demo/jfc/CodePointIM/README_ja.html rename to jdk/src/demo/share/jfc/CodePointIM/README_ja.html diff --git a/jdk/src/share/demo/jfc/CodePointIM/README_zh_CN.html b/jdk/src/demo/share/jfc/CodePointIM/README_zh_CN.html similarity index 100% rename from jdk/src/share/demo/jfc/CodePointIM/README_zh_CN.html rename to jdk/src/demo/share/jfc/CodePointIM/README_zh_CN.html diff --git a/jdk/src/share/demo/jfc/CodePointIM/com/sun/inputmethods/internal/codepointim/CodePointInputMethod.java b/jdk/src/demo/share/jfc/CodePointIM/com/sun/inputmethods/internal/codepointim/CodePointInputMethod.java similarity index 100% rename from jdk/src/share/demo/jfc/CodePointIM/com/sun/inputmethods/internal/codepointim/CodePointInputMethod.java rename to jdk/src/demo/share/jfc/CodePointIM/com/sun/inputmethods/internal/codepointim/CodePointInputMethod.java diff --git a/jdk/src/share/demo/jfc/CodePointIM/com/sun/inputmethods/internal/codepointim/CodePointInputMethodDescriptor.java b/jdk/src/demo/share/jfc/CodePointIM/com/sun/inputmethods/internal/codepointim/CodePointInputMethodDescriptor.java similarity index 100% rename from jdk/src/share/demo/jfc/CodePointIM/com/sun/inputmethods/internal/codepointim/CodePointInputMethodDescriptor.java rename to jdk/src/demo/share/jfc/CodePointIM/com/sun/inputmethods/internal/codepointim/CodePointInputMethodDescriptor.java diff --git a/jdk/src/share/demo/jfc/CodePointIM/java.awt.im.spi.InputMethodDescriptor b/jdk/src/demo/share/jfc/CodePointIM/java.awt.im.spi.InputMethodDescriptor similarity index 100% rename from jdk/src/share/demo/jfc/CodePointIM/java.awt.im.spi.InputMethodDescriptor rename to jdk/src/demo/share/jfc/CodePointIM/java.awt.im.spi.InputMethodDescriptor diff --git a/jdk/src/share/demo/jfc/CodePointIM/resources/codepoint.properties b/jdk/src/demo/share/jfc/CodePointIM/resources/codepoint.properties similarity index 100% rename from jdk/src/share/demo/jfc/CodePointIM/resources/codepoint.properties rename to jdk/src/demo/share/jfc/CodePointIM/resources/codepoint.properties diff --git a/jdk/src/share/demo/jfc/CodePointIM/resources/codepoint_ja.properties b/jdk/src/demo/share/jfc/CodePointIM/resources/codepoint_ja.properties similarity index 100% rename from jdk/src/share/demo/jfc/CodePointIM/resources/codepoint_ja.properties rename to jdk/src/demo/share/jfc/CodePointIM/resources/codepoint_ja.properties diff --git a/jdk/src/share/demo/jfc/CodePointIM/resources/codepoint_zh_CN.properties b/jdk/src/demo/share/jfc/CodePointIM/resources/codepoint_zh_CN.properties similarity index 100% rename from jdk/src/share/demo/jfc/CodePointIM/resources/codepoint_zh_CN.properties rename to jdk/src/demo/share/jfc/CodePointIM/resources/codepoint_zh_CN.properties diff --git a/jdk/src/share/demo/jfc/FileChooserDemo/ExampleFileSystemView.java b/jdk/src/demo/share/jfc/FileChooserDemo/ExampleFileSystemView.java similarity index 100% rename from jdk/src/share/demo/jfc/FileChooserDemo/ExampleFileSystemView.java rename to jdk/src/demo/share/jfc/FileChooserDemo/ExampleFileSystemView.java diff --git a/jdk/src/share/demo/jfc/FileChooserDemo/ExampleFileView.java b/jdk/src/demo/share/jfc/FileChooserDemo/ExampleFileView.java similarity index 100% rename from jdk/src/share/demo/jfc/FileChooserDemo/ExampleFileView.java rename to jdk/src/demo/share/jfc/FileChooserDemo/ExampleFileView.java diff --git a/jdk/src/share/demo/jfc/FileChooserDemo/FileChooserDemo.java b/jdk/src/demo/share/jfc/FileChooserDemo/FileChooserDemo.java similarity index 100% rename from jdk/src/share/demo/jfc/FileChooserDemo/FileChooserDemo.java rename to jdk/src/demo/share/jfc/FileChooserDemo/FileChooserDemo.java diff --git a/jdk/src/share/demo/jfc/FileChooserDemo/README.txt b/jdk/src/demo/share/jfc/FileChooserDemo/README.txt similarity index 100% rename from jdk/src/share/demo/jfc/FileChooserDemo/README.txt rename to jdk/src/demo/share/jfc/FileChooserDemo/README.txt diff --git a/jdk/src/share/demo/jfc/FileChooserDemo/resources/images/gifIcon.gif b/jdk/src/demo/share/jfc/FileChooserDemo/resources/images/gifIcon.gif similarity index 100% rename from jdk/src/share/demo/jfc/FileChooserDemo/resources/images/gifIcon.gif rename to jdk/src/demo/share/jfc/FileChooserDemo/resources/images/gifIcon.gif diff --git a/jdk/src/share/demo/jfc/FileChooserDemo/resources/images/jpgIcon.jpg b/jdk/src/demo/share/jfc/FileChooserDemo/resources/images/jpgIcon.jpg similarity index 100% rename from jdk/src/share/demo/jfc/FileChooserDemo/resources/images/jpgIcon.jpg rename to jdk/src/demo/share/jfc/FileChooserDemo/resources/images/jpgIcon.jpg diff --git a/jdk/src/share/demo/jfc/Font2DTest/Font2DTest.html b/jdk/src/demo/share/jfc/Font2DTest/Font2DTest.html similarity index 100% rename from jdk/src/share/demo/jfc/Font2DTest/Font2DTest.html rename to jdk/src/demo/share/jfc/Font2DTest/Font2DTest.html diff --git a/jdk/src/share/demo/jfc/Font2DTest/Font2DTest.java b/jdk/src/demo/share/jfc/Font2DTest/Font2DTest.java similarity index 100% rename from jdk/src/share/demo/jfc/Font2DTest/Font2DTest.java rename to jdk/src/demo/share/jfc/Font2DTest/Font2DTest.java diff --git a/jdk/src/share/demo/jfc/Font2DTest/Font2DTestApplet.java b/jdk/src/demo/share/jfc/Font2DTest/Font2DTestApplet.java similarity index 100% rename from jdk/src/share/demo/jfc/Font2DTest/Font2DTestApplet.java rename to jdk/src/demo/share/jfc/Font2DTest/Font2DTestApplet.java diff --git a/jdk/src/share/demo/jfc/Font2DTest/FontPanel.java b/jdk/src/demo/share/jfc/Font2DTest/FontPanel.java similarity index 100% rename from jdk/src/share/demo/jfc/Font2DTest/FontPanel.java rename to jdk/src/demo/share/jfc/Font2DTest/FontPanel.java diff --git a/jdk/src/share/demo/jfc/Font2DTest/README.txt b/jdk/src/demo/share/jfc/Font2DTest/README.txt similarity index 100% rename from jdk/src/share/demo/jfc/Font2DTest/README.txt rename to jdk/src/demo/share/jfc/Font2DTest/README.txt diff --git a/jdk/src/share/demo/jfc/Font2DTest/RangeMenu.java b/jdk/src/demo/share/jfc/Font2DTest/RangeMenu.java similarity index 100% rename from jdk/src/share/demo/jfc/Font2DTest/RangeMenu.java rename to jdk/src/demo/share/jfc/Font2DTest/RangeMenu.java diff --git a/jdk/src/share/demo/jfc/Metalworks/AquaMetalTheme.java b/jdk/src/demo/share/jfc/Metalworks/AquaMetalTheme.java similarity index 100% rename from jdk/src/share/demo/jfc/Metalworks/AquaMetalTheme.java rename to jdk/src/demo/share/jfc/Metalworks/AquaMetalTheme.java diff --git a/jdk/src/share/demo/jfc/Metalworks/BigContrastMetalTheme.java b/jdk/src/demo/share/jfc/Metalworks/BigContrastMetalTheme.java similarity index 100% rename from jdk/src/share/demo/jfc/Metalworks/BigContrastMetalTheme.java rename to jdk/src/demo/share/jfc/Metalworks/BigContrastMetalTheme.java diff --git a/jdk/src/share/demo/jfc/Metalworks/ContrastMetalTheme.java b/jdk/src/demo/share/jfc/Metalworks/ContrastMetalTheme.java similarity index 100% rename from jdk/src/share/demo/jfc/Metalworks/ContrastMetalTheme.java rename to jdk/src/demo/share/jfc/Metalworks/ContrastMetalTheme.java diff --git a/jdk/src/share/demo/jfc/Metalworks/DemoMetalTheme.java b/jdk/src/demo/share/jfc/Metalworks/DemoMetalTheme.java similarity index 100% rename from jdk/src/share/demo/jfc/Metalworks/DemoMetalTheme.java rename to jdk/src/demo/share/jfc/Metalworks/DemoMetalTheme.java diff --git a/jdk/src/share/demo/jfc/Metalworks/GreenMetalTheme.java b/jdk/src/demo/share/jfc/Metalworks/GreenMetalTheme.java similarity index 100% rename from jdk/src/share/demo/jfc/Metalworks/GreenMetalTheme.java rename to jdk/src/demo/share/jfc/Metalworks/GreenMetalTheme.java diff --git a/jdk/src/share/demo/jfc/Metalworks/KhakiMetalTheme.java b/jdk/src/demo/share/jfc/Metalworks/KhakiMetalTheme.java similarity index 100% rename from jdk/src/share/demo/jfc/Metalworks/KhakiMetalTheme.java rename to jdk/src/demo/share/jfc/Metalworks/KhakiMetalTheme.java diff --git a/jdk/src/share/demo/jfc/Metalworks/MetalThemeMenu.java b/jdk/src/demo/share/jfc/Metalworks/MetalThemeMenu.java similarity index 100% rename from jdk/src/share/demo/jfc/Metalworks/MetalThemeMenu.java rename to jdk/src/demo/share/jfc/Metalworks/MetalThemeMenu.java diff --git a/jdk/src/share/demo/jfc/Metalworks/Metalworks.java b/jdk/src/demo/share/jfc/Metalworks/Metalworks.java similarity index 100% rename from jdk/src/share/demo/jfc/Metalworks/Metalworks.java rename to jdk/src/demo/share/jfc/Metalworks/Metalworks.java diff --git a/jdk/src/share/demo/jfc/Metalworks/MetalworksDocumentFrame.java b/jdk/src/demo/share/jfc/Metalworks/MetalworksDocumentFrame.java similarity index 100% rename from jdk/src/share/demo/jfc/Metalworks/MetalworksDocumentFrame.java rename to jdk/src/demo/share/jfc/Metalworks/MetalworksDocumentFrame.java diff --git a/jdk/src/share/demo/jfc/Metalworks/MetalworksFrame.java b/jdk/src/demo/share/jfc/Metalworks/MetalworksFrame.java similarity index 100% rename from jdk/src/share/demo/jfc/Metalworks/MetalworksFrame.java rename to jdk/src/demo/share/jfc/Metalworks/MetalworksFrame.java diff --git a/jdk/src/share/demo/jfc/Metalworks/MetalworksHelp.java b/jdk/src/demo/share/jfc/Metalworks/MetalworksHelp.java similarity index 100% rename from jdk/src/share/demo/jfc/Metalworks/MetalworksHelp.java rename to jdk/src/demo/share/jfc/Metalworks/MetalworksHelp.java diff --git a/jdk/src/share/demo/jfc/Metalworks/MetalworksInBox.java b/jdk/src/demo/share/jfc/Metalworks/MetalworksInBox.java similarity index 100% rename from jdk/src/share/demo/jfc/Metalworks/MetalworksInBox.java rename to jdk/src/demo/share/jfc/Metalworks/MetalworksInBox.java diff --git a/jdk/src/share/demo/jfc/Metalworks/MetalworksPrefs.java b/jdk/src/demo/share/jfc/Metalworks/MetalworksPrefs.java similarity index 100% rename from jdk/src/share/demo/jfc/Metalworks/MetalworksPrefs.java rename to jdk/src/demo/share/jfc/Metalworks/MetalworksPrefs.java diff --git a/jdk/src/share/demo/jfc/Metalworks/PropertiesMetalTheme.java b/jdk/src/demo/share/jfc/Metalworks/PropertiesMetalTheme.java similarity index 100% rename from jdk/src/share/demo/jfc/Metalworks/PropertiesMetalTheme.java rename to jdk/src/demo/share/jfc/Metalworks/PropertiesMetalTheme.java diff --git a/jdk/src/share/demo/jfc/Metalworks/README.txt b/jdk/src/demo/share/jfc/Metalworks/README.txt similarity index 100% rename from jdk/src/share/demo/jfc/Metalworks/README.txt rename to jdk/src/demo/share/jfc/Metalworks/README.txt diff --git a/jdk/src/share/demo/jfc/Metalworks/UISwitchListener.java b/jdk/src/demo/share/jfc/Metalworks/UISwitchListener.java similarity index 100% rename from jdk/src/share/demo/jfc/Metalworks/UISwitchListener.java rename to jdk/src/demo/share/jfc/Metalworks/UISwitchListener.java diff --git a/jdk/src/share/demo/jfc/Metalworks/resources/HelpFiles/back.gif b/jdk/src/demo/share/jfc/Metalworks/resources/HelpFiles/back.gif similarity index 100% rename from jdk/src/share/demo/jfc/Metalworks/resources/HelpFiles/back.gif rename to jdk/src/demo/share/jfc/Metalworks/resources/HelpFiles/back.gif diff --git a/jdk/src/share/demo/jfc/Metalworks/resources/HelpFiles/credits.html b/jdk/src/demo/share/jfc/Metalworks/resources/HelpFiles/credits.html similarity index 100% rename from jdk/src/share/demo/jfc/Metalworks/resources/HelpFiles/credits.html rename to jdk/src/demo/share/jfc/Metalworks/resources/HelpFiles/credits.html diff --git a/jdk/src/share/demo/jfc/Metalworks/resources/HelpFiles/duke.gif b/jdk/src/demo/share/jfc/Metalworks/resources/HelpFiles/duke.gif similarity index 100% rename from jdk/src/share/demo/jfc/Metalworks/resources/HelpFiles/duke.gif rename to jdk/src/demo/share/jfc/Metalworks/resources/HelpFiles/duke.gif diff --git a/jdk/src/share/demo/jfc/Metalworks/resources/HelpFiles/javalogo.gif b/jdk/src/demo/share/jfc/Metalworks/resources/HelpFiles/javalogo.gif similarity index 100% rename from jdk/src/share/demo/jfc/Metalworks/resources/HelpFiles/javalogo.gif rename to jdk/src/demo/share/jfc/Metalworks/resources/HelpFiles/javalogo.gif diff --git a/jdk/src/share/demo/jfc/Metalworks/resources/HelpFiles/metal.html b/jdk/src/demo/share/jfc/Metalworks/resources/HelpFiles/metal.html similarity index 100% rename from jdk/src/share/demo/jfc/Metalworks/resources/HelpFiles/metal.html rename to jdk/src/demo/share/jfc/Metalworks/resources/HelpFiles/metal.html diff --git a/jdk/src/share/demo/jfc/Metalworks/resources/HelpFiles/metalworks.html b/jdk/src/demo/share/jfc/Metalworks/resources/HelpFiles/metalworks.html similarity index 100% rename from jdk/src/share/demo/jfc/Metalworks/resources/HelpFiles/metalworks.html rename to jdk/src/demo/share/jfc/Metalworks/resources/HelpFiles/metalworks.html diff --git a/jdk/src/share/demo/jfc/Metalworks/resources/HelpFiles/swing.html b/jdk/src/demo/share/jfc/Metalworks/resources/HelpFiles/swing.html similarity index 100% rename from jdk/src/share/demo/jfc/Metalworks/resources/HelpFiles/swing.html rename to jdk/src/demo/share/jfc/Metalworks/resources/HelpFiles/swing.html diff --git a/jdk/src/share/demo/jfc/Metalworks/resources/HelpFiles/toc.html b/jdk/src/demo/share/jfc/Metalworks/resources/HelpFiles/toc.html similarity index 100% rename from jdk/src/share/demo/jfc/Metalworks/resources/HelpFiles/toc.html rename to jdk/src/demo/share/jfc/Metalworks/resources/HelpFiles/toc.html diff --git a/jdk/src/share/demo/jfc/Metalworks/resources/MyTheme.theme b/jdk/src/demo/share/jfc/Metalworks/resources/MyTheme.theme similarity index 100% rename from jdk/src/share/demo/jfc/Metalworks/resources/MyTheme.theme rename to jdk/src/demo/share/jfc/Metalworks/resources/MyTheme.theme diff --git a/jdk/src/share/demo/jfc/Notepad/ElementTreePanel.java b/jdk/src/demo/share/jfc/Notepad/ElementTreePanel.java similarity index 100% rename from jdk/src/share/demo/jfc/Notepad/ElementTreePanel.java rename to jdk/src/demo/share/jfc/Notepad/ElementTreePanel.java diff --git a/jdk/src/share/demo/jfc/Notepad/Notepad.java b/jdk/src/demo/share/jfc/Notepad/Notepad.java similarity index 100% rename from jdk/src/share/demo/jfc/Notepad/Notepad.java rename to jdk/src/demo/share/jfc/Notepad/Notepad.java diff --git a/jdk/src/share/demo/jfc/Notepad/README.txt b/jdk/src/demo/share/jfc/Notepad/README.txt similarity index 100% rename from jdk/src/share/demo/jfc/Notepad/README.txt rename to jdk/src/demo/share/jfc/Notepad/README.txt diff --git a/jdk/src/share/demo/jfc/Notepad/resources/Notepad.properties b/jdk/src/demo/share/jfc/Notepad/resources/Notepad.properties similarity index 100% rename from jdk/src/share/demo/jfc/Notepad/resources/Notepad.properties rename to jdk/src/demo/share/jfc/Notepad/resources/Notepad.properties diff --git a/jdk/src/share/demo/jfc/Notepad/resources/NotepadSystem.properties b/jdk/src/demo/share/jfc/Notepad/resources/NotepadSystem.properties similarity index 100% rename from jdk/src/share/demo/jfc/Notepad/resources/NotepadSystem.properties rename to jdk/src/demo/share/jfc/Notepad/resources/NotepadSystem.properties diff --git a/jdk/src/share/demo/jfc/Notepad/resources/Notepad_ja.properties b/jdk/src/demo/share/jfc/Notepad/resources/Notepad_ja.properties similarity index 100% rename from jdk/src/share/demo/jfc/Notepad/resources/Notepad_ja.properties rename to jdk/src/demo/share/jfc/Notepad/resources/Notepad_ja.properties diff --git a/jdk/src/share/demo/jfc/Notepad/resources/Notepad_zh_CN.properties b/jdk/src/demo/share/jfc/Notepad/resources/Notepad_zh_CN.properties similarity index 100% rename from jdk/src/share/demo/jfc/Notepad/resources/Notepad_zh_CN.properties rename to jdk/src/demo/share/jfc/Notepad/resources/Notepad_zh_CN.properties diff --git a/jdk/src/share/demo/jfc/Notepad/resources/copy.gif b/jdk/src/demo/share/jfc/Notepad/resources/copy.gif similarity index 100% rename from jdk/src/share/demo/jfc/Notepad/resources/copy.gif rename to jdk/src/demo/share/jfc/Notepad/resources/copy.gif diff --git a/jdk/src/share/demo/jfc/Notepad/resources/cut.gif b/jdk/src/demo/share/jfc/Notepad/resources/cut.gif similarity index 100% rename from jdk/src/share/demo/jfc/Notepad/resources/cut.gif rename to jdk/src/demo/share/jfc/Notepad/resources/cut.gif diff --git a/jdk/src/share/demo/jfc/Notepad/resources/new.gif b/jdk/src/demo/share/jfc/Notepad/resources/new.gif similarity index 100% rename from jdk/src/share/demo/jfc/Notepad/resources/new.gif rename to jdk/src/demo/share/jfc/Notepad/resources/new.gif diff --git a/jdk/src/share/demo/jfc/Notepad/resources/open.gif b/jdk/src/demo/share/jfc/Notepad/resources/open.gif similarity index 100% rename from jdk/src/share/demo/jfc/Notepad/resources/open.gif rename to jdk/src/demo/share/jfc/Notepad/resources/open.gif diff --git a/jdk/src/share/demo/jfc/Notepad/resources/paste.gif b/jdk/src/demo/share/jfc/Notepad/resources/paste.gif similarity index 100% rename from jdk/src/share/demo/jfc/Notepad/resources/paste.gif rename to jdk/src/demo/share/jfc/Notepad/resources/paste.gif diff --git a/jdk/src/share/demo/jfc/Notepad/resources/save.gif b/jdk/src/demo/share/jfc/Notepad/resources/save.gif similarity index 100% rename from jdk/src/share/demo/jfc/Notepad/resources/save.gif rename to jdk/src/demo/share/jfc/Notepad/resources/save.gif diff --git a/jdk/src/share/demo/jfc/SampleTree/DynamicTreeNode.java b/jdk/src/demo/share/jfc/SampleTree/DynamicTreeNode.java similarity index 100% rename from jdk/src/share/demo/jfc/SampleTree/DynamicTreeNode.java rename to jdk/src/demo/share/jfc/SampleTree/DynamicTreeNode.java diff --git a/jdk/src/share/demo/jfc/SampleTree/README.txt b/jdk/src/demo/share/jfc/SampleTree/README.txt similarity index 100% rename from jdk/src/share/demo/jfc/SampleTree/README.txt rename to jdk/src/demo/share/jfc/SampleTree/README.txt diff --git a/jdk/src/share/demo/jfc/SampleTree/SampleData.java b/jdk/src/demo/share/jfc/SampleTree/SampleData.java similarity index 100% rename from jdk/src/share/demo/jfc/SampleTree/SampleData.java rename to jdk/src/demo/share/jfc/SampleTree/SampleData.java diff --git a/jdk/src/share/demo/jfc/SampleTree/SampleTree.java b/jdk/src/demo/share/jfc/SampleTree/SampleTree.java similarity index 100% rename from jdk/src/share/demo/jfc/SampleTree/SampleTree.java rename to jdk/src/demo/share/jfc/SampleTree/SampleTree.java diff --git a/jdk/src/share/demo/jfc/SampleTree/SampleTreeCellRenderer.java b/jdk/src/demo/share/jfc/SampleTree/SampleTreeCellRenderer.java similarity index 100% rename from jdk/src/share/demo/jfc/SampleTree/SampleTreeCellRenderer.java rename to jdk/src/demo/share/jfc/SampleTree/SampleTreeCellRenderer.java diff --git a/jdk/src/share/demo/jfc/SampleTree/SampleTreeModel.java b/jdk/src/demo/share/jfc/SampleTree/SampleTreeModel.java similarity index 100% rename from jdk/src/share/demo/jfc/SampleTree/SampleTreeModel.java rename to jdk/src/demo/share/jfc/SampleTree/SampleTreeModel.java diff --git a/jdk/src/share/demo/jfc/SampleTree/resources/images/collapsed.gif b/jdk/src/demo/share/jfc/SampleTree/resources/images/collapsed.gif similarity index 100% rename from jdk/src/share/demo/jfc/SampleTree/resources/images/collapsed.gif rename to jdk/src/demo/share/jfc/SampleTree/resources/images/collapsed.gif diff --git a/jdk/src/share/demo/jfc/SampleTree/resources/images/expanded.gif b/jdk/src/demo/share/jfc/SampleTree/resources/images/expanded.gif similarity index 100% rename from jdk/src/share/demo/jfc/SampleTree/resources/images/expanded.gif rename to jdk/src/demo/share/jfc/SampleTree/resources/images/expanded.gif diff --git a/jdk/src/share/demo/jfc/SwingApplet/README.txt b/jdk/src/demo/share/jfc/SwingApplet/README.txt similarity index 100% rename from jdk/src/share/demo/jfc/SwingApplet/README.txt rename to jdk/src/demo/share/jfc/SwingApplet/README.txt diff --git a/jdk/src/share/demo/jfc/SwingApplet/SwingApplet.html b/jdk/src/demo/share/jfc/SwingApplet/SwingApplet.html similarity index 100% rename from jdk/src/share/demo/jfc/SwingApplet/SwingApplet.html rename to jdk/src/demo/share/jfc/SwingApplet/SwingApplet.html diff --git a/jdk/src/share/demo/jfc/SwingApplet/SwingApplet.java b/jdk/src/demo/share/jfc/SwingApplet/SwingApplet.java similarity index 100% rename from jdk/src/share/demo/jfc/SwingApplet/SwingApplet.java rename to jdk/src/demo/share/jfc/SwingApplet/SwingApplet.java diff --git a/jdk/src/share/demo/jfc/TableExample/JDBCAdapter.java b/jdk/src/demo/share/jfc/TableExample/JDBCAdapter.java similarity index 100% rename from jdk/src/share/demo/jfc/TableExample/JDBCAdapter.java rename to jdk/src/demo/share/jfc/TableExample/JDBCAdapter.java diff --git a/jdk/src/share/demo/jfc/TableExample/OldJTable.java b/jdk/src/demo/share/jfc/TableExample/OldJTable.java similarity index 100% rename from jdk/src/share/demo/jfc/TableExample/OldJTable.java rename to jdk/src/demo/share/jfc/TableExample/OldJTable.java diff --git a/jdk/src/share/demo/jfc/TableExample/README.txt b/jdk/src/demo/share/jfc/TableExample/README.txt similarity index 100% rename from jdk/src/share/demo/jfc/TableExample/README.txt rename to jdk/src/demo/share/jfc/TableExample/README.txt diff --git a/jdk/src/share/demo/jfc/TableExample/TableExample.java b/jdk/src/demo/share/jfc/TableExample/TableExample.java similarity index 100% rename from jdk/src/share/demo/jfc/TableExample/TableExample.java rename to jdk/src/demo/share/jfc/TableExample/TableExample.java diff --git a/jdk/src/share/demo/jfc/TableExample/TableExample2.java b/jdk/src/demo/share/jfc/TableExample/TableExample2.java similarity index 100% rename from jdk/src/share/demo/jfc/TableExample/TableExample2.java rename to jdk/src/demo/share/jfc/TableExample/TableExample2.java diff --git a/jdk/src/share/demo/jfc/TableExample/TableExample3.java b/jdk/src/demo/share/jfc/TableExample/TableExample3.java similarity index 100% rename from jdk/src/share/demo/jfc/TableExample/TableExample3.java rename to jdk/src/demo/share/jfc/TableExample/TableExample3.java diff --git a/jdk/src/share/demo/jfc/TableExample/TableExample4.java b/jdk/src/demo/share/jfc/TableExample/TableExample4.java similarity index 100% rename from jdk/src/share/demo/jfc/TableExample/TableExample4.java rename to jdk/src/demo/share/jfc/TableExample/TableExample4.java diff --git a/jdk/src/share/demo/jfc/TableExample/TableMap.java b/jdk/src/demo/share/jfc/TableExample/TableMap.java similarity index 100% rename from jdk/src/share/demo/jfc/TableExample/TableMap.java rename to jdk/src/demo/share/jfc/TableExample/TableMap.java diff --git a/jdk/src/share/demo/jfc/TableExample/TableSorter.java b/jdk/src/demo/share/jfc/TableExample/TableSorter.java similarity index 100% rename from jdk/src/share/demo/jfc/TableExample/TableSorter.java rename to jdk/src/demo/share/jfc/TableExample/TableSorter.java diff --git a/jdk/src/share/demo/jfc/TransparentRuler/README.txt b/jdk/src/demo/share/jfc/TransparentRuler/README.txt similarity index 100% rename from jdk/src/share/demo/jfc/TransparentRuler/README.txt rename to jdk/src/demo/share/jfc/TransparentRuler/README.txt diff --git a/jdk/src/share/demo/jfc/TransparentRuler/transparentruler/Ruler.java b/jdk/src/demo/share/jfc/TransparentRuler/transparentruler/Ruler.java similarity index 100% rename from jdk/src/share/demo/jfc/TransparentRuler/transparentruler/Ruler.java rename to jdk/src/demo/share/jfc/TransparentRuler/transparentruler/Ruler.java diff --git a/jdk/src/share/classes/com/sun/tools/example/README b/jdk/src/demo/share/jpda/com/sun/tools/example/README similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/README rename to jdk/src/demo/share/jpda/com/sun/tools/example/README diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/AccessWatchpointSpec.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/AccessWatchpointSpec.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/AccessWatchpointSpec.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/AccessWatchpointSpec.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/AmbiguousMethodException.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/AmbiguousMethodException.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/AmbiguousMethodException.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/AmbiguousMethodException.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/BreakpointSpec.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/BreakpointSpec.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/BreakpointSpec.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/BreakpointSpec.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ChildSession.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/ChildSession.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/ChildSession.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/ChildSession.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/EvaluationException.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/EvaluationException.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/EvaluationException.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/EvaluationException.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/EventRequestSpec.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/EventRequestSpec.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/EventRequestSpec.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/EventRequestSpec.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/EventRequestSpecList.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/EventRequestSpecList.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/EventRequestSpecList.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/EventRequestSpecList.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ExceptionSpec.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/ExceptionSpec.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/ExceptionSpec.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/ExceptionSpec.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ExecutionManager.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/ExecutionManager.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/ExecutionManager.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/ExecutionManager.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/FrameIndexOutOfBoundsException.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/FrameIndexOutOfBoundsException.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/FrameIndexOutOfBoundsException.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/FrameIndexOutOfBoundsException.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/InputListener.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/InputListener.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/InputListener.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/InputListener.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/JDIEventSource.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/JDIEventSource.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/JDIEventSource.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/JDIEventSource.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/LineBreakpointSpec.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/LineBreakpointSpec.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/LineBreakpointSpec.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/LineBreakpointSpec.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/LineNotFoundException.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/LineNotFoundException.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/LineNotFoundException.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/LineNotFoundException.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/MalformedMemberNameException.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/MalformedMemberNameException.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/MalformedMemberNameException.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/MalformedMemberNameException.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/MethodBreakpointSpec.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/MethodBreakpointSpec.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/MethodBreakpointSpec.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/MethodBreakpointSpec.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/MethodNotFoundException.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/MethodNotFoundException.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/MethodNotFoundException.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/MethodNotFoundException.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ModificationWatchpointSpec.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/ModificationWatchpointSpec.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/ModificationWatchpointSpec.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/ModificationWatchpointSpec.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/NoSessionException.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/NoSessionException.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/NoSessionException.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/NoSessionException.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/NoThreadException.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/NoThreadException.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/NoThreadException.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/NoThreadException.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/OutputListener.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/OutputListener.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/OutputListener.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/OutputListener.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ParseException.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/ParseException.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/ParseException.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/ParseException.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/PatternReferenceTypeSpec.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/PatternReferenceTypeSpec.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/PatternReferenceTypeSpec.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/PatternReferenceTypeSpec.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ReferenceTypeSpec.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/ReferenceTypeSpec.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/ReferenceTypeSpec.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/ReferenceTypeSpec.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/Session.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/Session.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/Session.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/Session.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/SessionListener.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/SessionListener.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/SessionListener.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/SessionListener.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/SourceNameReferenceTypeSpec.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/SourceNameReferenceTypeSpec.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/SourceNameReferenceTypeSpec.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/SourceNameReferenceTypeSpec.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/SpecErrorEvent.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/SpecErrorEvent.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/SpecErrorEvent.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/SpecErrorEvent.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/SpecEvent.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/SpecEvent.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/SpecEvent.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/SpecEvent.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/SpecListener.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/SpecListener.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/SpecListener.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/SpecListener.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ThreadGroupIterator.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/ThreadGroupIterator.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/ThreadGroupIterator.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/ThreadGroupIterator.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ThreadInfo.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/ThreadInfo.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/ThreadInfo.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/ThreadInfo.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ThreadIterator.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/ThreadIterator.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/ThreadIterator.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/ThreadIterator.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/Utils.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/Utils.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/Utils.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/Utils.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/VMLaunchFailureException.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/VMLaunchFailureException.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/VMLaunchFailureException.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/VMLaunchFailureException.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/VMNotInterruptedException.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/VMNotInterruptedException.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/VMNotInterruptedException.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/VMNotInterruptedException.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/WatchpointSpec.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/WatchpointSpec.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/bdi/WatchpointSpec.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/bdi/WatchpointSpec.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/event/AbstractEventSet.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/event/AbstractEventSet.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/event/AbstractEventSet.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/event/AbstractEventSet.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/event/AccessWatchpointEventSet.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/event/AccessWatchpointEventSet.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/event/AccessWatchpointEventSet.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/event/AccessWatchpointEventSet.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/event/ClassPrepareEventSet.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/event/ClassPrepareEventSet.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/event/ClassPrepareEventSet.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/event/ClassPrepareEventSet.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/event/ClassUnloadEventSet.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/event/ClassUnloadEventSet.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/event/ClassUnloadEventSet.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/event/ClassUnloadEventSet.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/event/ExceptionEventSet.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/event/ExceptionEventSet.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/event/ExceptionEventSet.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/event/ExceptionEventSet.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/event/JDIAdapter.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/event/JDIAdapter.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/event/JDIAdapter.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/event/JDIAdapter.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/event/JDIListener.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/event/JDIListener.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/event/JDIListener.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/event/JDIListener.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/event/LocatableEventSet.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/event/LocatableEventSet.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/event/LocatableEventSet.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/event/LocatableEventSet.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/event/LocationTriggerEventSet.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/event/LocationTriggerEventSet.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/event/LocationTriggerEventSet.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/event/LocationTriggerEventSet.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/event/ModificationWatchpointEventSet.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/event/ModificationWatchpointEventSet.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/event/ModificationWatchpointEventSet.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/event/ModificationWatchpointEventSet.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/event/ThreadDeathEventSet.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/event/ThreadDeathEventSet.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/event/ThreadDeathEventSet.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/event/ThreadDeathEventSet.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/event/ThreadStartEventSet.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/event/ThreadStartEventSet.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/event/ThreadStartEventSet.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/event/ThreadStartEventSet.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/event/VMDeathEventSet.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/event/VMDeathEventSet.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/event/VMDeathEventSet.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/event/VMDeathEventSet.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/event/VMDisconnectEventSet.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/event/VMDisconnectEventSet.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/event/VMDisconnectEventSet.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/event/VMDisconnectEventSet.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/event/VMStartEventSet.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/event/VMStartEventSet.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/event/VMStartEventSet.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/event/VMStartEventSet.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/event/WatchpointEventSet.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/event/WatchpointEventSet.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/event/WatchpointEventSet.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/event/WatchpointEventSet.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/expr/Expr.jj b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/expr/Expr.jj similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/expr/Expr.jj rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/expr/Expr.jj diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/gui/ApplicationTool.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/ApplicationTool.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/gui/ApplicationTool.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/ApplicationTool.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/gui/ClassManager.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/ClassManager.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/gui/ClassManager.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/ClassManager.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/gui/ClassTreeTool.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/ClassTreeTool.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/gui/ClassTreeTool.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/ClassTreeTool.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/gui/CommandInterpreter.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/CommandInterpreter.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/gui/CommandInterpreter.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/CommandInterpreter.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/gui/CommandTool.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/CommandTool.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/gui/CommandTool.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/CommandTool.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/gui/ContextListener.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/ContextListener.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/gui/ContextListener.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/ContextListener.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/ContextManager.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/ContextManager.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/gui/CurrentFrameChangedEvent.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/CurrentFrameChangedEvent.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/gui/CurrentFrameChangedEvent.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/CurrentFrameChangedEvent.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/gui/Environment.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/Environment.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/gui/Environment.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/Environment.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/gui/GUI.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/GUI.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/gui/GUI.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/GUI.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/gui/Icons.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/Icons.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/gui/Icons.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/Icons.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/gui/JDBFileFilter.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/JDBFileFilter.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/gui/JDBFileFilter.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/JDBFileFilter.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/gui/JDBMenuBar.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/JDBMenuBar.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/gui/JDBMenuBar.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/JDBMenuBar.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/gui/JDBToolBar.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/JDBToolBar.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/gui/JDBToolBar.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/JDBToolBar.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/gui/LaunchTool.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/LaunchTool.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/gui/LaunchTool.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/LaunchTool.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/gui/MonitorListModel.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/MonitorListModel.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/gui/MonitorListModel.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/MonitorListModel.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/gui/MonitorTool.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/MonitorTool.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/gui/MonitorTool.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/MonitorTool.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/gui/OutputSink.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/OutputSink.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/gui/OutputSink.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/OutputSink.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/gui/SearchPath.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/SearchPath.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/gui/SearchPath.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/SearchPath.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/gui/SingleLeafTreeSelectionModel.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/SingleLeafTreeSelectionModel.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/gui/SingleLeafTreeSelectionModel.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/SingleLeafTreeSelectionModel.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceListener.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/SourceListener.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceListener.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/SourceListener.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceManager.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/SourceManager.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceManager.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/SourceManager.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceModel.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/SourceModel.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceModel.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/SourceModel.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceTool.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/SourceTool.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceTool.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/SourceTool.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceTreeTool.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/SourceTreeTool.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceTreeTool.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/SourceTreeTool.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourcepathChangedEvent.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/SourcepathChangedEvent.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/gui/SourcepathChangedEvent.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/SourcepathChangedEvent.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/gui/StackTraceTool.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/StackTraceTool.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/gui/StackTraceTool.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/StackTraceTool.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/gui/ThreadTreeTool.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/ThreadTreeTool.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/gui/ThreadTreeTool.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/ThreadTreeTool.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/gui/TypeScript.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/TypeScript.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/gui/TypeScript.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/TypeScript.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/gui/TypeScriptOutputListener.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/TypeScriptOutputListener.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/gui/TypeScriptOutputListener.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/TypeScriptOutputListener.java diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/gui/TypeScriptWriter.java b/jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/TypeScriptWriter.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/debug/gui/TypeScriptWriter.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/debug/gui/TypeScriptWriter.java diff --git a/jdk/src/share/classes/com/sun/tools/example/doc/index.html b/jdk/src/demo/share/jpda/com/sun/tools/example/doc/index.html similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/doc/index.html rename to jdk/src/demo/share/jpda/com/sun/tools/example/doc/index.html diff --git a/jdk/src/share/classes/com/sun/tools/example/doc/javadt.html b/jdk/src/demo/share/jpda/com/sun/tools/example/doc/javadt.html similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/doc/javadt.html rename to jdk/src/demo/share/jpda/com/sun/tools/example/doc/javadt.html diff --git a/jdk/src/share/classes/com/sun/tools/example/doc/jdb.html b/jdk/src/demo/share/jpda/com/sun/tools/example/doc/jdb.html similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/doc/jdb.html rename to jdk/src/demo/share/jpda/com/sun/tools/example/doc/jdb.html diff --git a/jdk/src/share/classes/com/sun/tools/example/doc/trace.html b/jdk/src/demo/share/jpda/com/sun/tools/example/doc/trace.html similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/doc/trace.html rename to jdk/src/demo/share/jpda/com/sun/tools/example/doc/trace.html diff --git a/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java b/jdk/src/demo/share/jpda/com/sun/tools/example/trace/EventThread.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/trace/EventThread.java diff --git a/jdk/src/share/classes/com/sun/tools/example/trace/StreamRedirectThread.java b/jdk/src/demo/share/jpda/com/sun/tools/example/trace/StreamRedirectThread.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/trace/StreamRedirectThread.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/trace/StreamRedirectThread.java diff --git a/jdk/src/share/classes/com/sun/tools/example/trace/Trace.java b/jdk/src/demo/share/jpda/com/sun/tools/example/trace/Trace.java similarity index 100% rename from jdk/src/share/classes/com/sun/tools/example/trace/Trace.java rename to jdk/src/demo/share/jpda/com/sun/tools/example/trace/Trace.java diff --git a/jdk/src/share/demo/jvmti/agent_util/README.txt b/jdk/src/demo/share/jvmti/agent_util/README.txt similarity index 100% rename from jdk/src/share/demo/jvmti/agent_util/README.txt rename to jdk/src/demo/share/jvmti/agent_util/README.txt diff --git a/jdk/src/share/demo/jvmti/agent_util/agent_util.c b/jdk/src/demo/share/jvmti/agent_util/agent_util.c similarity index 100% rename from jdk/src/share/demo/jvmti/agent_util/agent_util.c rename to jdk/src/demo/share/jvmti/agent_util/agent_util.c diff --git a/jdk/src/share/demo/jvmti/agent_util/agent_util.h b/jdk/src/demo/share/jvmti/agent_util/agent_util.h similarity index 100% rename from jdk/src/share/demo/jvmti/agent_util/agent_util.h rename to jdk/src/demo/share/jvmti/agent_util/agent_util.h diff --git a/jdk/src/share/demo/jvmti/compiledMethodLoad/README.txt b/jdk/src/demo/share/jvmti/compiledMethodLoad/README.txt similarity index 100% rename from jdk/src/share/demo/jvmti/compiledMethodLoad/README.txt rename to jdk/src/demo/share/jvmti/compiledMethodLoad/README.txt diff --git a/jdk/src/share/demo/jvmti/compiledMethodLoad/compiledMethodLoad.c b/jdk/src/demo/share/jvmti/compiledMethodLoad/compiledMethodLoad.c similarity index 100% rename from jdk/src/share/demo/jvmti/compiledMethodLoad/compiledMethodLoad.c rename to jdk/src/demo/share/jvmti/compiledMethodLoad/compiledMethodLoad.c diff --git a/jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt b/jdk/src/demo/share/jvmti/compiledMethodLoad/sample.makefile.txt similarity index 100% rename from jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt rename to jdk/src/demo/share/jvmti/compiledMethodLoad/sample.makefile.txt diff --git a/jdk/src/share/demo/jvmti/gctest/README.txt b/jdk/src/demo/share/jvmti/gctest/README.txt similarity index 100% rename from jdk/src/share/demo/jvmti/gctest/README.txt rename to jdk/src/demo/share/jvmti/gctest/README.txt diff --git a/jdk/src/share/demo/jvmti/gctest/gctest.c b/jdk/src/demo/share/jvmti/gctest/gctest.c similarity index 100% rename from jdk/src/share/demo/jvmti/gctest/gctest.c rename to jdk/src/demo/share/jvmti/gctest/gctest.c diff --git a/jdk/src/share/demo/jvmti/gctest/sample.makefile.txt b/jdk/src/demo/share/jvmti/gctest/sample.makefile.txt similarity index 100% rename from jdk/src/share/demo/jvmti/gctest/sample.makefile.txt rename to jdk/src/demo/share/jvmti/gctest/sample.makefile.txt diff --git a/jdk/src/share/demo/jvmti/heapTracker/HeapTracker.java b/jdk/src/demo/share/jvmti/heapTracker/HeapTracker.java similarity index 100% rename from jdk/src/share/demo/jvmti/heapTracker/HeapTracker.java rename to jdk/src/demo/share/jvmti/heapTracker/HeapTracker.java diff --git a/jdk/src/share/demo/jvmti/heapTracker/README.txt b/jdk/src/demo/share/jvmti/heapTracker/README.txt similarity index 100% rename from jdk/src/share/demo/jvmti/heapTracker/README.txt rename to jdk/src/demo/share/jvmti/heapTracker/README.txt diff --git a/jdk/src/share/demo/jvmti/heapTracker/heapTracker.c b/jdk/src/demo/share/jvmti/heapTracker/heapTracker.c similarity index 100% rename from jdk/src/share/demo/jvmti/heapTracker/heapTracker.c rename to jdk/src/demo/share/jvmti/heapTracker/heapTracker.c diff --git a/jdk/src/share/demo/jvmti/heapTracker/heapTracker.h b/jdk/src/demo/share/jvmti/heapTracker/heapTracker.h similarity index 100% rename from jdk/src/share/demo/jvmti/heapTracker/heapTracker.h rename to jdk/src/demo/share/jvmti/heapTracker/heapTracker.h diff --git a/jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt b/jdk/src/demo/share/jvmti/heapTracker/sample.makefile.txt similarity index 100% rename from jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt rename to jdk/src/demo/share/jvmti/heapTracker/sample.makefile.txt diff --git a/jdk/src/share/demo/jvmti/heapViewer/README.txt b/jdk/src/demo/share/jvmti/heapViewer/README.txt similarity index 100% rename from jdk/src/share/demo/jvmti/heapViewer/README.txt rename to jdk/src/demo/share/jvmti/heapViewer/README.txt diff --git a/jdk/src/share/demo/jvmti/heapViewer/heapViewer.c b/jdk/src/demo/share/jvmti/heapViewer/heapViewer.c similarity index 100% rename from jdk/src/share/demo/jvmti/heapViewer/heapViewer.c rename to jdk/src/demo/share/jvmti/heapViewer/heapViewer.c diff --git a/jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt b/jdk/src/demo/share/jvmti/heapViewer/sample.makefile.txt similarity index 100% rename from jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt rename to jdk/src/demo/share/jvmti/heapViewer/sample.makefile.txt diff --git a/jdk/src/share/demo/jvmti/hprof/README.txt b/jdk/src/demo/share/jvmti/hprof/README.txt similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/README.txt rename to jdk/src/demo/share/jvmti/hprof/README.txt diff --git a/jdk/src/share/demo/jvmti/hprof/debug_malloc.c b/jdk/src/demo/share/jvmti/hprof/debug_malloc.c similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/debug_malloc.c rename to jdk/src/demo/share/jvmti/hprof/debug_malloc.c diff --git a/jdk/src/share/demo/jvmti/hprof/debug_malloc.h b/jdk/src/demo/share/jvmti/hprof/debug_malloc.h similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/debug_malloc.h rename to jdk/src/demo/share/jvmti/hprof/debug_malloc.h diff --git a/jdk/src/share/demo/jvmti/hprof/hprof.h b/jdk/src/demo/share/jvmti/hprof/hprof.h similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof.h rename to jdk/src/demo/share/jvmti/hprof/hprof.h diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_b_spec.h b/jdk/src/demo/share/jvmti/hprof/hprof_b_spec.h similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_b_spec.h rename to jdk/src/demo/share/jvmti/hprof/hprof_b_spec.h diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_blocks.c b/jdk/src/demo/share/jvmti/hprof/hprof_blocks.c similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_blocks.c rename to jdk/src/demo/share/jvmti/hprof/hprof_blocks.c diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_blocks.h b/jdk/src/demo/share/jvmti/hprof/hprof_blocks.h similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_blocks.h rename to jdk/src/demo/share/jvmti/hprof/hprof_blocks.h diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_check.c b/jdk/src/demo/share/jvmti/hprof/hprof_check.c similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_check.c rename to jdk/src/demo/share/jvmti/hprof/hprof_check.c diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_check.h b/jdk/src/demo/share/jvmti/hprof/hprof_check.h similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_check.h rename to jdk/src/demo/share/jvmti/hprof/hprof_check.h diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_class.c b/jdk/src/demo/share/jvmti/hprof/hprof_class.c similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_class.c rename to jdk/src/demo/share/jvmti/hprof/hprof_class.c diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_class.h b/jdk/src/demo/share/jvmti/hprof/hprof_class.h similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_class.h rename to jdk/src/demo/share/jvmti/hprof/hprof_class.h diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_cpu.c b/jdk/src/demo/share/jvmti/hprof/hprof_cpu.c similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_cpu.c rename to jdk/src/demo/share/jvmti/hprof/hprof_cpu.c diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_cpu.h b/jdk/src/demo/share/jvmti/hprof/hprof_cpu.h similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_cpu.h rename to jdk/src/demo/share/jvmti/hprof/hprof_cpu.h diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_error.c b/jdk/src/demo/share/jvmti/hprof/hprof_error.c similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_error.c rename to jdk/src/demo/share/jvmti/hprof/hprof_error.c diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_error.h b/jdk/src/demo/share/jvmti/hprof/hprof_error.h similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_error.h rename to jdk/src/demo/share/jvmti/hprof/hprof_error.h diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_event.c b/jdk/src/demo/share/jvmti/hprof/hprof_event.c similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_event.c rename to jdk/src/demo/share/jvmti/hprof/hprof_event.c diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_event.h b/jdk/src/demo/share/jvmti/hprof/hprof_event.h similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_event.h rename to jdk/src/demo/share/jvmti/hprof/hprof_event.h diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_frame.c b/jdk/src/demo/share/jvmti/hprof/hprof_frame.c similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_frame.c rename to jdk/src/demo/share/jvmti/hprof/hprof_frame.c diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_frame.h b/jdk/src/demo/share/jvmti/hprof/hprof_frame.h similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_frame.h rename to jdk/src/demo/share/jvmti/hprof/hprof_frame.h diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_init.c b/jdk/src/demo/share/jvmti/hprof/hprof_init.c similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_init.c rename to jdk/src/demo/share/jvmti/hprof/hprof_init.c diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_init.h b/jdk/src/demo/share/jvmti/hprof/hprof_init.h similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_init.h rename to jdk/src/demo/share/jvmti/hprof/hprof_init.h diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_io.c b/jdk/src/demo/share/jvmti/hprof/hprof_io.c similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_io.c rename to jdk/src/demo/share/jvmti/hprof/hprof_io.c diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_io.h b/jdk/src/demo/share/jvmti/hprof/hprof_io.h similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_io.h rename to jdk/src/demo/share/jvmti/hprof/hprof_io.h diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_ioname.c b/jdk/src/demo/share/jvmti/hprof/hprof_ioname.c similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_ioname.c rename to jdk/src/demo/share/jvmti/hprof/hprof_ioname.c diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_ioname.h b/jdk/src/demo/share/jvmti/hprof/hprof_ioname.h similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_ioname.h rename to jdk/src/demo/share/jvmti/hprof/hprof_ioname.h diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_listener.c b/jdk/src/demo/share/jvmti/hprof/hprof_listener.c similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_listener.c rename to jdk/src/demo/share/jvmti/hprof/hprof_listener.c diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_listener.h b/jdk/src/demo/share/jvmti/hprof/hprof_listener.h similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_listener.h rename to jdk/src/demo/share/jvmti/hprof/hprof_listener.h diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_loader.c b/jdk/src/demo/share/jvmti/hprof/hprof_loader.c similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_loader.c rename to jdk/src/demo/share/jvmti/hprof/hprof_loader.c diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_loader.h b/jdk/src/demo/share/jvmti/hprof/hprof_loader.h similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_loader.h rename to jdk/src/demo/share/jvmti/hprof/hprof_loader.h diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_md.h b/jdk/src/demo/share/jvmti/hprof/hprof_md.h similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_md.h rename to jdk/src/demo/share/jvmti/hprof/hprof_md.h diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_monitor.c b/jdk/src/demo/share/jvmti/hprof/hprof_monitor.c similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_monitor.c rename to jdk/src/demo/share/jvmti/hprof/hprof_monitor.c diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_monitor.h b/jdk/src/demo/share/jvmti/hprof/hprof_monitor.h similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_monitor.h rename to jdk/src/demo/share/jvmti/hprof/hprof_monitor.h diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_object.c b/jdk/src/demo/share/jvmti/hprof/hprof_object.c similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_object.c rename to jdk/src/demo/share/jvmti/hprof/hprof_object.c diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_object.h b/jdk/src/demo/share/jvmti/hprof/hprof_object.h similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_object.h rename to jdk/src/demo/share/jvmti/hprof/hprof_object.h diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_reference.c b/jdk/src/demo/share/jvmti/hprof/hprof_reference.c similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_reference.c rename to jdk/src/demo/share/jvmti/hprof/hprof_reference.c diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_reference.h b/jdk/src/demo/share/jvmti/hprof/hprof_reference.h similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_reference.h rename to jdk/src/demo/share/jvmti/hprof/hprof_reference.h diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_site.c b/jdk/src/demo/share/jvmti/hprof/hprof_site.c similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_site.c rename to jdk/src/demo/share/jvmti/hprof/hprof_site.c diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_site.h b/jdk/src/demo/share/jvmti/hprof/hprof_site.h similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_site.h rename to jdk/src/demo/share/jvmti/hprof/hprof_site.h diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_stack.c b/jdk/src/demo/share/jvmti/hprof/hprof_stack.c similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_stack.c rename to jdk/src/demo/share/jvmti/hprof/hprof_stack.c diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_stack.h b/jdk/src/demo/share/jvmti/hprof/hprof_stack.h similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_stack.h rename to jdk/src/demo/share/jvmti/hprof/hprof_stack.h diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_string.c b/jdk/src/demo/share/jvmti/hprof/hprof_string.c similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_string.c rename to jdk/src/demo/share/jvmti/hprof/hprof_string.c diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_string.h b/jdk/src/demo/share/jvmti/hprof/hprof_string.h similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_string.h rename to jdk/src/demo/share/jvmti/hprof/hprof_string.h diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_table.c b/jdk/src/demo/share/jvmti/hprof/hprof_table.c similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_table.c rename to jdk/src/demo/share/jvmti/hprof/hprof_table.c diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_table.h b/jdk/src/demo/share/jvmti/hprof/hprof_table.h similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_table.h rename to jdk/src/demo/share/jvmti/hprof/hprof_table.h diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_tag.c b/jdk/src/demo/share/jvmti/hprof/hprof_tag.c similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_tag.c rename to jdk/src/demo/share/jvmti/hprof/hprof_tag.c diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_tag.h b/jdk/src/demo/share/jvmti/hprof/hprof_tag.h similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_tag.h rename to jdk/src/demo/share/jvmti/hprof/hprof_tag.h diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_tls.c b/jdk/src/demo/share/jvmti/hprof/hprof_tls.c similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_tls.c rename to jdk/src/demo/share/jvmti/hprof/hprof_tls.c diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_tls.h b/jdk/src/demo/share/jvmti/hprof/hprof_tls.h similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_tls.h rename to jdk/src/demo/share/jvmti/hprof/hprof_tls.h diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_trace.c b/jdk/src/demo/share/jvmti/hprof/hprof_trace.c similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_trace.c rename to jdk/src/demo/share/jvmti/hprof/hprof_trace.c diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_trace.h b/jdk/src/demo/share/jvmti/hprof/hprof_trace.h similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_trace.h rename to jdk/src/demo/share/jvmti/hprof/hprof_trace.h diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_tracker.c b/jdk/src/demo/share/jvmti/hprof/hprof_tracker.c similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_tracker.c rename to jdk/src/demo/share/jvmti/hprof/hprof_tracker.c diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_tracker.h b/jdk/src/demo/share/jvmti/hprof/hprof_tracker.h similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_tracker.h rename to jdk/src/demo/share/jvmti/hprof/hprof_tracker.h diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_util.c b/jdk/src/demo/share/jvmti/hprof/hprof_util.c similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_util.c rename to jdk/src/demo/share/jvmti/hprof/hprof_util.c diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_util.h b/jdk/src/demo/share/jvmti/hprof/hprof_util.h similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/hprof_util.h rename to jdk/src/demo/share/jvmti/hprof/hprof_util.h diff --git a/jdk/src/share/demo/jvmti/hprof/jvm.hprof.txt b/jdk/src/demo/share/jvmti/hprof/jvm.hprof.txt similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/jvm.hprof.txt rename to jdk/src/demo/share/jvmti/hprof/jvm.hprof.txt diff --git a/jdk/src/share/demo/jvmti/hprof/manual.html b/jdk/src/demo/share/jvmti/hprof/manual.html similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/manual.html rename to jdk/src/demo/share/jvmti/hprof/manual.html diff --git a/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt b/jdk/src/demo/share/jvmti/hprof/sample.makefile.txt similarity index 100% rename from jdk/src/share/demo/jvmti/hprof/sample.makefile.txt rename to jdk/src/demo/share/jvmti/hprof/sample.makefile.txt diff --git a/jdk/src/share/demo/jvmti/index.html b/jdk/src/demo/share/jvmti/index.html similarity index 100% rename from jdk/src/share/demo/jvmti/index.html rename to jdk/src/demo/share/jvmti/index.html diff --git a/jdk/src/share/demo/jvmti/java_crw_demo/README.txt b/jdk/src/demo/share/jvmti/java_crw_demo/README.txt similarity index 100% rename from jdk/src/share/demo/jvmti/java_crw_demo/README.txt rename to jdk/src/demo/share/jvmti/java_crw_demo/README.txt diff --git a/jdk/src/share/demo/jvmti/java_crw_demo/java_crw_demo.c b/jdk/src/demo/share/jvmti/java_crw_demo/java_crw_demo.c similarity index 100% rename from jdk/src/share/demo/jvmti/java_crw_demo/java_crw_demo.c rename to jdk/src/demo/share/jvmti/java_crw_demo/java_crw_demo.c diff --git a/jdk/src/share/demo/jvmti/java_crw_demo/java_crw_demo.h b/jdk/src/demo/share/jvmti/java_crw_demo/java_crw_demo.h similarity index 100% rename from jdk/src/share/demo/jvmti/java_crw_demo/java_crw_demo.h rename to jdk/src/demo/share/jvmti/java_crw_demo/java_crw_demo.h diff --git a/jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt b/jdk/src/demo/share/jvmti/java_crw_demo/sample.makefile.txt similarity index 100% rename from jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt rename to jdk/src/demo/share/jvmti/java_crw_demo/sample.makefile.txt diff --git a/jdk/src/share/demo/jvmti/minst/Minst.java b/jdk/src/demo/share/jvmti/minst/Minst.java similarity index 100% rename from jdk/src/share/demo/jvmti/minst/Minst.java rename to jdk/src/demo/share/jvmti/minst/Minst.java diff --git a/jdk/src/share/demo/jvmti/minst/README.txt b/jdk/src/demo/share/jvmti/minst/README.txt similarity index 100% rename from jdk/src/share/demo/jvmti/minst/README.txt rename to jdk/src/demo/share/jvmti/minst/README.txt diff --git a/jdk/src/share/demo/jvmti/minst/minst.c b/jdk/src/demo/share/jvmti/minst/minst.c similarity index 100% rename from jdk/src/share/demo/jvmti/minst/minst.c rename to jdk/src/demo/share/jvmti/minst/minst.c diff --git a/jdk/src/share/demo/jvmti/minst/minst.h b/jdk/src/demo/share/jvmti/minst/minst.h similarity index 100% rename from jdk/src/share/demo/jvmti/minst/minst.h rename to jdk/src/demo/share/jvmti/minst/minst.h diff --git a/jdk/src/share/demo/jvmti/minst/sample.makefile.txt b/jdk/src/demo/share/jvmti/minst/sample.makefile.txt similarity index 100% rename from jdk/src/share/demo/jvmti/minst/sample.makefile.txt rename to jdk/src/demo/share/jvmti/minst/sample.makefile.txt diff --git a/jdk/src/share/demo/jvmti/mtrace/Mtrace.java b/jdk/src/demo/share/jvmti/mtrace/Mtrace.java similarity index 100% rename from jdk/src/share/demo/jvmti/mtrace/Mtrace.java rename to jdk/src/demo/share/jvmti/mtrace/Mtrace.java diff --git a/jdk/src/share/demo/jvmti/mtrace/README.txt b/jdk/src/demo/share/jvmti/mtrace/README.txt similarity index 100% rename from jdk/src/share/demo/jvmti/mtrace/README.txt rename to jdk/src/demo/share/jvmti/mtrace/README.txt diff --git a/jdk/src/share/demo/jvmti/mtrace/mtrace.c b/jdk/src/demo/share/jvmti/mtrace/mtrace.c similarity index 100% rename from jdk/src/share/demo/jvmti/mtrace/mtrace.c rename to jdk/src/demo/share/jvmti/mtrace/mtrace.c diff --git a/jdk/src/share/demo/jvmti/mtrace/mtrace.h b/jdk/src/demo/share/jvmti/mtrace/mtrace.h similarity index 100% rename from jdk/src/share/demo/jvmti/mtrace/mtrace.h rename to jdk/src/demo/share/jvmti/mtrace/mtrace.h diff --git a/jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt b/jdk/src/demo/share/jvmti/mtrace/sample.makefile.txt similarity index 100% rename from jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt rename to jdk/src/demo/share/jvmti/mtrace/sample.makefile.txt diff --git a/jdk/src/share/demo/jvmti/versionCheck/README.txt b/jdk/src/demo/share/jvmti/versionCheck/README.txt similarity index 100% rename from jdk/src/share/demo/jvmti/versionCheck/README.txt rename to jdk/src/demo/share/jvmti/versionCheck/README.txt diff --git a/jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt b/jdk/src/demo/share/jvmti/versionCheck/sample.makefile.txt similarity index 100% rename from jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt rename to jdk/src/demo/share/jvmti/versionCheck/sample.makefile.txt diff --git a/jdk/src/share/demo/jvmti/versionCheck/versionCheck.c b/jdk/src/demo/share/jvmti/versionCheck/versionCheck.c similarity index 100% rename from jdk/src/share/demo/jvmti/versionCheck/versionCheck.c rename to jdk/src/demo/share/jvmti/versionCheck/versionCheck.c diff --git a/jdk/src/share/demo/jvmti/waiters/Agent.cpp b/jdk/src/demo/share/jvmti/waiters/Agent.cpp similarity index 100% rename from jdk/src/share/demo/jvmti/waiters/Agent.cpp rename to jdk/src/demo/share/jvmti/waiters/Agent.cpp diff --git a/jdk/src/share/demo/jvmti/waiters/Agent.hpp b/jdk/src/demo/share/jvmti/waiters/Agent.hpp similarity index 100% rename from jdk/src/share/demo/jvmti/waiters/Agent.hpp rename to jdk/src/demo/share/jvmti/waiters/Agent.hpp diff --git a/jdk/src/share/demo/jvmti/waiters/Monitor.cpp b/jdk/src/demo/share/jvmti/waiters/Monitor.cpp similarity index 100% rename from jdk/src/share/demo/jvmti/waiters/Monitor.cpp rename to jdk/src/demo/share/jvmti/waiters/Monitor.cpp diff --git a/jdk/src/share/demo/jvmti/waiters/Monitor.hpp b/jdk/src/demo/share/jvmti/waiters/Monitor.hpp similarity index 100% rename from jdk/src/share/demo/jvmti/waiters/Monitor.hpp rename to jdk/src/demo/share/jvmti/waiters/Monitor.hpp diff --git a/jdk/src/share/demo/jvmti/waiters/README.txt b/jdk/src/demo/share/jvmti/waiters/README.txt similarity index 100% rename from jdk/src/share/demo/jvmti/waiters/README.txt rename to jdk/src/demo/share/jvmti/waiters/README.txt diff --git a/jdk/src/share/demo/jvmti/waiters/Thread.cpp b/jdk/src/demo/share/jvmti/waiters/Thread.cpp similarity index 100% rename from jdk/src/share/demo/jvmti/waiters/Thread.cpp rename to jdk/src/demo/share/jvmti/waiters/Thread.cpp diff --git a/jdk/src/share/demo/jvmti/waiters/Thread.hpp b/jdk/src/demo/share/jvmti/waiters/Thread.hpp similarity index 100% rename from jdk/src/share/demo/jvmti/waiters/Thread.hpp rename to jdk/src/demo/share/jvmti/waiters/Thread.hpp diff --git a/jdk/src/share/demo/jvmti/waiters/sample.makefile.txt b/jdk/src/demo/share/jvmti/waiters/sample.makefile.txt similarity index 100% rename from jdk/src/share/demo/jvmti/waiters/sample.makefile.txt rename to jdk/src/demo/share/jvmti/waiters/sample.makefile.txt diff --git a/jdk/src/share/demo/jvmti/waiters/waiters.cpp b/jdk/src/demo/share/jvmti/waiters/waiters.cpp similarity index 100% rename from jdk/src/share/demo/jvmti/waiters/waiters.cpp rename to jdk/src/demo/share/jvmti/waiters/waiters.cpp diff --git a/jdk/src/share/demo/management/FullThreadDump/Deadlock.java b/jdk/src/demo/share/management/FullThreadDump/Deadlock.java similarity index 100% rename from jdk/src/share/demo/management/FullThreadDump/Deadlock.java rename to jdk/src/demo/share/management/FullThreadDump/Deadlock.java diff --git a/jdk/src/share/demo/management/FullThreadDump/FullThreadDump.java b/jdk/src/demo/share/management/FullThreadDump/FullThreadDump.java similarity index 100% rename from jdk/src/share/demo/management/FullThreadDump/FullThreadDump.java rename to jdk/src/demo/share/management/FullThreadDump/FullThreadDump.java diff --git a/jdk/src/share/demo/management/FullThreadDump/README.txt b/jdk/src/demo/share/management/FullThreadDump/README.txt similarity index 100% rename from jdk/src/share/demo/management/FullThreadDump/README.txt rename to jdk/src/demo/share/management/FullThreadDump/README.txt diff --git a/jdk/src/share/demo/management/FullThreadDump/ThreadMonitor.java b/jdk/src/demo/share/management/FullThreadDump/ThreadMonitor.java similarity index 100% rename from jdk/src/share/demo/management/FullThreadDump/ThreadMonitor.java rename to jdk/src/demo/share/management/FullThreadDump/ThreadMonitor.java diff --git a/jdk/src/share/demo/management/JTop/JTop.java b/jdk/src/demo/share/management/JTop/JTop.java similarity index 100% rename from jdk/src/share/demo/management/JTop/JTop.java rename to jdk/src/demo/share/management/JTop/JTop.java diff --git a/jdk/src/share/demo/management/JTop/JTopPlugin.java b/jdk/src/demo/share/management/JTop/JTopPlugin.java similarity index 100% rename from jdk/src/share/demo/management/JTop/JTopPlugin.java rename to jdk/src/demo/share/management/JTop/JTopPlugin.java diff --git a/jdk/src/share/demo/management/JTop/META-INF/services/com.sun.tools.jconsole.JConsolePlugin b/jdk/src/demo/share/management/JTop/META-INF/services/com.sun.tools.jconsole.JConsolePlugin similarity index 100% rename from jdk/src/share/demo/management/JTop/META-INF/services/com.sun.tools.jconsole.JConsolePlugin rename to jdk/src/demo/share/management/JTop/META-INF/services/com.sun.tools.jconsole.JConsolePlugin diff --git a/jdk/src/share/demo/management/JTop/README.txt b/jdk/src/demo/share/management/JTop/README.txt similarity index 100% rename from jdk/src/share/demo/management/JTop/README.txt rename to jdk/src/demo/share/management/JTop/README.txt diff --git a/jdk/src/share/demo/management/MemoryMonitor/MemoryMonitor.java b/jdk/src/demo/share/management/MemoryMonitor/MemoryMonitor.java similarity index 100% rename from jdk/src/share/demo/management/MemoryMonitor/MemoryMonitor.java rename to jdk/src/demo/share/management/MemoryMonitor/MemoryMonitor.java diff --git a/jdk/src/share/demo/management/MemoryMonitor/README.txt b/jdk/src/demo/share/management/MemoryMonitor/README.txt similarity index 100% rename from jdk/src/share/demo/management/MemoryMonitor/README.txt rename to jdk/src/demo/share/management/MemoryMonitor/README.txt diff --git a/jdk/src/share/demo/management/VerboseGC/PrintGCStat.java b/jdk/src/demo/share/management/VerboseGC/PrintGCStat.java similarity index 100% rename from jdk/src/share/demo/management/VerboseGC/PrintGCStat.java rename to jdk/src/demo/share/management/VerboseGC/PrintGCStat.java diff --git a/jdk/src/share/demo/management/VerboseGC/README.txt b/jdk/src/demo/share/management/VerboseGC/README.txt similarity index 100% rename from jdk/src/share/demo/management/VerboseGC/README.txt rename to jdk/src/demo/share/management/VerboseGC/README.txt diff --git a/jdk/src/share/demo/management/VerboseGC/VerboseGC.java b/jdk/src/demo/share/management/VerboseGC/VerboseGC.java similarity index 100% rename from jdk/src/share/demo/management/VerboseGC/VerboseGC.java rename to jdk/src/demo/share/management/VerboseGC/VerboseGC.java diff --git a/jdk/src/share/demo/management/index.html b/jdk/src/demo/share/management/index.html similarity index 100% rename from jdk/src/share/demo/management/index.html rename to jdk/src/demo/share/management/index.html diff --git a/jdk/src/share/demo/nbproject/README.txt b/jdk/src/demo/share/nbproject/README.txt similarity index 100% rename from jdk/src/share/demo/nbproject/README.txt rename to jdk/src/demo/share/nbproject/README.txt diff --git a/jdk/src/share/demo/nbproject/jfc/FileChooserDemo/build.properties b/jdk/src/demo/share/nbproject/jfc/FileChooserDemo/build.properties similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/FileChooserDemo/build.properties rename to jdk/src/demo/share/nbproject/jfc/FileChooserDemo/build.properties diff --git a/jdk/src/share/demo/nbproject/jfc/FileChooserDemo/build.xml b/jdk/src/demo/share/nbproject/jfc/FileChooserDemo/build.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/FileChooserDemo/build.xml rename to jdk/src/demo/share/nbproject/jfc/FileChooserDemo/build.xml diff --git a/jdk/src/share/demo/nbproject/jfc/FileChooserDemo/nbproject/file-targets.xml b/jdk/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/file-targets.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/FileChooserDemo/nbproject/file-targets.xml rename to jdk/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/file-targets.xml diff --git a/jdk/src/share/demo/nbproject/jfc/FileChooserDemo/nbproject/jdk.xml b/jdk/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/jdk.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/FileChooserDemo/nbproject/jdk.xml rename to jdk/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/jdk.xml diff --git a/jdk/src/share/demo/nbproject/jfc/FileChooserDemo/nbproject/netbeans-targets.xml b/jdk/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/netbeans-targets.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/FileChooserDemo/nbproject/netbeans-targets.xml rename to jdk/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/netbeans-targets.xml diff --git a/jdk/src/share/demo/nbproject/jfc/FileChooserDemo/nbproject/project.xml b/jdk/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/project.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/FileChooserDemo/nbproject/project.xml rename to jdk/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/project.xml diff --git a/jdk/src/share/demo/nbproject/jfc/Font2DTest/build.properties b/jdk/src/demo/share/nbproject/jfc/Font2DTest/build.properties similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/Font2DTest/build.properties rename to jdk/src/demo/share/nbproject/jfc/Font2DTest/build.properties diff --git a/jdk/src/share/demo/nbproject/jfc/Font2DTest/build.xml b/jdk/src/demo/share/nbproject/jfc/Font2DTest/build.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/Font2DTest/build.xml rename to jdk/src/demo/share/nbproject/jfc/Font2DTest/build.xml diff --git a/jdk/src/share/demo/nbproject/jfc/Font2DTest/nbproject/file-targets.xml b/jdk/src/demo/share/nbproject/jfc/Font2DTest/nbproject/file-targets.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/Font2DTest/nbproject/file-targets.xml rename to jdk/src/demo/share/nbproject/jfc/Font2DTest/nbproject/file-targets.xml diff --git a/jdk/src/share/demo/nbproject/jfc/Font2DTest/nbproject/jdk.xml b/jdk/src/demo/share/nbproject/jfc/Font2DTest/nbproject/jdk.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/Font2DTest/nbproject/jdk.xml rename to jdk/src/demo/share/nbproject/jfc/Font2DTest/nbproject/jdk.xml diff --git a/jdk/src/share/demo/nbproject/jfc/Font2DTest/nbproject/netbeans-targets.xml b/jdk/src/demo/share/nbproject/jfc/Font2DTest/nbproject/netbeans-targets.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/Font2DTest/nbproject/netbeans-targets.xml rename to jdk/src/demo/share/nbproject/jfc/Font2DTest/nbproject/netbeans-targets.xml diff --git a/jdk/src/share/demo/nbproject/jfc/Font2DTest/nbproject/project.xml b/jdk/src/demo/share/nbproject/jfc/Font2DTest/nbproject/project.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/Font2DTest/nbproject/project.xml rename to jdk/src/demo/share/nbproject/jfc/Font2DTest/nbproject/project.xml diff --git a/jdk/src/share/demo/nbproject/jfc/Metalworks/build.properties b/jdk/src/demo/share/nbproject/jfc/Metalworks/build.properties similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/Metalworks/build.properties rename to jdk/src/demo/share/nbproject/jfc/Metalworks/build.properties diff --git a/jdk/src/share/demo/nbproject/jfc/Metalworks/build.xml b/jdk/src/demo/share/nbproject/jfc/Metalworks/build.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/Metalworks/build.xml rename to jdk/src/demo/share/nbproject/jfc/Metalworks/build.xml diff --git a/jdk/src/share/demo/nbproject/jfc/Metalworks/nbproject/file-targets.xml b/jdk/src/demo/share/nbproject/jfc/Metalworks/nbproject/file-targets.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/Metalworks/nbproject/file-targets.xml rename to jdk/src/demo/share/nbproject/jfc/Metalworks/nbproject/file-targets.xml diff --git a/jdk/src/share/demo/nbproject/jfc/Metalworks/nbproject/jdk.xml b/jdk/src/demo/share/nbproject/jfc/Metalworks/nbproject/jdk.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/Metalworks/nbproject/jdk.xml rename to jdk/src/demo/share/nbproject/jfc/Metalworks/nbproject/jdk.xml diff --git a/jdk/src/share/demo/nbproject/jfc/Metalworks/nbproject/netbeans-targets.xml b/jdk/src/demo/share/nbproject/jfc/Metalworks/nbproject/netbeans-targets.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/Metalworks/nbproject/netbeans-targets.xml rename to jdk/src/demo/share/nbproject/jfc/Metalworks/nbproject/netbeans-targets.xml diff --git a/jdk/src/share/demo/nbproject/jfc/Metalworks/nbproject/project.xml b/jdk/src/demo/share/nbproject/jfc/Metalworks/nbproject/project.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/Metalworks/nbproject/project.xml rename to jdk/src/demo/share/nbproject/jfc/Metalworks/nbproject/project.xml diff --git a/jdk/src/share/demo/nbproject/jfc/Notepad/build.properties b/jdk/src/demo/share/nbproject/jfc/Notepad/build.properties similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/Notepad/build.properties rename to jdk/src/demo/share/nbproject/jfc/Notepad/build.properties diff --git a/jdk/src/share/demo/nbproject/jfc/Notepad/build.xml b/jdk/src/demo/share/nbproject/jfc/Notepad/build.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/Notepad/build.xml rename to jdk/src/demo/share/nbproject/jfc/Notepad/build.xml diff --git a/jdk/src/share/demo/nbproject/jfc/Notepad/nbproject/file-targets.xml b/jdk/src/demo/share/nbproject/jfc/Notepad/nbproject/file-targets.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/Notepad/nbproject/file-targets.xml rename to jdk/src/demo/share/nbproject/jfc/Notepad/nbproject/file-targets.xml diff --git a/jdk/src/share/demo/nbproject/jfc/Notepad/nbproject/jdk.xml b/jdk/src/demo/share/nbproject/jfc/Notepad/nbproject/jdk.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/Notepad/nbproject/jdk.xml rename to jdk/src/demo/share/nbproject/jfc/Notepad/nbproject/jdk.xml diff --git a/jdk/src/share/demo/nbproject/jfc/Notepad/nbproject/netbeans-targets.xml b/jdk/src/demo/share/nbproject/jfc/Notepad/nbproject/netbeans-targets.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/Notepad/nbproject/netbeans-targets.xml rename to jdk/src/demo/share/nbproject/jfc/Notepad/nbproject/netbeans-targets.xml diff --git a/jdk/src/share/demo/nbproject/jfc/Notepad/nbproject/project.xml b/jdk/src/demo/share/nbproject/jfc/Notepad/nbproject/project.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/Notepad/nbproject/project.xml rename to jdk/src/demo/share/nbproject/jfc/Notepad/nbproject/project.xml diff --git a/jdk/src/share/demo/nbproject/jfc/SampleTree/build.properties b/jdk/src/demo/share/nbproject/jfc/SampleTree/build.properties similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/SampleTree/build.properties rename to jdk/src/demo/share/nbproject/jfc/SampleTree/build.properties diff --git a/jdk/src/share/demo/nbproject/jfc/SampleTree/build.xml b/jdk/src/demo/share/nbproject/jfc/SampleTree/build.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/SampleTree/build.xml rename to jdk/src/demo/share/nbproject/jfc/SampleTree/build.xml diff --git a/jdk/src/share/demo/nbproject/jfc/SampleTree/nbproject/file-targets.xml b/jdk/src/demo/share/nbproject/jfc/SampleTree/nbproject/file-targets.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/SampleTree/nbproject/file-targets.xml rename to jdk/src/demo/share/nbproject/jfc/SampleTree/nbproject/file-targets.xml diff --git a/jdk/src/share/demo/nbproject/jfc/SampleTree/nbproject/jdk.xml b/jdk/src/demo/share/nbproject/jfc/SampleTree/nbproject/jdk.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/SampleTree/nbproject/jdk.xml rename to jdk/src/demo/share/nbproject/jfc/SampleTree/nbproject/jdk.xml diff --git a/jdk/src/share/demo/nbproject/jfc/SampleTree/nbproject/netbeans-targets.xml b/jdk/src/demo/share/nbproject/jfc/SampleTree/nbproject/netbeans-targets.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/SampleTree/nbproject/netbeans-targets.xml rename to jdk/src/demo/share/nbproject/jfc/SampleTree/nbproject/netbeans-targets.xml diff --git a/jdk/src/share/demo/nbproject/jfc/SampleTree/nbproject/project.xml b/jdk/src/demo/share/nbproject/jfc/SampleTree/nbproject/project.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/SampleTree/nbproject/project.xml rename to jdk/src/demo/share/nbproject/jfc/SampleTree/nbproject/project.xml diff --git a/jdk/src/share/demo/nbproject/jfc/SwingApplet/build.properties b/jdk/src/demo/share/nbproject/jfc/SwingApplet/build.properties similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/SwingApplet/build.properties rename to jdk/src/demo/share/nbproject/jfc/SwingApplet/build.properties diff --git a/jdk/src/share/demo/nbproject/jfc/SwingApplet/build.xml b/jdk/src/demo/share/nbproject/jfc/SwingApplet/build.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/SwingApplet/build.xml rename to jdk/src/demo/share/nbproject/jfc/SwingApplet/build.xml diff --git a/jdk/src/share/demo/nbproject/jfc/SwingApplet/nbproject/file-targets.xml b/jdk/src/demo/share/nbproject/jfc/SwingApplet/nbproject/file-targets.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/SwingApplet/nbproject/file-targets.xml rename to jdk/src/demo/share/nbproject/jfc/SwingApplet/nbproject/file-targets.xml diff --git a/jdk/src/share/demo/nbproject/jfc/SwingApplet/nbproject/jdk.xml b/jdk/src/demo/share/nbproject/jfc/SwingApplet/nbproject/jdk.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/SwingApplet/nbproject/jdk.xml rename to jdk/src/demo/share/nbproject/jfc/SwingApplet/nbproject/jdk.xml diff --git a/jdk/src/share/demo/nbproject/jfc/SwingApplet/nbproject/netbeans-targets.xml b/jdk/src/demo/share/nbproject/jfc/SwingApplet/nbproject/netbeans-targets.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/SwingApplet/nbproject/netbeans-targets.xml rename to jdk/src/demo/share/nbproject/jfc/SwingApplet/nbproject/netbeans-targets.xml diff --git a/jdk/src/share/demo/nbproject/jfc/SwingApplet/nbproject/project.xml b/jdk/src/demo/share/nbproject/jfc/SwingApplet/nbproject/project.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/SwingApplet/nbproject/project.xml rename to jdk/src/demo/share/nbproject/jfc/SwingApplet/nbproject/project.xml diff --git a/jdk/src/share/demo/nbproject/jfc/TableExample/build.properties b/jdk/src/demo/share/nbproject/jfc/TableExample/build.properties similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/TableExample/build.properties rename to jdk/src/demo/share/nbproject/jfc/TableExample/build.properties diff --git a/jdk/src/share/demo/nbproject/jfc/TableExample/build.xml b/jdk/src/demo/share/nbproject/jfc/TableExample/build.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/TableExample/build.xml rename to jdk/src/demo/share/nbproject/jfc/TableExample/build.xml diff --git a/jdk/src/share/demo/nbproject/jfc/TableExample/nbproject/file-targets.xml b/jdk/src/demo/share/nbproject/jfc/TableExample/nbproject/file-targets.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/TableExample/nbproject/file-targets.xml rename to jdk/src/demo/share/nbproject/jfc/TableExample/nbproject/file-targets.xml diff --git a/jdk/src/share/demo/nbproject/jfc/TableExample/nbproject/jdk.xml b/jdk/src/demo/share/nbproject/jfc/TableExample/nbproject/jdk.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/TableExample/nbproject/jdk.xml rename to jdk/src/demo/share/nbproject/jfc/TableExample/nbproject/jdk.xml diff --git a/jdk/src/share/demo/nbproject/jfc/TableExample/nbproject/netbeans-targets.xml b/jdk/src/demo/share/nbproject/jfc/TableExample/nbproject/netbeans-targets.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/TableExample/nbproject/netbeans-targets.xml rename to jdk/src/demo/share/nbproject/jfc/TableExample/nbproject/netbeans-targets.xml diff --git a/jdk/src/share/demo/nbproject/jfc/TableExample/nbproject/project.xml b/jdk/src/demo/share/nbproject/jfc/TableExample/nbproject/project.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/TableExample/nbproject/project.xml rename to jdk/src/demo/share/nbproject/jfc/TableExample/nbproject/project.xml diff --git a/jdk/src/share/demo/nbproject/jfc/TransparentRuler/build.properties b/jdk/src/demo/share/nbproject/jfc/TransparentRuler/build.properties similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/TransparentRuler/build.properties rename to jdk/src/demo/share/nbproject/jfc/TransparentRuler/build.properties diff --git a/jdk/src/share/demo/nbproject/jfc/TransparentRuler/build.xml b/jdk/src/demo/share/nbproject/jfc/TransparentRuler/build.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/TransparentRuler/build.xml rename to jdk/src/demo/share/nbproject/jfc/TransparentRuler/build.xml diff --git a/jdk/src/share/demo/nbproject/jfc/TransparentRuler/nbproject/file-targets.xml b/jdk/src/demo/share/nbproject/jfc/TransparentRuler/nbproject/file-targets.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/TransparentRuler/nbproject/file-targets.xml rename to jdk/src/demo/share/nbproject/jfc/TransparentRuler/nbproject/file-targets.xml diff --git a/jdk/src/share/demo/nbproject/jfc/TransparentRuler/nbproject/jdk.xml b/jdk/src/demo/share/nbproject/jfc/TransparentRuler/nbproject/jdk.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/TransparentRuler/nbproject/jdk.xml rename to jdk/src/demo/share/nbproject/jfc/TransparentRuler/nbproject/jdk.xml diff --git a/jdk/src/share/demo/nbproject/jfc/TransparentRuler/nbproject/netbeans-targets.xml b/jdk/src/demo/share/nbproject/jfc/TransparentRuler/nbproject/netbeans-targets.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/TransparentRuler/nbproject/netbeans-targets.xml rename to jdk/src/demo/share/nbproject/jfc/TransparentRuler/nbproject/netbeans-targets.xml diff --git a/jdk/src/share/demo/nbproject/jfc/TransparentRuler/nbproject/project.xml b/jdk/src/demo/share/nbproject/jfc/TransparentRuler/nbproject/project.xml similarity index 100% rename from jdk/src/share/demo/nbproject/jfc/TransparentRuler/nbproject/project.xml rename to jdk/src/demo/share/nbproject/jfc/TransparentRuler/nbproject/project.xml diff --git a/jdk/src/share/demo/nbproject/management/FullThreadDump/build.properties b/jdk/src/demo/share/nbproject/management/FullThreadDump/build.properties similarity index 100% rename from jdk/src/share/demo/nbproject/management/FullThreadDump/build.properties rename to jdk/src/demo/share/nbproject/management/FullThreadDump/build.properties diff --git a/jdk/src/share/demo/nbproject/management/FullThreadDump/build.xml b/jdk/src/demo/share/nbproject/management/FullThreadDump/build.xml similarity index 100% rename from jdk/src/share/demo/nbproject/management/FullThreadDump/build.xml rename to jdk/src/demo/share/nbproject/management/FullThreadDump/build.xml diff --git a/jdk/src/share/demo/nbproject/management/FullThreadDump/nbproject/file-targets.xml b/jdk/src/demo/share/nbproject/management/FullThreadDump/nbproject/file-targets.xml similarity index 100% rename from jdk/src/share/demo/nbproject/management/FullThreadDump/nbproject/file-targets.xml rename to jdk/src/demo/share/nbproject/management/FullThreadDump/nbproject/file-targets.xml diff --git a/jdk/src/share/demo/nbproject/management/FullThreadDump/nbproject/jdk.xml b/jdk/src/demo/share/nbproject/management/FullThreadDump/nbproject/jdk.xml similarity index 100% rename from jdk/src/share/demo/nbproject/management/FullThreadDump/nbproject/jdk.xml rename to jdk/src/demo/share/nbproject/management/FullThreadDump/nbproject/jdk.xml diff --git a/jdk/src/share/demo/nbproject/management/FullThreadDump/nbproject/netbeans-targets.xml b/jdk/src/demo/share/nbproject/management/FullThreadDump/nbproject/netbeans-targets.xml similarity index 100% rename from jdk/src/share/demo/nbproject/management/FullThreadDump/nbproject/netbeans-targets.xml rename to jdk/src/demo/share/nbproject/management/FullThreadDump/nbproject/netbeans-targets.xml diff --git a/jdk/src/share/demo/nbproject/management/FullThreadDump/nbproject/project.xml b/jdk/src/demo/share/nbproject/management/FullThreadDump/nbproject/project.xml similarity index 100% rename from jdk/src/share/demo/nbproject/management/FullThreadDump/nbproject/project.xml rename to jdk/src/demo/share/nbproject/management/FullThreadDump/nbproject/project.xml diff --git a/jdk/src/share/demo/nbproject/management/JTop/build.properties b/jdk/src/demo/share/nbproject/management/JTop/build.properties similarity index 100% rename from jdk/src/share/demo/nbproject/management/JTop/build.properties rename to jdk/src/demo/share/nbproject/management/JTop/build.properties diff --git a/jdk/src/share/demo/nbproject/management/JTop/build.xml b/jdk/src/demo/share/nbproject/management/JTop/build.xml similarity index 100% rename from jdk/src/share/demo/nbproject/management/JTop/build.xml rename to jdk/src/demo/share/nbproject/management/JTop/build.xml diff --git a/jdk/src/share/demo/nbproject/management/JTop/nbproject/file-targets.xml b/jdk/src/demo/share/nbproject/management/JTop/nbproject/file-targets.xml similarity index 100% rename from jdk/src/share/demo/nbproject/management/JTop/nbproject/file-targets.xml rename to jdk/src/demo/share/nbproject/management/JTop/nbproject/file-targets.xml diff --git a/jdk/src/share/demo/nbproject/management/JTop/nbproject/jdk.xml b/jdk/src/demo/share/nbproject/management/JTop/nbproject/jdk.xml similarity index 100% rename from jdk/src/share/demo/nbproject/management/JTop/nbproject/jdk.xml rename to jdk/src/demo/share/nbproject/management/JTop/nbproject/jdk.xml diff --git a/jdk/src/share/demo/nbproject/management/JTop/nbproject/netbeans-targets.xml b/jdk/src/demo/share/nbproject/management/JTop/nbproject/netbeans-targets.xml similarity index 100% rename from jdk/src/share/demo/nbproject/management/JTop/nbproject/netbeans-targets.xml rename to jdk/src/demo/share/nbproject/management/JTop/nbproject/netbeans-targets.xml diff --git a/jdk/src/share/demo/nbproject/management/JTop/nbproject/project.xml b/jdk/src/demo/share/nbproject/management/JTop/nbproject/project.xml similarity index 100% rename from jdk/src/share/demo/nbproject/management/JTop/nbproject/project.xml rename to jdk/src/demo/share/nbproject/management/JTop/nbproject/project.xml diff --git a/jdk/src/share/demo/nbproject/management/MemoryMonitor/build.properties b/jdk/src/demo/share/nbproject/management/MemoryMonitor/build.properties similarity index 100% rename from jdk/src/share/demo/nbproject/management/MemoryMonitor/build.properties rename to jdk/src/demo/share/nbproject/management/MemoryMonitor/build.properties diff --git a/jdk/src/share/demo/nbproject/management/MemoryMonitor/build.xml b/jdk/src/demo/share/nbproject/management/MemoryMonitor/build.xml similarity index 100% rename from jdk/src/share/demo/nbproject/management/MemoryMonitor/build.xml rename to jdk/src/demo/share/nbproject/management/MemoryMonitor/build.xml diff --git a/jdk/src/share/demo/nbproject/management/MemoryMonitor/nbproject/file-targets.xml b/jdk/src/demo/share/nbproject/management/MemoryMonitor/nbproject/file-targets.xml similarity index 100% rename from jdk/src/share/demo/nbproject/management/MemoryMonitor/nbproject/file-targets.xml rename to jdk/src/demo/share/nbproject/management/MemoryMonitor/nbproject/file-targets.xml diff --git a/jdk/src/share/demo/nbproject/management/MemoryMonitor/nbproject/jdk.xml b/jdk/src/demo/share/nbproject/management/MemoryMonitor/nbproject/jdk.xml similarity index 100% rename from jdk/src/share/demo/nbproject/management/MemoryMonitor/nbproject/jdk.xml rename to jdk/src/demo/share/nbproject/management/MemoryMonitor/nbproject/jdk.xml diff --git a/jdk/src/share/demo/nbproject/management/MemoryMonitor/nbproject/netbeans-targets.xml b/jdk/src/demo/share/nbproject/management/MemoryMonitor/nbproject/netbeans-targets.xml similarity index 100% rename from jdk/src/share/demo/nbproject/management/MemoryMonitor/nbproject/netbeans-targets.xml rename to jdk/src/demo/share/nbproject/management/MemoryMonitor/nbproject/netbeans-targets.xml diff --git a/jdk/src/share/demo/nbproject/management/MemoryMonitor/nbproject/project.xml b/jdk/src/demo/share/nbproject/management/MemoryMonitor/nbproject/project.xml similarity index 100% rename from jdk/src/share/demo/nbproject/management/MemoryMonitor/nbproject/project.xml rename to jdk/src/demo/share/nbproject/management/MemoryMonitor/nbproject/project.xml diff --git a/jdk/src/share/demo/nbproject/management/VerboseGC/build.properties b/jdk/src/demo/share/nbproject/management/VerboseGC/build.properties similarity index 100% rename from jdk/src/share/demo/nbproject/management/VerboseGC/build.properties rename to jdk/src/demo/share/nbproject/management/VerboseGC/build.properties diff --git a/jdk/src/share/demo/nbproject/management/VerboseGC/build.xml b/jdk/src/demo/share/nbproject/management/VerboseGC/build.xml similarity index 100% rename from jdk/src/share/demo/nbproject/management/VerboseGC/build.xml rename to jdk/src/demo/share/nbproject/management/VerboseGC/build.xml diff --git a/jdk/src/share/demo/nbproject/management/VerboseGC/nbproject/file-targets.xml b/jdk/src/demo/share/nbproject/management/VerboseGC/nbproject/file-targets.xml similarity index 100% rename from jdk/src/share/demo/nbproject/management/VerboseGC/nbproject/file-targets.xml rename to jdk/src/demo/share/nbproject/management/VerboseGC/nbproject/file-targets.xml diff --git a/jdk/src/share/demo/nbproject/management/VerboseGC/nbproject/jdk.xml b/jdk/src/demo/share/nbproject/management/VerboseGC/nbproject/jdk.xml similarity index 100% rename from jdk/src/share/demo/nbproject/management/VerboseGC/nbproject/jdk.xml rename to jdk/src/demo/share/nbproject/management/VerboseGC/nbproject/jdk.xml diff --git a/jdk/src/share/demo/nbproject/management/VerboseGC/nbproject/netbeans-targets.xml b/jdk/src/demo/share/nbproject/management/VerboseGC/nbproject/netbeans-targets.xml similarity index 100% rename from jdk/src/share/demo/nbproject/management/VerboseGC/nbproject/netbeans-targets.xml rename to jdk/src/demo/share/nbproject/management/VerboseGC/nbproject/netbeans-targets.xml diff --git a/jdk/src/share/demo/nbproject/management/VerboseGC/nbproject/project.xml b/jdk/src/demo/share/nbproject/management/VerboseGC/nbproject/project.xml similarity index 100% rename from jdk/src/share/demo/nbproject/management/VerboseGC/nbproject/project.xml rename to jdk/src/demo/share/nbproject/management/VerboseGC/nbproject/project.xml diff --git a/jdk/src/share/demo/nbproject/project.xml b/jdk/src/demo/share/nbproject/project.xml similarity index 100% rename from jdk/src/share/demo/nbproject/project.xml rename to jdk/src/demo/share/nbproject/project.xml diff --git a/jdk/src/share/demo/nbproject/scripting/jconsole-plugin/build.properties b/jdk/src/demo/share/nbproject/scripting/jconsole-plugin/build.properties similarity index 100% rename from jdk/src/share/demo/nbproject/scripting/jconsole-plugin/build.properties rename to jdk/src/demo/share/nbproject/scripting/jconsole-plugin/build.properties diff --git a/jdk/src/share/demo/nbproject/scripting/jconsole-plugin/build.xml b/jdk/src/demo/share/nbproject/scripting/jconsole-plugin/build.xml similarity index 100% rename from jdk/src/share/demo/nbproject/scripting/jconsole-plugin/build.xml rename to jdk/src/demo/share/nbproject/scripting/jconsole-plugin/build.xml diff --git a/jdk/src/share/demo/nbproject/scripting/jconsole-plugin/nbproject/file-targets.xml b/jdk/src/demo/share/nbproject/scripting/jconsole-plugin/nbproject/file-targets.xml similarity index 100% rename from jdk/src/share/demo/nbproject/scripting/jconsole-plugin/nbproject/file-targets.xml rename to jdk/src/demo/share/nbproject/scripting/jconsole-plugin/nbproject/file-targets.xml diff --git a/jdk/src/share/demo/nbproject/scripting/jconsole-plugin/nbproject/jdk.xml b/jdk/src/demo/share/nbproject/scripting/jconsole-plugin/nbproject/jdk.xml similarity index 100% rename from jdk/src/share/demo/nbproject/scripting/jconsole-plugin/nbproject/jdk.xml rename to jdk/src/demo/share/nbproject/scripting/jconsole-plugin/nbproject/jdk.xml diff --git a/jdk/src/share/demo/nbproject/scripting/jconsole-plugin/nbproject/netbeans-targets.xml b/jdk/src/demo/share/nbproject/scripting/jconsole-plugin/nbproject/netbeans-targets.xml similarity index 100% rename from jdk/src/share/demo/nbproject/scripting/jconsole-plugin/nbproject/netbeans-targets.xml rename to jdk/src/demo/share/nbproject/scripting/jconsole-plugin/nbproject/netbeans-targets.xml diff --git a/jdk/src/share/demo/nbproject/scripting/jconsole-plugin/nbproject/project.xml b/jdk/src/demo/share/nbproject/scripting/jconsole-plugin/nbproject/project.xml similarity index 100% rename from jdk/src/share/demo/nbproject/scripting/jconsole-plugin/nbproject/project.xml rename to jdk/src/demo/share/nbproject/scripting/jconsole-plugin/nbproject/project.xml diff --git a/jdk/src/share/demo/scripting/jconsole-plugin/README.txt b/jdk/src/demo/share/scripting/jconsole-plugin/README.txt similarity index 100% rename from jdk/src/share/demo/scripting/jconsole-plugin/README.txt rename to jdk/src/demo/share/scripting/jconsole-plugin/README.txt diff --git a/jdk/src/share/demo/scripting/jconsole-plugin/build.xml b/jdk/src/demo/share/scripting/jconsole-plugin/build.xml similarity index 100% rename from jdk/src/share/demo/scripting/jconsole-plugin/build.xml rename to jdk/src/demo/share/scripting/jconsole-plugin/build.xml diff --git a/jdk/src/share/demo/scripting/jconsole-plugin/src/META-INF/services/com.sun.tools.jconsole.JConsolePlugin b/jdk/src/demo/share/scripting/jconsole-plugin/src/META-INF/services/com.sun.tools.jconsole.JConsolePlugin similarity index 100% rename from jdk/src/share/demo/scripting/jconsole-plugin/src/META-INF/services/com.sun.tools.jconsole.JConsolePlugin rename to jdk/src/demo/share/scripting/jconsole-plugin/src/META-INF/services/com.sun.tools.jconsole.JConsolePlugin diff --git a/jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/EditableAtEndDocument.java b/jdk/src/demo/share/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/EditableAtEndDocument.java similarity index 100% rename from jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/EditableAtEndDocument.java rename to jdk/src/demo/share/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/EditableAtEndDocument.java diff --git a/jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptJConsolePlugin.java b/jdk/src/demo/share/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptJConsolePlugin.java similarity index 100% rename from jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptJConsolePlugin.java rename to jdk/src/demo/share/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptJConsolePlugin.java diff --git a/jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptShellPanel.java b/jdk/src/demo/share/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptShellPanel.java similarity index 100% rename from jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptShellPanel.java rename to jdk/src/demo/share/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptShellPanel.java diff --git a/jdk/src/share/demo/scripting/jconsole-plugin/src/resources/jconsole.js b/jdk/src/demo/share/scripting/jconsole-plugin/src/resources/jconsole.js similarity index 100% rename from jdk/src/share/demo/scripting/jconsole-plugin/src/resources/jconsole.js rename to jdk/src/demo/share/scripting/jconsole-plugin/src/resources/jconsole.js diff --git a/jdk/src/share/demo/scripting/jconsole-plugin/src/scripts/heapdump.js b/jdk/src/demo/share/scripting/jconsole-plugin/src/scripts/heapdump.js similarity index 100% rename from jdk/src/share/demo/scripting/jconsole-plugin/src/scripts/heapdump.js rename to jdk/src/demo/share/scripting/jconsole-plugin/src/scripts/heapdump.js diff --git a/jdk/src/share/demo/scripting/jconsole-plugin/src/scripts/hello.js b/jdk/src/demo/share/scripting/jconsole-plugin/src/scripts/hello.js similarity index 100% rename from jdk/src/share/demo/scripting/jconsole-plugin/src/scripts/hello.js rename to jdk/src/demo/share/scripting/jconsole-plugin/src/scripts/hello.js diff --git a/jdk/src/share/demo/scripting/jconsole-plugin/src/scripts/invoke.js b/jdk/src/demo/share/scripting/jconsole-plugin/src/scripts/invoke.js similarity index 100% rename from jdk/src/share/demo/scripting/jconsole-plugin/src/scripts/invoke.js rename to jdk/src/demo/share/scripting/jconsole-plugin/src/scripts/invoke.js diff --git a/jdk/src/share/demo/scripting/jconsole-plugin/src/scripts/jstack.js b/jdk/src/demo/share/scripting/jconsole-plugin/src/scripts/jstack.js similarity index 100% rename from jdk/src/share/demo/scripting/jconsole-plugin/src/scripts/jstack.js rename to jdk/src/demo/share/scripting/jconsole-plugin/src/scripts/jstack.js diff --git a/jdk/src/share/demo/scripting/jconsole-plugin/src/scripts/jtop.js b/jdk/src/demo/share/scripting/jconsole-plugin/src/scripts/jtop.js similarity index 100% rename from jdk/src/share/demo/scripting/jconsole-plugin/src/scripts/jtop.js rename to jdk/src/demo/share/scripting/jconsole-plugin/src/scripts/jtop.js diff --git a/jdk/src/share/demo/scripting/jconsole-plugin/src/scripts/sysprops.js b/jdk/src/demo/share/scripting/jconsole-plugin/src/scripts/sysprops.js similarity index 100% rename from jdk/src/share/demo/scripting/jconsole-plugin/src/scripts/sysprops.js rename to jdk/src/demo/share/scripting/jconsole-plugin/src/scripts/sysprops.js diff --git a/jdk/src/share/demo/scripting/jconsole-plugin/src/scripts/verbose.js b/jdk/src/demo/share/scripting/jconsole-plugin/src/scripts/verbose.js similarity index 100% rename from jdk/src/share/demo/scripting/jconsole-plugin/src/scripts/verbose.js rename to jdk/src/demo/share/scripting/jconsole-plugin/src/scripts/verbose.js diff --git a/jdk/src/solaris/demo/jni/Poller/Client.java b/jdk/src/demo/solaris/jni/Poller/Client.java similarity index 100% rename from jdk/src/solaris/demo/jni/Poller/Client.java rename to jdk/src/demo/solaris/jni/Poller/Client.java diff --git a/jdk/src/solaris/demo/jni/Poller/LinkedQueue.java b/jdk/src/demo/solaris/jni/Poller/LinkedQueue.java similarity index 100% rename from jdk/src/solaris/demo/jni/Poller/LinkedQueue.java rename to jdk/src/demo/solaris/jni/Poller/LinkedQueue.java diff --git a/jdk/src/solaris/demo/jni/Poller/Poller.c b/jdk/src/demo/solaris/jni/Poller/Poller.c similarity index 100% rename from jdk/src/solaris/demo/jni/Poller/Poller.c rename to jdk/src/demo/solaris/jni/Poller/Poller.c diff --git a/jdk/src/solaris/demo/jni/Poller/Poller.java b/jdk/src/demo/solaris/jni/Poller/Poller.java similarity index 100% rename from jdk/src/solaris/demo/jni/Poller/Poller.java rename to jdk/src/demo/solaris/jni/Poller/Poller.java diff --git a/jdk/src/solaris/demo/jni/Poller/PollingServer.java b/jdk/src/demo/solaris/jni/Poller/PollingServer.java similarity index 100% rename from jdk/src/solaris/demo/jni/Poller/PollingServer.java rename to jdk/src/demo/solaris/jni/Poller/PollingServer.java diff --git a/jdk/src/solaris/demo/jni/Poller/README.txt b/jdk/src/demo/solaris/jni/Poller/README.txt similarity index 100% rename from jdk/src/solaris/demo/jni/Poller/README.txt rename to jdk/src/demo/solaris/jni/Poller/README.txt diff --git a/jdk/src/solaris/demo/jni/Poller/SimpleServer.java b/jdk/src/demo/solaris/jni/Poller/SimpleServer.java similarity index 100% rename from jdk/src/solaris/demo/jni/Poller/SimpleServer.java rename to jdk/src/demo/solaris/jni/Poller/SimpleServer.java diff --git a/jdk/src/solaris/demo/jvmti/hprof/hprof_md.c b/jdk/src/demo/unix/jvmti/hprof/hprof_md.c similarity index 100% rename from jdk/src/solaris/demo/jvmti/hprof/hprof_md.c rename to jdk/src/demo/unix/jvmti/hprof/hprof_md.c diff --git a/jdk/src/windows/demo/jvmti/hprof/hprof_md.c b/jdk/src/demo/windows/jvmti/hprof/hprof_md.c similarity index 100% rename from jdk/src/windows/demo/jvmti/hprof/hprof_md.c rename to jdk/src/demo/windows/jvmti/hprof/hprof_md.c diff --git a/jdk/src/aix/classes/sun/nio/ch/AixAsynchronousChannelProvider.java b/jdk/src/java.base/aix/classes/sun/nio/ch/AixAsynchronousChannelProvider.java similarity index 100% rename from jdk/src/aix/classes/sun/nio/ch/AixAsynchronousChannelProvider.java rename to jdk/src/java.base/aix/classes/sun/nio/ch/AixAsynchronousChannelProvider.java diff --git a/jdk/src/aix/classes/sun/nio/ch/AixPollPort.java b/jdk/src/java.base/aix/classes/sun/nio/ch/AixPollPort.java similarity index 100% rename from jdk/src/aix/classes/sun/nio/ch/AixPollPort.java rename to jdk/src/java.base/aix/classes/sun/nio/ch/AixPollPort.java diff --git a/jdk/src/aix/classes/sun/nio/fs/AixFileStore.java b/jdk/src/java.base/aix/classes/sun/nio/fs/AixFileStore.java similarity index 100% rename from jdk/src/aix/classes/sun/nio/fs/AixFileStore.java rename to jdk/src/java.base/aix/classes/sun/nio/fs/AixFileStore.java diff --git a/jdk/src/aix/classes/sun/nio/fs/AixFileSystem.java b/jdk/src/java.base/aix/classes/sun/nio/fs/AixFileSystem.java similarity index 100% rename from jdk/src/aix/classes/sun/nio/fs/AixFileSystem.java rename to jdk/src/java.base/aix/classes/sun/nio/fs/AixFileSystem.java diff --git a/jdk/src/aix/classes/sun/nio/fs/AixFileSystemProvider.java b/jdk/src/java.base/aix/classes/sun/nio/fs/AixFileSystemProvider.java similarity index 100% rename from jdk/src/aix/classes/sun/nio/fs/AixFileSystemProvider.java rename to jdk/src/java.base/aix/classes/sun/nio/fs/AixFileSystemProvider.java diff --git a/jdk/src/aix/classes/sun/nio/fs/AixNativeDispatcher.java b/jdk/src/java.base/aix/classes/sun/nio/fs/AixNativeDispatcher.java similarity index 100% rename from jdk/src/aix/classes/sun/nio/fs/AixNativeDispatcher.java rename to jdk/src/java.base/aix/classes/sun/nio/fs/AixNativeDispatcher.java diff --git a/jdk/src/aix/lib/tzmappings b/jdk/src/java.base/aix/conf/tzmappings similarity index 100% rename from jdk/src/aix/lib/tzmappings rename to jdk/src/java.base/aix/conf/tzmappings diff --git a/jdk/src/aix/native/java/net/aix_close.c b/jdk/src/java.base/aix/native/libnet/java/net/aix_close.c similarity index 100% rename from jdk/src/aix/native/java/net/aix_close.c rename to jdk/src/java.base/aix/native/libnet/java/net/aix_close.c diff --git a/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c b/jdk/src/java.base/aix/native/libnio/ch/AixNativeThread.c similarity index 100% rename from jdk/src/aix/native/sun/nio/ch/AixNativeThread.c rename to jdk/src/java.base/aix/native/libnio/ch/AixNativeThread.c diff --git a/jdk/src/aix/native/sun/nio/ch/AixPollPort.c b/jdk/src/java.base/aix/native/libnio/ch/AixPollPort.c similarity index 100% rename from jdk/src/aix/native/sun/nio/ch/AixPollPort.c rename to jdk/src/java.base/aix/native/libnio/ch/AixPollPort.c diff --git a/jdk/src/aix/native/sun/nio/fs/AixNativeDispatcher.c b/jdk/src/java.base/aix/native/libnio/fs/AixNativeDispatcher.c similarity index 100% rename from jdk/src/aix/native/sun/nio/fs/AixNativeDispatcher.c rename to jdk/src/java.base/aix/native/libnio/fs/AixNativeDispatcher.c diff --git a/jdk/src/solaris/classes/sun/nio/ch/EPoll.java b/jdk/src/java.base/linux/classes/sun/nio/ch/EPoll.java similarity index 100% rename from jdk/src/solaris/classes/sun/nio/ch/EPoll.java rename to jdk/src/java.base/linux/classes/sun/nio/ch/EPoll.java diff --git a/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java b/jdk/src/java.base/linux/classes/sun/nio/ch/EPollArrayWrapper.java similarity index 100% rename from jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java rename to jdk/src/java.base/linux/classes/sun/nio/ch/EPollArrayWrapper.java diff --git a/jdk/src/solaris/classes/sun/nio/ch/EPollPort.java b/jdk/src/java.base/linux/classes/sun/nio/ch/EPollPort.java similarity index 100% rename from jdk/src/solaris/classes/sun/nio/ch/EPollPort.java rename to jdk/src/java.base/linux/classes/sun/nio/ch/EPollPort.java diff --git a/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java b/jdk/src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java similarity index 100% rename from jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java rename to jdk/src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java diff --git a/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorProvider.java b/jdk/src/java.base/linux/classes/sun/nio/ch/EPollSelectorProvider.java similarity index 100% rename from jdk/src/solaris/classes/sun/nio/ch/EPollSelectorProvider.java rename to jdk/src/java.base/linux/classes/sun/nio/ch/EPollSelectorProvider.java diff --git a/jdk/src/solaris/classes/sun/nio/ch/LinuxAsynchronousChannelProvider.java b/jdk/src/java.base/linux/classes/sun/nio/ch/LinuxAsynchronousChannelProvider.java similarity index 100% rename from jdk/src/solaris/classes/sun/nio/ch/LinuxAsynchronousChannelProvider.java rename to jdk/src/java.base/linux/classes/sun/nio/ch/LinuxAsynchronousChannelProvider.java diff --git a/jdk/src/solaris/classes/sun/nio/fs/LinuxDosFileAttributeView.java b/jdk/src/java.base/linux/classes/sun/nio/fs/LinuxDosFileAttributeView.java similarity index 100% rename from jdk/src/solaris/classes/sun/nio/fs/LinuxDosFileAttributeView.java rename to jdk/src/java.base/linux/classes/sun/nio/fs/LinuxDosFileAttributeView.java diff --git a/jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java b/jdk/src/java.base/linux/classes/sun/nio/fs/LinuxFileStore.java similarity index 100% rename from jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java rename to jdk/src/java.base/linux/classes/sun/nio/fs/LinuxFileStore.java diff --git a/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java b/jdk/src/java.base/linux/classes/sun/nio/fs/LinuxFileSystem.java similarity index 100% rename from jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java rename to jdk/src/java.base/linux/classes/sun/nio/fs/LinuxFileSystem.java diff --git a/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystemProvider.java b/jdk/src/java.base/linux/classes/sun/nio/fs/LinuxFileSystemProvider.java similarity index 100% rename from jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystemProvider.java rename to jdk/src/java.base/linux/classes/sun/nio/fs/LinuxFileSystemProvider.java diff --git a/jdk/src/solaris/classes/sun/nio/fs/LinuxNativeDispatcher.java b/jdk/src/java.base/linux/classes/sun/nio/fs/LinuxNativeDispatcher.java similarity index 100% rename from jdk/src/solaris/classes/sun/nio/fs/LinuxNativeDispatcher.java rename to jdk/src/java.base/linux/classes/sun/nio/fs/LinuxNativeDispatcher.java diff --git a/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java b/jdk/src/java.base/linux/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java similarity index 100% rename from jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java rename to jdk/src/java.base/linux/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java diff --git a/jdk/src/solaris/classes/sun/nio/fs/LinuxWatchService.java b/jdk/src/java.base/linux/classes/sun/nio/fs/LinuxWatchService.java similarity index 100% rename from jdk/src/solaris/classes/sun/nio/fs/LinuxWatchService.java rename to jdk/src/java.base/linux/classes/sun/nio/fs/LinuxWatchService.java diff --git a/jdk/src/solaris/classes/sun/nio/fs/MagicFileTypeDetector.java b/jdk/src/java.base/linux/classes/sun/nio/fs/MagicFileTypeDetector.java similarity index 100% rename from jdk/src/solaris/classes/sun/nio/fs/MagicFileTypeDetector.java rename to jdk/src/java.base/linux/classes/sun/nio/fs/MagicFileTypeDetector.java diff --git a/jdk/src/solaris/native/sun/nio/ch/EPoll.c b/jdk/src/java.base/linux/native/libnio/ch/EPoll.c similarity index 100% rename from jdk/src/solaris/native/sun/nio/ch/EPoll.c rename to jdk/src/java.base/linux/native/libnio/ch/EPoll.c diff --git a/jdk/src/solaris/native/sun/nio/ch/EPollArrayWrapper.c b/jdk/src/java.base/linux/native/libnio/ch/EPollArrayWrapper.c similarity index 100% rename from jdk/src/solaris/native/sun/nio/ch/EPollArrayWrapper.c rename to jdk/src/java.base/linux/native/libnio/ch/EPollArrayWrapper.c diff --git a/jdk/src/solaris/native/sun/nio/ch/EPollPort.c b/jdk/src/java.base/linux/native/libnio/ch/EPollPort.c similarity index 100% rename from jdk/src/solaris/native/sun/nio/ch/EPollPort.c rename to jdk/src/java.base/linux/native/libnio/ch/EPollPort.c diff --git a/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c b/jdk/src/java.base/linux/native/libnio/fs/LinuxNativeDispatcher.c similarity index 100% rename from jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c rename to jdk/src/java.base/linux/native/libnio/fs/LinuxNativeDispatcher.c diff --git a/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c b/jdk/src/java.base/linux/native/libnio/fs/LinuxWatchService.c similarity index 100% rename from jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c rename to jdk/src/java.base/linux/native/libnio/fs/LinuxWatchService.c diff --git a/jdk/src/solaris/native/sun/nio/fs/MagicFileTypeDetector.c b/jdk/src/java.base/linux/native/libnio/fs/MagicFileTypeDetector.c similarity index 100% rename from jdk/src/solaris/native/sun/nio/fs/MagicFileTypeDetector.c rename to jdk/src/java.base/linux/native/libnio/fs/MagicFileTypeDetector.c diff --git a/jdk/src/macosx/classes/java/lang/ClassLoaderHelper.java b/jdk/src/java.base/macosx/classes/java/lang/ClassLoaderHelper.java similarity index 100% rename from jdk/src/macosx/classes/java/lang/ClassLoaderHelper.java rename to jdk/src/java.base/macosx/classes/java/lang/ClassLoaderHelper.java diff --git a/jdk/src/macosx/classes/java/net/DefaultInterface.java b/jdk/src/java.base/macosx/classes/java/net/DefaultInterface.java similarity index 100% rename from jdk/src/macosx/classes/java/net/DefaultInterface.java rename to jdk/src/java.base/macosx/classes/java/net/DefaultInterface.java diff --git a/jdk/src/solaris/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java b/jdk/src/java.base/macosx/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java similarity index 100% rename from jdk/src/solaris/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java rename to jdk/src/java.base/macosx/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java diff --git a/jdk/src/macosx/classes/sun/nio/ch/DefaultSelectorProvider.java b/jdk/src/java.base/macosx/classes/sun/nio/ch/DefaultSelectorProvider.java similarity index 100% rename from jdk/src/macosx/classes/sun/nio/ch/DefaultSelectorProvider.java rename to jdk/src/java.base/macosx/classes/sun/nio/ch/DefaultSelectorProvider.java diff --git a/jdk/src/solaris/classes/sun/nio/ch/KQueue.java b/jdk/src/java.base/macosx/classes/sun/nio/ch/KQueue.java similarity index 100% rename from jdk/src/solaris/classes/sun/nio/ch/KQueue.java rename to jdk/src/java.base/macosx/classes/sun/nio/ch/KQueue.java diff --git a/jdk/src/macosx/classes/sun/nio/ch/KQueueArrayWrapper.java b/jdk/src/java.base/macosx/classes/sun/nio/ch/KQueueArrayWrapper.java similarity index 100% rename from jdk/src/macosx/classes/sun/nio/ch/KQueueArrayWrapper.java rename to jdk/src/java.base/macosx/classes/sun/nio/ch/KQueueArrayWrapper.java diff --git a/jdk/src/solaris/classes/sun/nio/ch/KQueuePort.java b/jdk/src/java.base/macosx/classes/sun/nio/ch/KQueuePort.java similarity index 100% rename from jdk/src/solaris/classes/sun/nio/ch/KQueuePort.java rename to jdk/src/java.base/macosx/classes/sun/nio/ch/KQueuePort.java diff --git a/jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java b/jdk/src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java similarity index 100% rename from jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java rename to jdk/src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java diff --git a/jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorProvider.java b/jdk/src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorProvider.java similarity index 100% rename from jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorProvider.java rename to jdk/src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorProvider.java diff --git a/jdk/src/solaris/classes/sun/nio/fs/BsdFileStore.java b/jdk/src/java.base/macosx/classes/sun/nio/fs/BsdFileStore.java similarity index 100% rename from jdk/src/solaris/classes/sun/nio/fs/BsdFileStore.java rename to jdk/src/java.base/macosx/classes/sun/nio/fs/BsdFileStore.java diff --git a/jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java b/jdk/src/java.base/macosx/classes/sun/nio/fs/BsdFileSystem.java similarity index 100% rename from jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java rename to jdk/src/java.base/macosx/classes/sun/nio/fs/BsdFileSystem.java diff --git a/jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java b/jdk/src/java.base/macosx/classes/sun/nio/fs/BsdFileSystemProvider.java similarity index 100% rename from jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java rename to jdk/src/java.base/macosx/classes/sun/nio/fs/BsdFileSystemProvider.java diff --git a/jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java b/jdk/src/java.base/macosx/classes/sun/nio/fs/BsdNativeDispatcher.java similarity index 100% rename from jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java rename to jdk/src/java.base/macosx/classes/sun/nio/fs/BsdNativeDispatcher.java diff --git a/jdk/src/solaris/classes/sun/nio/fs/MacOSXFileSystem.java b/jdk/src/java.base/macosx/classes/sun/nio/fs/MacOSXFileSystem.java similarity index 100% rename from jdk/src/solaris/classes/sun/nio/fs/MacOSXFileSystem.java rename to jdk/src/java.base/macosx/classes/sun/nio/fs/MacOSXFileSystem.java diff --git a/jdk/src/solaris/classes/sun/nio/fs/MacOSXFileSystemProvider.java b/jdk/src/java.base/macosx/classes/sun/nio/fs/MacOSXFileSystemProvider.java similarity index 100% rename from jdk/src/solaris/classes/sun/nio/fs/MacOSXFileSystemProvider.java rename to jdk/src/java.base/macosx/classes/sun/nio/fs/MacOSXFileSystemProvider.java diff --git a/jdk/src/solaris/classes/sun/nio/fs/MacOSXNativeDispatcher.java b/jdk/src/java.base/macosx/classes/sun/nio/fs/MacOSXNativeDispatcher.java similarity index 100% rename from jdk/src/solaris/classes/sun/nio/fs/MacOSXNativeDispatcher.java rename to jdk/src/java.base/macosx/classes/sun/nio/fs/MacOSXNativeDispatcher.java diff --git a/jdk/src/macosx/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java b/jdk/src/java.base/macosx/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java similarity index 100% rename from jdk/src/macosx/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java rename to jdk/src/java.base/macosx/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java diff --git a/jdk/src/macosx/bin/x86_64/jvm.cfg b/jdk/src/java.base/macosx/conf/x86_64/jvm.cfg similarity index 100% rename from jdk/src/macosx/bin/x86_64/jvm.cfg rename to jdk/src/java.base/macosx/conf/x86_64/jvm.cfg diff --git a/jdk/src/macosx/javavm/export/jni_md.h b/jdk/src/java.base/macosx/native/include/jni_md.h similarity index 100% rename from jdk/src/macosx/javavm/export/jni_md.h rename to jdk/src/java.base/macosx/native/include/jni_md.h diff --git a/jdk/src/macosx/javavm/export/jvm_md.h b/jdk/src/java.base/macosx/native/include/jvm_md.h similarity index 100% rename from jdk/src/macosx/javavm/export/jvm_md.h rename to jdk/src/java.base/macosx/native/include/jvm_md.h diff --git a/jdk/src/macosx/lib/Info-cmdline.plist b/jdk/src/java.base/macosx/native/launcher/Info-cmdline.plist similarity index 100% rename from jdk/src/macosx/lib/Info-cmdline.plist rename to jdk/src/java.base/macosx/native/launcher/Info-cmdline.plist diff --git a/jdk/src/macosx/lib/Info-privileged.plist b/jdk/src/java.base/macosx/native/launcher/Info-privileged.plist similarity index 100% rename from jdk/src/macosx/lib/Info-privileged.plist rename to jdk/src/java.base/macosx/native/launcher/Info-privileged.plist diff --git a/jdk/src/macosx/bin/jexec.c b/jdk/src/java.base/macosx/native/launcher/jexec.c similarity index 100% rename from jdk/src/macosx/bin/jexec.c rename to jdk/src/java.base/macosx/native/launcher/jexec.c diff --git a/jdk/src/macosx/native/sun/util/locale/provider/HostLocaleProviderAdapter_md.c b/jdk/src/java.base/macosx/native/libjava/HostLocaleProviderAdapter_md.c similarity index 100% rename from jdk/src/macosx/native/sun/util/locale/provider/HostLocaleProviderAdapter_md.c rename to jdk/src/java.base/macosx/native/libjava/HostLocaleProviderAdapter_md.c diff --git a/jdk/src/macosx/bin/java_md_macosx.c b/jdk/src/java.base/macosx/native/libjli/java_md_macosx.c similarity index 100% rename from jdk/src/macosx/bin/java_md_macosx.c rename to jdk/src/java.base/macosx/native/libjli/java_md_macosx.c diff --git a/jdk/src/macosx/bin/java_md_macosx.h b/jdk/src/java.base/macosx/native/libjli/java_md_macosx.h similarity index 100% rename from jdk/src/macosx/bin/java_md_macosx.h rename to jdk/src/java.base/macosx/native/libjli/java_md_macosx.h diff --git a/jdk/src/solaris/native/sun/nio/ch/KQueue.c b/jdk/src/java.base/macosx/native/libnio/ch/KQueue.c similarity index 100% rename from jdk/src/solaris/native/sun/nio/ch/KQueue.c rename to jdk/src/java.base/macosx/native/libnio/ch/KQueue.c diff --git a/jdk/src/macosx/native/sun/nio/ch/KQueueArrayWrapper.c b/jdk/src/java.base/macosx/native/libnio/ch/KQueueArrayWrapper.c similarity index 100% rename from jdk/src/macosx/native/sun/nio/ch/KQueueArrayWrapper.c rename to jdk/src/java.base/macosx/native/libnio/ch/KQueueArrayWrapper.c diff --git a/jdk/src/solaris/native/sun/nio/ch/KQueuePort.c b/jdk/src/java.base/macosx/native/libnio/ch/KQueuePort.c similarity index 100% rename from jdk/src/solaris/native/sun/nio/ch/KQueuePort.c rename to jdk/src/java.base/macosx/native/libnio/ch/KQueuePort.c diff --git a/jdk/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c b/jdk/src/java.base/macosx/native/libnio/fs/BsdNativeDispatcher.c similarity index 100% rename from jdk/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c rename to jdk/src/java.base/macosx/native/libnio/fs/BsdNativeDispatcher.c diff --git a/jdk/src/solaris/native/sun/nio/fs/MacOSXNativeDispatcher.c b/jdk/src/java.base/macosx/native/libnio/fs/MacOSXNativeDispatcher.c similarity index 100% rename from jdk/src/solaris/native/sun/nio/fs/MacOSXNativeDispatcher.c rename to jdk/src/java.base/macosx/native/libnio/fs/MacOSXNativeDispatcher.c diff --git a/jdk/src/share/classes/com/sun/crypto/provider/AESCipher.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/AESCipher.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/AESCipher.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/AESCipher.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/AESConstants.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/AESConstants.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/AESConstants.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/AESConstants.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/AESCrypt.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/AESCrypt.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/AESCrypt.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/AESCrypt.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/AESKeyGenerator.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/AESKeyGenerator.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/AESKeyGenerator.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/AESKeyGenerator.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/AESParameters.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/AESParameters.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/AESParameters.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/AESParameters.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/AESWrapCipher.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/AESWrapCipher.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/AESWrapCipher.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/AESWrapCipher.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/ARCFOURCipher.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/ARCFOURCipher.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/ARCFOURCipher.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/ARCFOURCipher.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/BlockCipherParamsCore.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/BlockCipherParamsCore.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/BlockCipherParamsCore.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/BlockCipherParamsCore.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/BlowfishCipher.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/BlowfishCipher.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/BlowfishCipher.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/BlowfishCipher.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/BlowfishConstants.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/BlowfishConstants.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/BlowfishConstants.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/BlowfishConstants.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/BlowfishCrypt.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/BlowfishCrypt.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/BlowfishCrypt.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/BlowfishCrypt.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/BlowfishKeyGenerator.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/BlowfishKeyGenerator.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/BlowfishKeyGenerator.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/BlowfishKeyGenerator.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/BlowfishParameters.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/BlowfishParameters.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/BlowfishParameters.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/BlowfishParameters.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/CipherBlockChaining.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/CipherBlockChaining.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/CipherBlockChaining.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/CipherBlockChaining.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/CipherCore.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/CipherCore.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/CipherCore.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/CipherCore.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/CipherFeedback.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/CipherFeedback.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/CipherFeedback.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/CipherFeedback.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/CipherTextStealing.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/CipherTextStealing.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/CipherTextStealing.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/CipherTextStealing.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/CipherWithWrappingSpi.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/CipherWithWrappingSpi.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/CipherWithWrappingSpi.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/CipherWithWrappingSpi.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/ConstructKeys.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/ConstructKeys.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/ConstructKeys.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/ConstructKeys.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/CounterMode.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/CounterMode.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/CounterMode.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/CounterMode.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/DESCipher.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/DESCipher.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/DESCipher.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/DESCipher.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/DESConstants.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/DESConstants.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/DESConstants.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/DESConstants.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/DESCrypt.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/DESCrypt.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/DESCrypt.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/DESCrypt.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/DESKey.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/DESKey.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/DESKey.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/DESKey.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/DESKeyFactory.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/DESKeyFactory.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/DESKeyFactory.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/DESKeyFactory.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/DESKeyGenerator.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/DESKeyGenerator.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/DESKeyGenerator.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/DESKeyGenerator.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/DESParameters.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/DESParameters.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/DESParameters.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/DESParameters.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/DESedeCipher.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/DESedeCipher.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/DESedeCipher.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/DESedeCipher.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/DESedeCrypt.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/DESedeCrypt.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/DESedeCrypt.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/DESedeCrypt.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/DESedeKey.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/DESedeKey.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/DESedeKey.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/DESedeKey.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/DESedeKeyFactory.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/DESedeKeyFactory.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/DESedeKeyFactory.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/DESedeKeyFactory.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/DESedeKeyGenerator.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/DESedeKeyGenerator.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/DESedeKeyGenerator.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/DESedeKeyGenerator.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/DESedeParameters.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/DESedeParameters.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/DESedeParameters.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/DESedeParameters.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/DESedeWrapCipher.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/DESedeWrapCipher.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/DESedeWrapCipher.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/DESedeWrapCipher.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/DHKeyAgreement.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/DHKeyAgreement.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/DHKeyFactory.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/DHKeyFactory.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/DHKeyFactory.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/DHKeyFactory.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/DHKeyPairGenerator.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/DHKeyPairGenerator.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/DHKeyPairGenerator.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/DHKeyPairGenerator.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/DHParameterGenerator.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/DHParameterGenerator.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/DHParameters.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/DHParameters.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/DHParameters.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/DHParameters.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/DHPrivateKey.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/DHPrivateKey.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/DHPrivateKey.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/DHPrivateKey.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/DHPublicKey.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/DHPublicKey.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/DHPublicKey.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/DHPublicKey.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/ElectronicCodeBook.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/ElectronicCodeBook.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/ElectronicCodeBook.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/ElectronicCodeBook.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/EncryptedPrivateKeyInfo.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/EncryptedPrivateKeyInfo.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/EncryptedPrivateKeyInfo.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/EncryptedPrivateKeyInfo.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/FeedbackCipher.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/FeedbackCipher.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/FeedbackCipher.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/FeedbackCipher.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/GCMParameters.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/GCMParameters.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/GCMParameters.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/GCMParameters.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/GCTR.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/GCTR.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/GCTR.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/GCTR.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/GHASH.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/GHASH.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/GHASH.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/GHASH.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/GaloisCounterMode.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/GaloisCounterMode.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/GaloisCounterMode.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/GaloisCounterMode.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/HmacCore.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/HmacCore.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/HmacCore.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/HmacCore.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/HmacMD5.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/HmacMD5.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/HmacMD5.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/HmacMD5.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/HmacMD5KeyGenerator.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/HmacMD5KeyGenerator.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/HmacMD5KeyGenerator.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/HmacMD5KeyGenerator.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/HmacPKCS12PBESHA1.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/HmacPKCS12PBESHA1.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/HmacPKCS12PBESHA1.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/HmacPKCS12PBESHA1.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/HmacSHA1.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/HmacSHA1.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/HmacSHA1.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/HmacSHA1.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/HmacSHA1KeyGenerator.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/HmacSHA1KeyGenerator.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/HmacSHA1KeyGenerator.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/HmacSHA1KeyGenerator.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/ISO10126Padding.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/ISO10126Padding.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/ISO10126Padding.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/ISO10126Padding.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/JceKeyStore.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/JceKeyStore.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/JceKeyStore.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/JceKeyStore.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/KeyGeneratorCore.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/KeyGeneratorCore.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/KeyGeneratorCore.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/KeyGeneratorCore.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/KeyProtector.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/KeyProtector.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/KeyProtector.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/KeyProtector.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/OAEPParameters.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/OAEPParameters.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/OAEPParameters.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/OAEPParameters.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/OutputFeedback.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/OutputFeedback.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/OutputFeedback.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/OutputFeedback.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/PBECipherCore.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/PBECipherCore.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/PBECipherCore.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/PBECipherCore.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/PBEKey.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/PBEKey.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/PBEKey.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/PBEKey.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/PBEKeyFactory.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/PBEKeyFactory.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/PBEKeyFactory.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/PBEKeyFactory.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/PBEParameters.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/PBEParameters.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/PBEParameters.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/PBEParameters.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/PBES1Core.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/PBES1Core.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/PBES1Core.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/PBES1Core.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/PBES2Core.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/PBES2Core.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/PBES2Core.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/PBES2Core.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/PBES2Parameters.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/PBES2Parameters.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/PBES2Parameters.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/PBES2Parameters.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/PBEWithMD5AndDESCipher.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/PBEWithMD5AndDESCipher.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/PBEWithMD5AndDESCipher.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/PBEWithMD5AndDESCipher.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/PBEWithMD5AndTripleDESCipher.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/PBEWithMD5AndTripleDESCipher.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/PBEWithMD5AndTripleDESCipher.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/PBEWithMD5AndTripleDESCipher.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/PBKDF2Core.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2Core.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/PBKDF2Core.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2Core.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/PBKDF2HmacSHA1Factory.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2HmacSHA1Factory.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/PBKDF2HmacSHA1Factory.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2HmacSHA1Factory.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/PBMAC1Core.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/PBMAC1Core.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/PBMAC1Core.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/PBMAC1Core.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/PCBC.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/PCBC.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/PCBC.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/PCBC.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/PKCS12PBECipherCore.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/PKCS12PBECipherCore.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/PKCS12PBECipherCore.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/PKCS12PBECipherCore.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/PKCS5Padding.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/PKCS5Padding.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/PKCS5Padding.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/PKCS5Padding.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/Padding.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/Padding.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/Padding.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/Padding.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/PrivateKeyInfo.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/PrivateKeyInfo.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/PrivateKeyInfo.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/PrivateKeyInfo.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/RC2Cipher.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/RC2Cipher.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/RC2Cipher.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/RC2Cipher.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/RC2Crypt.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/RC2Crypt.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/RC2Crypt.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/RC2Crypt.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/RC2Parameters.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/RC2Parameters.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/RC2Parameters.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/RC2Parameters.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/RSACipher.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/RSACipher.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/RSACipher.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/RSACipher.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/SealedObjectForKeyProtector.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/SealedObjectForKeyProtector.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/SealedObjectForKeyProtector.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/SealedObjectForKeyProtector.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/SslMacCore.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/SslMacCore.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/SslMacCore.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/SslMacCore.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/SunJCE.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/SunJCE.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/SymmetricCipher.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/SymmetricCipher.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/SymmetricCipher.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/SymmetricCipher.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/TlsMasterSecretGenerator.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsMasterSecretGenerator.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/TlsMasterSecretGenerator.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsMasterSecretGenerator.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java diff --git a/jdk/src/share/classes/com/sun/crypto/provider/ai.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/ai.java similarity index 100% rename from jdk/src/share/classes/com/sun/crypto/provider/ai.java rename to jdk/src/java.base/share/classes/com/sun/crypto/provider/ai.java diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/AdaptiveCoding.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/AdaptiveCoding.java similarity index 100% rename from jdk/src/share/classes/com/sun/java/util/jar/pack/AdaptiveCoding.java rename to jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/AdaptiveCoding.java diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Attribute.java similarity index 100% rename from jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java rename to jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Attribute.java diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/BandStructure.java similarity index 100% rename from jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java rename to jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/BandStructure.java diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/ClassReader.java similarity index 100% rename from jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java rename to jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/ClassReader.java diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassWriter.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/ClassWriter.java similarity index 100% rename from jdk/src/share/classes/com/sun/java/util/jar/pack/ClassWriter.java rename to jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/ClassWriter.java diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/Code.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Code.java similarity index 100% rename from jdk/src/share/classes/com/sun/java/util/jar/pack/Code.java rename to jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Code.java diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Coding.java similarity index 100% rename from jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java rename to jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Coding.java diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/CodingChooser.java similarity index 100% rename from jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java rename to jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/CodingChooser.java diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingMethod.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/CodingMethod.java similarity index 100% rename from jdk/src/share/classes/com/sun/java/util/jar/pack/CodingMethod.java rename to jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/CodingMethod.java diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/ConstantPool.java similarity index 100% rename from jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java rename to jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/ConstantPool.java diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/Constants.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Constants.java similarity index 100% rename from jdk/src/share/classes/com/sun/java/util/jar/pack/Constants.java rename to jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Constants.java diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Driver.java similarity index 100% rename from jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java rename to jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Driver.java diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/DriverResource.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/DriverResource.java similarity index 100% rename from jdk/src/share/classes/com/sun/java/util/jar/pack/DriverResource.java rename to jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/DriverResource.java diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/DriverResource_ja.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/DriverResource_ja.java similarity index 100% rename from jdk/src/share/classes/com/sun/java/util/jar/pack/DriverResource_ja.java rename to jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/DriverResource_ja.java diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/DriverResource_zh_CN.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/DriverResource_zh_CN.java similarity index 100% rename from jdk/src/share/classes/com/sun/java/util/jar/pack/DriverResource_zh_CN.java rename to jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/DriverResource_zh_CN.java diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/FixedList.java similarity index 100% rename from jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java rename to jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/FixedList.java diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Fixups.java similarity index 100% rename from jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java rename to jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Fixups.java diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/Histogram.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Histogram.java similarity index 100% rename from jdk/src/share/classes/com/sun/java/util/jar/pack/Histogram.java rename to jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Histogram.java diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/Instruction.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Instruction.java similarity index 100% rename from jdk/src/share/classes/com/sun/java/util/jar/pack/Instruction.java rename to jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Instruction.java diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java similarity index 100% rename from jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java rename to jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Package.java similarity index 100% rename from jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java rename to jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Package.java diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PackageReader.java similarity index 100% rename from jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java rename to jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PackageReader.java diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PackageWriter.java similarity index 100% rename from jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java rename to jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PackageWriter.java diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PackerImpl.java similarity index 100% rename from jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java rename to jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PackerImpl.java diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java similarity index 100% rename from jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java rename to jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PropMap.java similarity index 100% rename from jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java rename to jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PropMap.java diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/TLGlobals.java similarity index 100% rename from jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java rename to jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/TLGlobals.java diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java similarity index 100% rename from jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java rename to jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Utils.java similarity index 100% rename from jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java rename to jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Utils.java diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/intrinsic.properties b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/intrinsic.properties similarity index 100% rename from jdk/src/share/classes/com/sun/java/util/jar/pack/intrinsic.properties rename to jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/intrinsic.properties diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/package.html b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/package.html similarity index 100% rename from jdk/src/share/classes/com/sun/java/util/jar/pack/package.html rename to jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/package.html diff --git a/jdk/src/share/classes/com/sun/net/ssl/HostnameVerifier.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/HostnameVerifier.java similarity index 100% rename from jdk/src/share/classes/com/sun/net/ssl/HostnameVerifier.java rename to jdk/src/java.base/share/classes/com/sun/net/ssl/HostnameVerifier.java diff --git a/jdk/src/share/classes/com/sun/net/ssl/HttpsURLConnection.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/HttpsURLConnection.java similarity index 100% rename from jdk/src/share/classes/com/sun/net/ssl/HttpsURLConnection.java rename to jdk/src/java.base/share/classes/com/sun/net/ssl/HttpsURLConnection.java diff --git a/jdk/src/share/classes/com/sun/net/ssl/KeyManager.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManager.java similarity index 100% rename from jdk/src/share/classes/com/sun/net/ssl/KeyManager.java rename to jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManager.java diff --git a/jdk/src/share/classes/com/sun/net/ssl/KeyManagerFactory.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactory.java similarity index 100% rename from jdk/src/share/classes/com/sun/net/ssl/KeyManagerFactory.java rename to jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactory.java diff --git a/jdk/src/share/classes/com/sun/net/ssl/KeyManagerFactorySpi.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactorySpi.java similarity index 100% rename from jdk/src/share/classes/com/sun/net/ssl/KeyManagerFactorySpi.java rename to jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactorySpi.java diff --git a/jdk/src/share/classes/com/sun/net/ssl/SSLContext.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/SSLContext.java similarity index 100% rename from jdk/src/share/classes/com/sun/net/ssl/SSLContext.java rename to jdk/src/java.base/share/classes/com/sun/net/ssl/SSLContext.java diff --git a/jdk/src/share/classes/com/sun/net/ssl/SSLContextSpi.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/SSLContextSpi.java similarity index 100% rename from jdk/src/share/classes/com/sun/net/ssl/SSLContextSpi.java rename to jdk/src/java.base/share/classes/com/sun/net/ssl/SSLContextSpi.java diff --git a/jdk/src/share/classes/com/sun/net/ssl/SSLPermission.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/SSLPermission.java similarity index 100% rename from jdk/src/share/classes/com/sun/net/ssl/SSLPermission.java rename to jdk/src/java.base/share/classes/com/sun/net/ssl/SSLPermission.java diff --git a/jdk/src/share/classes/com/sun/net/ssl/SSLSecurity.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/SSLSecurity.java similarity index 100% rename from jdk/src/share/classes/com/sun/net/ssl/SSLSecurity.java rename to jdk/src/java.base/share/classes/com/sun/net/ssl/SSLSecurity.java diff --git a/jdk/src/share/classes/com/sun/net/ssl/TrustManager.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManager.java similarity index 100% rename from jdk/src/share/classes/com/sun/net/ssl/TrustManager.java rename to jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManager.java diff --git a/jdk/src/share/classes/com/sun/net/ssl/TrustManagerFactory.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactory.java similarity index 100% rename from jdk/src/share/classes/com/sun/net/ssl/TrustManagerFactory.java rename to jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactory.java diff --git a/jdk/src/share/classes/com/sun/net/ssl/TrustManagerFactorySpi.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactorySpi.java similarity index 100% rename from jdk/src/share/classes/com/sun/net/ssl/TrustManagerFactorySpi.java rename to jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactorySpi.java diff --git a/jdk/src/share/classes/com/sun/net/ssl/X509KeyManager.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/X509KeyManager.java similarity index 100% rename from jdk/src/share/classes/com/sun/net/ssl/X509KeyManager.java rename to jdk/src/java.base/share/classes/com/sun/net/ssl/X509KeyManager.java diff --git a/jdk/src/share/classes/com/sun/net/ssl/X509TrustManager.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/X509TrustManager.java similarity index 100% rename from jdk/src/share/classes/com/sun/net/ssl/X509TrustManager.java rename to jdk/src/java.base/share/classes/com/sun/net/ssl/X509TrustManager.java diff --git a/jdk/src/share/classes/com/sun/net/ssl/internal/ssl/Provider.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/internal/ssl/Provider.java similarity index 100% rename from jdk/src/share/classes/com/sun/net/ssl/internal/ssl/Provider.java rename to jdk/src/java.base/share/classes/com/sun/net/ssl/internal/ssl/Provider.java diff --git a/jdk/src/share/classes/com/sun/net/ssl/internal/ssl/X509ExtendedTrustManager.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/internal/ssl/X509ExtendedTrustManager.java similarity index 100% rename from jdk/src/share/classes/com/sun/net/ssl/internal/ssl/X509ExtendedTrustManager.java rename to jdk/src/java.base/share/classes/com/sun/net/ssl/internal/ssl/X509ExtendedTrustManager.java diff --git a/jdk/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/DelegateHttpsURLConnection.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/DelegateHttpsURLConnection.java similarity index 100% rename from jdk/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/DelegateHttpsURLConnection.java rename to jdk/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/DelegateHttpsURLConnection.java diff --git a/jdk/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/Handler.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/Handler.java similarity index 100% rename from jdk/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/Handler.java rename to jdk/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/Handler.java diff --git a/jdk/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnectionOldImpl.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnectionOldImpl.java similarity index 100% rename from jdk/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnectionOldImpl.java rename to jdk/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnectionOldImpl.java diff --git a/jdk/src/share/classes/com/sun/net/ssl/package.html b/jdk/src/java.base/share/classes/com/sun/net/ssl/package.html similarity index 100% rename from jdk/src/share/classes/com/sun/net/ssl/package.html rename to jdk/src/java.base/share/classes/com/sun/net/ssl/package.html diff --git a/jdk/src/share/classes/com/sun/nio/file/ExtendedCopyOption.java b/jdk/src/java.base/share/classes/com/sun/nio/file/ExtendedCopyOption.java similarity index 100% rename from jdk/src/share/classes/com/sun/nio/file/ExtendedCopyOption.java rename to jdk/src/java.base/share/classes/com/sun/nio/file/ExtendedCopyOption.java diff --git a/jdk/src/share/classes/com/sun/nio/file/ExtendedOpenOption.java b/jdk/src/java.base/share/classes/com/sun/nio/file/ExtendedOpenOption.java similarity index 100% rename from jdk/src/share/classes/com/sun/nio/file/ExtendedOpenOption.java rename to jdk/src/java.base/share/classes/com/sun/nio/file/ExtendedOpenOption.java diff --git a/jdk/src/share/classes/com/sun/nio/file/ExtendedWatchEventModifier.java b/jdk/src/java.base/share/classes/com/sun/nio/file/ExtendedWatchEventModifier.java similarity index 100% rename from jdk/src/share/classes/com/sun/nio/file/ExtendedWatchEventModifier.java rename to jdk/src/java.base/share/classes/com/sun/nio/file/ExtendedWatchEventModifier.java diff --git a/jdk/src/share/classes/com/sun/nio/file/SensitivityWatchEventModifier.java b/jdk/src/java.base/share/classes/com/sun/nio/file/SensitivityWatchEventModifier.java similarity index 100% rename from jdk/src/share/classes/com/sun/nio/file/SensitivityWatchEventModifier.java rename to jdk/src/java.base/share/classes/com/sun/nio/file/SensitivityWatchEventModifier.java diff --git a/jdk/src/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java b/jdk/src/java.base/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java similarity index 100% rename from jdk/src/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java rename to jdk/src/java.base/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java diff --git a/jdk/src/share/classes/com/sun/security/ntlm/Client.java b/jdk/src/java.base/share/classes/com/sun/security/ntlm/Client.java similarity index 100% rename from jdk/src/share/classes/com/sun/security/ntlm/Client.java rename to jdk/src/java.base/share/classes/com/sun/security/ntlm/Client.java diff --git a/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java b/jdk/src/java.base/share/classes/com/sun/security/ntlm/NTLM.java similarity index 100% rename from jdk/src/share/classes/com/sun/security/ntlm/NTLM.java rename to jdk/src/java.base/share/classes/com/sun/security/ntlm/NTLM.java diff --git a/jdk/src/share/classes/com/sun/security/ntlm/NTLMException.java b/jdk/src/java.base/share/classes/com/sun/security/ntlm/NTLMException.java similarity index 100% rename from jdk/src/share/classes/com/sun/security/ntlm/NTLMException.java rename to jdk/src/java.base/share/classes/com/sun/security/ntlm/NTLMException.java diff --git a/jdk/src/share/classes/com/sun/security/ntlm/Server.java b/jdk/src/java.base/share/classes/com/sun/security/ntlm/Server.java similarity index 100% rename from jdk/src/share/classes/com/sun/security/ntlm/Server.java rename to jdk/src/java.base/share/classes/com/sun/security/ntlm/Server.java diff --git a/jdk/src/share/classes/com/sun/security/ntlm/Version.java b/jdk/src/java.base/share/classes/com/sun/security/ntlm/Version.java similarity index 100% rename from jdk/src/share/classes/com/sun/security/ntlm/Version.java rename to jdk/src/java.base/share/classes/com/sun/security/ntlm/Version.java diff --git a/jdk/src/share/classes/java/io/Bits.java b/jdk/src/java.base/share/classes/java/io/Bits.java similarity index 100% rename from jdk/src/share/classes/java/io/Bits.java rename to jdk/src/java.base/share/classes/java/io/Bits.java diff --git a/jdk/src/share/classes/java/io/BufferedInputStream.java b/jdk/src/java.base/share/classes/java/io/BufferedInputStream.java similarity index 100% rename from jdk/src/share/classes/java/io/BufferedInputStream.java rename to jdk/src/java.base/share/classes/java/io/BufferedInputStream.java diff --git a/jdk/src/share/classes/java/io/BufferedOutputStream.java b/jdk/src/java.base/share/classes/java/io/BufferedOutputStream.java similarity index 100% rename from jdk/src/share/classes/java/io/BufferedOutputStream.java rename to jdk/src/java.base/share/classes/java/io/BufferedOutputStream.java diff --git a/jdk/src/share/classes/java/io/BufferedReader.java b/jdk/src/java.base/share/classes/java/io/BufferedReader.java similarity index 100% rename from jdk/src/share/classes/java/io/BufferedReader.java rename to jdk/src/java.base/share/classes/java/io/BufferedReader.java diff --git a/jdk/src/share/classes/java/io/BufferedWriter.java b/jdk/src/java.base/share/classes/java/io/BufferedWriter.java similarity index 100% rename from jdk/src/share/classes/java/io/BufferedWriter.java rename to jdk/src/java.base/share/classes/java/io/BufferedWriter.java diff --git a/jdk/src/share/classes/java/io/ByteArrayInputStream.java b/jdk/src/java.base/share/classes/java/io/ByteArrayInputStream.java similarity index 100% rename from jdk/src/share/classes/java/io/ByteArrayInputStream.java rename to jdk/src/java.base/share/classes/java/io/ByteArrayInputStream.java diff --git a/jdk/src/share/classes/java/io/ByteArrayOutputStream.java b/jdk/src/java.base/share/classes/java/io/ByteArrayOutputStream.java similarity index 100% rename from jdk/src/share/classes/java/io/ByteArrayOutputStream.java rename to jdk/src/java.base/share/classes/java/io/ByteArrayOutputStream.java diff --git a/jdk/src/share/classes/java/io/CharArrayReader.java b/jdk/src/java.base/share/classes/java/io/CharArrayReader.java similarity index 100% rename from jdk/src/share/classes/java/io/CharArrayReader.java rename to jdk/src/java.base/share/classes/java/io/CharArrayReader.java diff --git a/jdk/src/share/classes/java/io/CharArrayWriter.java b/jdk/src/java.base/share/classes/java/io/CharArrayWriter.java similarity index 100% rename from jdk/src/share/classes/java/io/CharArrayWriter.java rename to jdk/src/java.base/share/classes/java/io/CharArrayWriter.java diff --git a/jdk/src/share/classes/java/io/CharConversionException.java b/jdk/src/java.base/share/classes/java/io/CharConversionException.java similarity index 100% rename from jdk/src/share/classes/java/io/CharConversionException.java rename to jdk/src/java.base/share/classes/java/io/CharConversionException.java diff --git a/jdk/src/share/classes/java/io/Closeable.java b/jdk/src/java.base/share/classes/java/io/Closeable.java similarity index 100% rename from jdk/src/share/classes/java/io/Closeable.java rename to jdk/src/java.base/share/classes/java/io/Closeable.java diff --git a/jdk/src/share/classes/java/io/Console.java b/jdk/src/java.base/share/classes/java/io/Console.java similarity index 100% rename from jdk/src/share/classes/java/io/Console.java rename to jdk/src/java.base/share/classes/java/io/Console.java diff --git a/jdk/src/share/classes/java/io/DataInput.java b/jdk/src/java.base/share/classes/java/io/DataInput.java similarity index 100% rename from jdk/src/share/classes/java/io/DataInput.java rename to jdk/src/java.base/share/classes/java/io/DataInput.java diff --git a/jdk/src/share/classes/java/io/DataInputStream.java b/jdk/src/java.base/share/classes/java/io/DataInputStream.java similarity index 100% rename from jdk/src/share/classes/java/io/DataInputStream.java rename to jdk/src/java.base/share/classes/java/io/DataInputStream.java diff --git a/jdk/src/share/classes/java/io/DataOutput.java b/jdk/src/java.base/share/classes/java/io/DataOutput.java similarity index 100% rename from jdk/src/share/classes/java/io/DataOutput.java rename to jdk/src/java.base/share/classes/java/io/DataOutput.java diff --git a/jdk/src/share/classes/java/io/DataOutputStream.java b/jdk/src/java.base/share/classes/java/io/DataOutputStream.java similarity index 100% rename from jdk/src/share/classes/java/io/DataOutputStream.java rename to jdk/src/java.base/share/classes/java/io/DataOutputStream.java diff --git a/jdk/src/share/classes/java/io/DeleteOnExitHook.java b/jdk/src/java.base/share/classes/java/io/DeleteOnExitHook.java similarity index 100% rename from jdk/src/share/classes/java/io/DeleteOnExitHook.java rename to jdk/src/java.base/share/classes/java/io/DeleteOnExitHook.java diff --git a/jdk/src/share/classes/java/io/EOFException.java b/jdk/src/java.base/share/classes/java/io/EOFException.java similarity index 100% rename from jdk/src/share/classes/java/io/EOFException.java rename to jdk/src/java.base/share/classes/java/io/EOFException.java diff --git a/jdk/src/share/classes/java/io/ExpiringCache.java b/jdk/src/java.base/share/classes/java/io/ExpiringCache.java similarity index 100% rename from jdk/src/share/classes/java/io/ExpiringCache.java rename to jdk/src/java.base/share/classes/java/io/ExpiringCache.java diff --git a/jdk/src/share/classes/java/io/Externalizable.java b/jdk/src/java.base/share/classes/java/io/Externalizable.java similarity index 100% rename from jdk/src/share/classes/java/io/Externalizable.java rename to jdk/src/java.base/share/classes/java/io/Externalizable.java diff --git a/jdk/src/share/classes/java/io/File.java b/jdk/src/java.base/share/classes/java/io/File.java similarity index 100% rename from jdk/src/share/classes/java/io/File.java rename to jdk/src/java.base/share/classes/java/io/File.java diff --git a/jdk/src/share/classes/java/io/FileFilter.java b/jdk/src/java.base/share/classes/java/io/FileFilter.java similarity index 100% rename from jdk/src/share/classes/java/io/FileFilter.java rename to jdk/src/java.base/share/classes/java/io/FileFilter.java diff --git a/jdk/src/share/classes/java/io/FileInputStream.java b/jdk/src/java.base/share/classes/java/io/FileInputStream.java similarity index 100% rename from jdk/src/share/classes/java/io/FileInputStream.java rename to jdk/src/java.base/share/classes/java/io/FileInputStream.java diff --git a/jdk/src/share/classes/java/io/FileNotFoundException.java b/jdk/src/java.base/share/classes/java/io/FileNotFoundException.java similarity index 100% rename from jdk/src/share/classes/java/io/FileNotFoundException.java rename to jdk/src/java.base/share/classes/java/io/FileNotFoundException.java diff --git a/jdk/src/share/classes/java/io/FileOutputStream.java b/jdk/src/java.base/share/classes/java/io/FileOutputStream.java similarity index 100% rename from jdk/src/share/classes/java/io/FileOutputStream.java rename to jdk/src/java.base/share/classes/java/io/FileOutputStream.java diff --git a/jdk/src/share/classes/java/io/FilePermission.java b/jdk/src/java.base/share/classes/java/io/FilePermission.java similarity index 100% rename from jdk/src/share/classes/java/io/FilePermission.java rename to jdk/src/java.base/share/classes/java/io/FilePermission.java diff --git a/jdk/src/share/classes/java/io/FileReader.java b/jdk/src/java.base/share/classes/java/io/FileReader.java similarity index 100% rename from jdk/src/share/classes/java/io/FileReader.java rename to jdk/src/java.base/share/classes/java/io/FileReader.java diff --git a/jdk/src/share/classes/java/io/FileSystem.java b/jdk/src/java.base/share/classes/java/io/FileSystem.java similarity index 100% rename from jdk/src/share/classes/java/io/FileSystem.java rename to jdk/src/java.base/share/classes/java/io/FileSystem.java diff --git a/jdk/src/share/classes/java/io/FileWriter.java b/jdk/src/java.base/share/classes/java/io/FileWriter.java similarity index 100% rename from jdk/src/share/classes/java/io/FileWriter.java rename to jdk/src/java.base/share/classes/java/io/FileWriter.java diff --git a/jdk/src/share/classes/java/io/FilenameFilter.java b/jdk/src/java.base/share/classes/java/io/FilenameFilter.java similarity index 100% rename from jdk/src/share/classes/java/io/FilenameFilter.java rename to jdk/src/java.base/share/classes/java/io/FilenameFilter.java diff --git a/jdk/src/share/classes/java/io/FilterInputStream.java b/jdk/src/java.base/share/classes/java/io/FilterInputStream.java similarity index 100% rename from jdk/src/share/classes/java/io/FilterInputStream.java rename to jdk/src/java.base/share/classes/java/io/FilterInputStream.java diff --git a/jdk/src/share/classes/java/io/FilterOutputStream.java b/jdk/src/java.base/share/classes/java/io/FilterOutputStream.java similarity index 100% rename from jdk/src/share/classes/java/io/FilterOutputStream.java rename to jdk/src/java.base/share/classes/java/io/FilterOutputStream.java diff --git a/jdk/src/share/classes/java/io/FilterReader.java b/jdk/src/java.base/share/classes/java/io/FilterReader.java similarity index 100% rename from jdk/src/share/classes/java/io/FilterReader.java rename to jdk/src/java.base/share/classes/java/io/FilterReader.java diff --git a/jdk/src/share/classes/java/io/FilterWriter.java b/jdk/src/java.base/share/classes/java/io/FilterWriter.java similarity index 100% rename from jdk/src/share/classes/java/io/FilterWriter.java rename to jdk/src/java.base/share/classes/java/io/FilterWriter.java diff --git a/jdk/src/share/classes/java/io/Flushable.java b/jdk/src/java.base/share/classes/java/io/Flushable.java similarity index 100% rename from jdk/src/share/classes/java/io/Flushable.java rename to jdk/src/java.base/share/classes/java/io/Flushable.java diff --git a/jdk/src/share/classes/java/io/IOError.java b/jdk/src/java.base/share/classes/java/io/IOError.java similarity index 100% rename from jdk/src/share/classes/java/io/IOError.java rename to jdk/src/java.base/share/classes/java/io/IOError.java diff --git a/jdk/src/share/classes/java/io/IOException.java b/jdk/src/java.base/share/classes/java/io/IOException.java similarity index 100% rename from jdk/src/share/classes/java/io/IOException.java rename to jdk/src/java.base/share/classes/java/io/IOException.java diff --git a/jdk/src/share/classes/java/io/InputStream.java b/jdk/src/java.base/share/classes/java/io/InputStream.java similarity index 100% rename from jdk/src/share/classes/java/io/InputStream.java rename to jdk/src/java.base/share/classes/java/io/InputStream.java diff --git a/jdk/src/share/classes/java/io/InputStreamReader.java b/jdk/src/java.base/share/classes/java/io/InputStreamReader.java similarity index 100% rename from jdk/src/share/classes/java/io/InputStreamReader.java rename to jdk/src/java.base/share/classes/java/io/InputStreamReader.java diff --git a/jdk/src/share/classes/java/io/InterruptedIOException.java b/jdk/src/java.base/share/classes/java/io/InterruptedIOException.java similarity index 100% rename from jdk/src/share/classes/java/io/InterruptedIOException.java rename to jdk/src/java.base/share/classes/java/io/InterruptedIOException.java diff --git a/jdk/src/share/classes/java/io/InvalidClassException.java b/jdk/src/java.base/share/classes/java/io/InvalidClassException.java similarity index 100% rename from jdk/src/share/classes/java/io/InvalidClassException.java rename to jdk/src/java.base/share/classes/java/io/InvalidClassException.java diff --git a/jdk/src/share/classes/java/io/InvalidObjectException.java b/jdk/src/java.base/share/classes/java/io/InvalidObjectException.java similarity index 100% rename from jdk/src/share/classes/java/io/InvalidObjectException.java rename to jdk/src/java.base/share/classes/java/io/InvalidObjectException.java diff --git a/jdk/src/share/classes/java/io/LineNumberInputStream.java b/jdk/src/java.base/share/classes/java/io/LineNumberInputStream.java similarity index 100% rename from jdk/src/share/classes/java/io/LineNumberInputStream.java rename to jdk/src/java.base/share/classes/java/io/LineNumberInputStream.java diff --git a/jdk/src/share/classes/java/io/LineNumberReader.java b/jdk/src/java.base/share/classes/java/io/LineNumberReader.java similarity index 100% rename from jdk/src/share/classes/java/io/LineNumberReader.java rename to jdk/src/java.base/share/classes/java/io/LineNumberReader.java diff --git a/jdk/src/share/classes/java/io/NotActiveException.java b/jdk/src/java.base/share/classes/java/io/NotActiveException.java similarity index 100% rename from jdk/src/share/classes/java/io/NotActiveException.java rename to jdk/src/java.base/share/classes/java/io/NotActiveException.java diff --git a/jdk/src/share/classes/java/io/NotSerializableException.java b/jdk/src/java.base/share/classes/java/io/NotSerializableException.java similarity index 100% rename from jdk/src/share/classes/java/io/NotSerializableException.java rename to jdk/src/java.base/share/classes/java/io/NotSerializableException.java diff --git a/jdk/src/share/classes/java/io/ObjectInput.java b/jdk/src/java.base/share/classes/java/io/ObjectInput.java similarity index 100% rename from jdk/src/share/classes/java/io/ObjectInput.java rename to jdk/src/java.base/share/classes/java/io/ObjectInput.java diff --git a/jdk/src/share/classes/java/io/ObjectInputStream.java b/jdk/src/java.base/share/classes/java/io/ObjectInputStream.java similarity index 100% rename from jdk/src/share/classes/java/io/ObjectInputStream.java rename to jdk/src/java.base/share/classes/java/io/ObjectInputStream.java diff --git a/jdk/src/share/classes/java/io/ObjectInputValidation.java b/jdk/src/java.base/share/classes/java/io/ObjectInputValidation.java similarity index 100% rename from jdk/src/share/classes/java/io/ObjectInputValidation.java rename to jdk/src/java.base/share/classes/java/io/ObjectInputValidation.java diff --git a/jdk/src/share/classes/java/io/ObjectOutput.java b/jdk/src/java.base/share/classes/java/io/ObjectOutput.java similarity index 100% rename from jdk/src/share/classes/java/io/ObjectOutput.java rename to jdk/src/java.base/share/classes/java/io/ObjectOutput.java diff --git a/jdk/src/share/classes/java/io/ObjectOutputStream.java b/jdk/src/java.base/share/classes/java/io/ObjectOutputStream.java similarity index 100% rename from jdk/src/share/classes/java/io/ObjectOutputStream.java rename to jdk/src/java.base/share/classes/java/io/ObjectOutputStream.java diff --git a/jdk/src/share/classes/java/io/ObjectStreamClass.java b/jdk/src/java.base/share/classes/java/io/ObjectStreamClass.java similarity index 100% rename from jdk/src/share/classes/java/io/ObjectStreamClass.java rename to jdk/src/java.base/share/classes/java/io/ObjectStreamClass.java diff --git a/jdk/src/share/classes/java/io/ObjectStreamConstants.java b/jdk/src/java.base/share/classes/java/io/ObjectStreamConstants.java similarity index 100% rename from jdk/src/share/classes/java/io/ObjectStreamConstants.java rename to jdk/src/java.base/share/classes/java/io/ObjectStreamConstants.java diff --git a/jdk/src/share/classes/java/io/ObjectStreamException.java b/jdk/src/java.base/share/classes/java/io/ObjectStreamException.java similarity index 100% rename from jdk/src/share/classes/java/io/ObjectStreamException.java rename to jdk/src/java.base/share/classes/java/io/ObjectStreamException.java diff --git a/jdk/src/share/classes/java/io/ObjectStreamField.java b/jdk/src/java.base/share/classes/java/io/ObjectStreamField.java similarity index 100% rename from jdk/src/share/classes/java/io/ObjectStreamField.java rename to jdk/src/java.base/share/classes/java/io/ObjectStreamField.java diff --git a/jdk/src/share/classes/java/io/OptionalDataException.java b/jdk/src/java.base/share/classes/java/io/OptionalDataException.java similarity index 100% rename from jdk/src/share/classes/java/io/OptionalDataException.java rename to jdk/src/java.base/share/classes/java/io/OptionalDataException.java diff --git a/jdk/src/share/classes/java/io/OutputStream.java b/jdk/src/java.base/share/classes/java/io/OutputStream.java similarity index 100% rename from jdk/src/share/classes/java/io/OutputStream.java rename to jdk/src/java.base/share/classes/java/io/OutputStream.java diff --git a/jdk/src/share/classes/java/io/OutputStreamWriter.java b/jdk/src/java.base/share/classes/java/io/OutputStreamWriter.java similarity index 100% rename from jdk/src/share/classes/java/io/OutputStreamWriter.java rename to jdk/src/java.base/share/classes/java/io/OutputStreamWriter.java diff --git a/jdk/src/share/classes/java/io/PipedInputStream.java b/jdk/src/java.base/share/classes/java/io/PipedInputStream.java similarity index 100% rename from jdk/src/share/classes/java/io/PipedInputStream.java rename to jdk/src/java.base/share/classes/java/io/PipedInputStream.java diff --git a/jdk/src/share/classes/java/io/PipedOutputStream.java b/jdk/src/java.base/share/classes/java/io/PipedOutputStream.java similarity index 100% rename from jdk/src/share/classes/java/io/PipedOutputStream.java rename to jdk/src/java.base/share/classes/java/io/PipedOutputStream.java diff --git a/jdk/src/share/classes/java/io/PipedReader.java b/jdk/src/java.base/share/classes/java/io/PipedReader.java similarity index 100% rename from jdk/src/share/classes/java/io/PipedReader.java rename to jdk/src/java.base/share/classes/java/io/PipedReader.java diff --git a/jdk/src/share/classes/java/io/PipedWriter.java b/jdk/src/java.base/share/classes/java/io/PipedWriter.java similarity index 100% rename from jdk/src/share/classes/java/io/PipedWriter.java rename to jdk/src/java.base/share/classes/java/io/PipedWriter.java diff --git a/jdk/src/share/classes/java/io/PrintStream.java b/jdk/src/java.base/share/classes/java/io/PrintStream.java similarity index 100% rename from jdk/src/share/classes/java/io/PrintStream.java rename to jdk/src/java.base/share/classes/java/io/PrintStream.java diff --git a/jdk/src/share/classes/java/io/PrintWriter.java b/jdk/src/java.base/share/classes/java/io/PrintWriter.java similarity index 100% rename from jdk/src/share/classes/java/io/PrintWriter.java rename to jdk/src/java.base/share/classes/java/io/PrintWriter.java diff --git a/jdk/src/share/classes/java/io/PushbackInputStream.java b/jdk/src/java.base/share/classes/java/io/PushbackInputStream.java similarity index 100% rename from jdk/src/share/classes/java/io/PushbackInputStream.java rename to jdk/src/java.base/share/classes/java/io/PushbackInputStream.java diff --git a/jdk/src/share/classes/java/io/PushbackReader.java b/jdk/src/java.base/share/classes/java/io/PushbackReader.java similarity index 100% rename from jdk/src/share/classes/java/io/PushbackReader.java rename to jdk/src/java.base/share/classes/java/io/PushbackReader.java diff --git a/jdk/src/share/classes/java/io/RandomAccessFile.java b/jdk/src/java.base/share/classes/java/io/RandomAccessFile.java similarity index 100% rename from jdk/src/share/classes/java/io/RandomAccessFile.java rename to jdk/src/java.base/share/classes/java/io/RandomAccessFile.java diff --git a/jdk/src/share/classes/java/io/Reader.java b/jdk/src/java.base/share/classes/java/io/Reader.java similarity index 100% rename from jdk/src/share/classes/java/io/Reader.java rename to jdk/src/java.base/share/classes/java/io/Reader.java diff --git a/jdk/src/share/classes/java/io/SequenceInputStream.java b/jdk/src/java.base/share/classes/java/io/SequenceInputStream.java similarity index 100% rename from jdk/src/share/classes/java/io/SequenceInputStream.java rename to jdk/src/java.base/share/classes/java/io/SequenceInputStream.java diff --git a/jdk/src/share/classes/java/io/SerialCallbackContext.java b/jdk/src/java.base/share/classes/java/io/SerialCallbackContext.java similarity index 100% rename from jdk/src/share/classes/java/io/SerialCallbackContext.java rename to jdk/src/java.base/share/classes/java/io/SerialCallbackContext.java diff --git a/jdk/src/share/classes/java/io/Serializable.java b/jdk/src/java.base/share/classes/java/io/Serializable.java similarity index 100% rename from jdk/src/share/classes/java/io/Serializable.java rename to jdk/src/java.base/share/classes/java/io/Serializable.java diff --git a/jdk/src/share/classes/java/io/SerializablePermission.java b/jdk/src/java.base/share/classes/java/io/SerializablePermission.java similarity index 100% rename from jdk/src/share/classes/java/io/SerializablePermission.java rename to jdk/src/java.base/share/classes/java/io/SerializablePermission.java diff --git a/jdk/src/share/classes/java/io/StreamCorruptedException.java b/jdk/src/java.base/share/classes/java/io/StreamCorruptedException.java similarity index 100% rename from jdk/src/share/classes/java/io/StreamCorruptedException.java rename to jdk/src/java.base/share/classes/java/io/StreamCorruptedException.java diff --git a/jdk/src/share/classes/java/io/StreamTokenizer.java b/jdk/src/java.base/share/classes/java/io/StreamTokenizer.java similarity index 100% rename from jdk/src/share/classes/java/io/StreamTokenizer.java rename to jdk/src/java.base/share/classes/java/io/StreamTokenizer.java diff --git a/jdk/src/share/classes/java/io/StringBufferInputStream.java b/jdk/src/java.base/share/classes/java/io/StringBufferInputStream.java similarity index 100% rename from jdk/src/share/classes/java/io/StringBufferInputStream.java rename to jdk/src/java.base/share/classes/java/io/StringBufferInputStream.java diff --git a/jdk/src/share/classes/java/io/StringReader.java b/jdk/src/java.base/share/classes/java/io/StringReader.java similarity index 100% rename from jdk/src/share/classes/java/io/StringReader.java rename to jdk/src/java.base/share/classes/java/io/StringReader.java diff --git a/jdk/src/share/classes/java/io/StringWriter.java b/jdk/src/java.base/share/classes/java/io/StringWriter.java similarity index 100% rename from jdk/src/share/classes/java/io/StringWriter.java rename to jdk/src/java.base/share/classes/java/io/StringWriter.java diff --git a/jdk/src/share/classes/java/io/SyncFailedException.java b/jdk/src/java.base/share/classes/java/io/SyncFailedException.java similarity index 100% rename from jdk/src/share/classes/java/io/SyncFailedException.java rename to jdk/src/java.base/share/classes/java/io/SyncFailedException.java diff --git a/jdk/src/share/classes/java/io/UTFDataFormatException.java b/jdk/src/java.base/share/classes/java/io/UTFDataFormatException.java similarity index 100% rename from jdk/src/share/classes/java/io/UTFDataFormatException.java rename to jdk/src/java.base/share/classes/java/io/UTFDataFormatException.java diff --git a/jdk/src/share/classes/java/io/UncheckedIOException.java b/jdk/src/java.base/share/classes/java/io/UncheckedIOException.java similarity index 100% rename from jdk/src/share/classes/java/io/UncheckedIOException.java rename to jdk/src/java.base/share/classes/java/io/UncheckedIOException.java diff --git a/jdk/src/share/classes/java/io/UnsupportedEncodingException.java b/jdk/src/java.base/share/classes/java/io/UnsupportedEncodingException.java similarity index 100% rename from jdk/src/share/classes/java/io/UnsupportedEncodingException.java rename to jdk/src/java.base/share/classes/java/io/UnsupportedEncodingException.java diff --git a/jdk/src/share/classes/java/io/WriteAbortedException.java b/jdk/src/java.base/share/classes/java/io/WriteAbortedException.java similarity index 100% rename from jdk/src/share/classes/java/io/WriteAbortedException.java rename to jdk/src/java.base/share/classes/java/io/WriteAbortedException.java diff --git a/jdk/src/share/classes/java/io/Writer.java b/jdk/src/java.base/share/classes/java/io/Writer.java similarity index 100% rename from jdk/src/share/classes/java/io/Writer.java rename to jdk/src/java.base/share/classes/java/io/Writer.java diff --git a/jdk/src/share/classes/java/io/package.html b/jdk/src/java.base/share/classes/java/io/package.html similarity index 100% rename from jdk/src/share/classes/java/io/package.html rename to jdk/src/java.base/share/classes/java/io/package.html diff --git a/jdk/src/share/classes/java/lang/AbstractMethodError.java b/jdk/src/java.base/share/classes/java/lang/AbstractMethodError.java similarity index 100% rename from jdk/src/share/classes/java/lang/AbstractMethodError.java rename to jdk/src/java.base/share/classes/java/lang/AbstractMethodError.java diff --git a/jdk/src/share/classes/java/lang/AbstractStringBuilder.java b/jdk/src/java.base/share/classes/java/lang/AbstractStringBuilder.java similarity index 100% rename from jdk/src/share/classes/java/lang/AbstractStringBuilder.java rename to jdk/src/java.base/share/classes/java/lang/AbstractStringBuilder.java diff --git a/jdk/src/share/classes/java/lang/Appendable.java b/jdk/src/java.base/share/classes/java/lang/Appendable.java similarity index 100% rename from jdk/src/share/classes/java/lang/Appendable.java rename to jdk/src/java.base/share/classes/java/lang/Appendable.java diff --git a/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java b/jdk/src/java.base/share/classes/java/lang/ApplicationShutdownHooks.java similarity index 100% rename from jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java rename to jdk/src/java.base/share/classes/java/lang/ApplicationShutdownHooks.java diff --git a/jdk/src/share/classes/java/lang/ArithmeticException.java b/jdk/src/java.base/share/classes/java/lang/ArithmeticException.java similarity index 100% rename from jdk/src/share/classes/java/lang/ArithmeticException.java rename to jdk/src/java.base/share/classes/java/lang/ArithmeticException.java diff --git a/jdk/src/share/classes/java/lang/ArrayIndexOutOfBoundsException.java b/jdk/src/java.base/share/classes/java/lang/ArrayIndexOutOfBoundsException.java similarity index 100% rename from jdk/src/share/classes/java/lang/ArrayIndexOutOfBoundsException.java rename to jdk/src/java.base/share/classes/java/lang/ArrayIndexOutOfBoundsException.java diff --git a/jdk/src/share/classes/java/lang/ArrayStoreException.java b/jdk/src/java.base/share/classes/java/lang/ArrayStoreException.java similarity index 100% rename from jdk/src/share/classes/java/lang/ArrayStoreException.java rename to jdk/src/java.base/share/classes/java/lang/ArrayStoreException.java diff --git a/jdk/src/share/classes/java/lang/AssertionError.java b/jdk/src/java.base/share/classes/java/lang/AssertionError.java similarity index 100% rename from jdk/src/share/classes/java/lang/AssertionError.java rename to jdk/src/java.base/share/classes/java/lang/AssertionError.java diff --git a/jdk/src/share/classes/java/lang/AssertionStatusDirectives.java b/jdk/src/java.base/share/classes/java/lang/AssertionStatusDirectives.java similarity index 100% rename from jdk/src/share/classes/java/lang/AssertionStatusDirectives.java rename to jdk/src/java.base/share/classes/java/lang/AssertionStatusDirectives.java diff --git a/jdk/src/share/classes/java/lang/AutoCloseable.java b/jdk/src/java.base/share/classes/java/lang/AutoCloseable.java similarity index 100% rename from jdk/src/share/classes/java/lang/AutoCloseable.java rename to jdk/src/java.base/share/classes/java/lang/AutoCloseable.java diff --git a/jdk/src/share/classes/java/lang/Boolean.java b/jdk/src/java.base/share/classes/java/lang/Boolean.java similarity index 100% rename from jdk/src/share/classes/java/lang/Boolean.java rename to jdk/src/java.base/share/classes/java/lang/Boolean.java diff --git a/jdk/src/share/classes/java/lang/BootstrapMethodError.java b/jdk/src/java.base/share/classes/java/lang/BootstrapMethodError.java similarity index 100% rename from jdk/src/share/classes/java/lang/BootstrapMethodError.java rename to jdk/src/java.base/share/classes/java/lang/BootstrapMethodError.java diff --git a/jdk/src/share/classes/java/lang/Byte.java b/jdk/src/java.base/share/classes/java/lang/Byte.java similarity index 100% rename from jdk/src/share/classes/java/lang/Byte.java rename to jdk/src/java.base/share/classes/java/lang/Byte.java diff --git a/jdk/src/share/classes/java/lang/CharSequence.java b/jdk/src/java.base/share/classes/java/lang/CharSequence.java similarity index 100% rename from jdk/src/share/classes/java/lang/CharSequence.java rename to jdk/src/java.base/share/classes/java/lang/CharSequence.java diff --git a/jdk/src/share/classes/java/lang/Character.java b/jdk/src/java.base/share/classes/java/lang/Character.java similarity index 100% rename from jdk/src/share/classes/java/lang/Character.java rename to jdk/src/java.base/share/classes/java/lang/Character.java diff --git a/jdk/src/share/classes/java/lang/CharacterData.java b/jdk/src/java.base/share/classes/java/lang/CharacterData.java similarity index 100% rename from jdk/src/share/classes/java/lang/CharacterData.java rename to jdk/src/java.base/share/classes/java/lang/CharacterData.java diff --git a/jdk/src/share/classes/java/lang/CharacterName.java b/jdk/src/java.base/share/classes/java/lang/CharacterName.java similarity index 100% rename from jdk/src/share/classes/java/lang/CharacterName.java rename to jdk/src/java.base/share/classes/java/lang/CharacterName.java diff --git a/jdk/src/share/classes/java/lang/Class.java b/jdk/src/java.base/share/classes/java/lang/Class.java similarity index 99% rename from jdk/src/share/classes/java/lang/Class.java rename to jdk/src/java.base/share/classes/java/lang/Class.java index cd26ab11791..1afbf5ea710 100644 --- a/jdk/src/share/classes/java/lang/Class.java +++ b/jdk/src/java.base/share/classes/java/lang/Class.java @@ -1322,7 +1322,7 @@ public final class Class implements java.io.Serializable, // (for anonymous classes): 1 or more digits. // Since getSimpleBinaryName() will strip the binary name of - // the immediatly enclosing class, we are now looking at a + // the immediately enclosing class, we are now looking at a // string that matches the regular expression "\$[0-9]*" // followed by a simple name (considering the simple of an // anonymous class to be the empty string). diff --git a/jdk/src/share/classes/java/lang/ClassCastException.java b/jdk/src/java.base/share/classes/java/lang/ClassCastException.java similarity index 100% rename from jdk/src/share/classes/java/lang/ClassCastException.java rename to jdk/src/java.base/share/classes/java/lang/ClassCastException.java diff --git a/jdk/src/share/classes/java/lang/ClassCircularityError.java b/jdk/src/java.base/share/classes/java/lang/ClassCircularityError.java similarity index 100% rename from jdk/src/share/classes/java/lang/ClassCircularityError.java rename to jdk/src/java.base/share/classes/java/lang/ClassCircularityError.java diff --git a/jdk/src/share/classes/java/lang/ClassFormatError.java b/jdk/src/java.base/share/classes/java/lang/ClassFormatError.java similarity index 100% rename from jdk/src/share/classes/java/lang/ClassFormatError.java rename to jdk/src/java.base/share/classes/java/lang/ClassFormatError.java diff --git a/jdk/src/share/classes/java/lang/ClassLoader.java b/jdk/src/java.base/share/classes/java/lang/ClassLoader.java similarity index 99% rename from jdk/src/share/classes/java/lang/ClassLoader.java rename to jdk/src/java.base/share/classes/java/lang/ClassLoader.java index 1652d6cc4eb..1def66a146b 100644 --- a/jdk/src/share/classes/java/lang/ClassLoader.java +++ b/jdk/src/java.base/share/classes/java/lang/ClassLoader.java @@ -205,7 +205,7 @@ public abstract class ClassLoader { } /** - * Registers the given class loader type as parallel capabale. + * Registers the given class loader type as parallel capable. * Returns {@code true} is successfully registered; {@code false} if * loader's super class is not registered. */ @@ -832,7 +832,7 @@ public abstract class ClassLoader { { int len = b.remaining(); - // Use byte[] if not a direct ByteBufer: + // Use byte[] if not a direct ByteBuffer: if (!b.isDirect()) { if (b.hasArray()) { return defineClass(name, b.array(), diff --git a/jdk/src/share/classes/java/lang/ClassNotFoundException.java b/jdk/src/java.base/share/classes/java/lang/ClassNotFoundException.java similarity index 100% rename from jdk/src/share/classes/java/lang/ClassNotFoundException.java rename to jdk/src/java.base/share/classes/java/lang/ClassNotFoundException.java diff --git a/jdk/src/share/classes/java/lang/ClassValue.java b/jdk/src/java.base/share/classes/java/lang/ClassValue.java similarity index 100% rename from jdk/src/share/classes/java/lang/ClassValue.java rename to jdk/src/java.base/share/classes/java/lang/ClassValue.java diff --git a/jdk/src/share/classes/java/lang/CloneNotSupportedException.java b/jdk/src/java.base/share/classes/java/lang/CloneNotSupportedException.java similarity index 100% rename from jdk/src/share/classes/java/lang/CloneNotSupportedException.java rename to jdk/src/java.base/share/classes/java/lang/CloneNotSupportedException.java diff --git a/jdk/src/share/classes/java/lang/Cloneable.java b/jdk/src/java.base/share/classes/java/lang/Cloneable.java similarity index 100% rename from jdk/src/share/classes/java/lang/Cloneable.java rename to jdk/src/java.base/share/classes/java/lang/Cloneable.java diff --git a/jdk/src/share/classes/java/lang/Comparable.java b/jdk/src/java.base/share/classes/java/lang/Comparable.java similarity index 100% rename from jdk/src/share/classes/java/lang/Comparable.java rename to jdk/src/java.base/share/classes/java/lang/Comparable.java diff --git a/jdk/src/share/classes/java/lang/Compiler.java b/jdk/src/java.base/share/classes/java/lang/Compiler.java similarity index 100% rename from jdk/src/share/classes/java/lang/Compiler.java rename to jdk/src/java.base/share/classes/java/lang/Compiler.java diff --git a/jdk/src/share/classes/java/lang/ConditionalSpecialCasing.java b/jdk/src/java.base/share/classes/java/lang/ConditionalSpecialCasing.java similarity index 100% rename from jdk/src/share/classes/java/lang/ConditionalSpecialCasing.java rename to jdk/src/java.base/share/classes/java/lang/ConditionalSpecialCasing.java diff --git a/jdk/src/share/classes/java/lang/Deprecated.java b/jdk/src/java.base/share/classes/java/lang/Deprecated.java similarity index 100% rename from jdk/src/share/classes/java/lang/Deprecated.java rename to jdk/src/java.base/share/classes/java/lang/Deprecated.java diff --git a/jdk/src/share/classes/java/lang/Double.java b/jdk/src/java.base/share/classes/java/lang/Double.java similarity index 100% rename from jdk/src/share/classes/java/lang/Double.java rename to jdk/src/java.base/share/classes/java/lang/Double.java diff --git a/jdk/src/share/classes/java/lang/Enum.java b/jdk/src/java.base/share/classes/java/lang/Enum.java similarity index 100% rename from jdk/src/share/classes/java/lang/Enum.java rename to jdk/src/java.base/share/classes/java/lang/Enum.java diff --git a/jdk/src/share/classes/java/lang/EnumConstantNotPresentException.java b/jdk/src/java.base/share/classes/java/lang/EnumConstantNotPresentException.java similarity index 100% rename from jdk/src/share/classes/java/lang/EnumConstantNotPresentException.java rename to jdk/src/java.base/share/classes/java/lang/EnumConstantNotPresentException.java diff --git a/jdk/src/share/classes/java/lang/Error.java b/jdk/src/java.base/share/classes/java/lang/Error.java similarity index 100% rename from jdk/src/share/classes/java/lang/Error.java rename to jdk/src/java.base/share/classes/java/lang/Error.java diff --git a/jdk/src/share/classes/java/lang/Exception.java b/jdk/src/java.base/share/classes/java/lang/Exception.java similarity index 100% rename from jdk/src/share/classes/java/lang/Exception.java rename to jdk/src/java.base/share/classes/java/lang/Exception.java diff --git a/jdk/src/share/classes/java/lang/ExceptionInInitializerError.java b/jdk/src/java.base/share/classes/java/lang/ExceptionInInitializerError.java similarity index 100% rename from jdk/src/share/classes/java/lang/ExceptionInInitializerError.java rename to jdk/src/java.base/share/classes/java/lang/ExceptionInInitializerError.java diff --git a/jdk/src/share/classes/java/lang/Float.java b/jdk/src/java.base/share/classes/java/lang/Float.java similarity index 100% rename from jdk/src/share/classes/java/lang/Float.java rename to jdk/src/java.base/share/classes/java/lang/Float.java diff --git a/jdk/src/share/classes/java/lang/FunctionalInterface.java b/jdk/src/java.base/share/classes/java/lang/FunctionalInterface.java similarity index 100% rename from jdk/src/share/classes/java/lang/FunctionalInterface.java rename to jdk/src/java.base/share/classes/java/lang/FunctionalInterface.java diff --git a/jdk/src/share/classes/java/lang/IllegalAccessError.java b/jdk/src/java.base/share/classes/java/lang/IllegalAccessError.java similarity index 100% rename from jdk/src/share/classes/java/lang/IllegalAccessError.java rename to jdk/src/java.base/share/classes/java/lang/IllegalAccessError.java diff --git a/jdk/src/share/classes/java/lang/IllegalAccessException.java b/jdk/src/java.base/share/classes/java/lang/IllegalAccessException.java similarity index 100% rename from jdk/src/share/classes/java/lang/IllegalAccessException.java rename to jdk/src/java.base/share/classes/java/lang/IllegalAccessException.java diff --git a/jdk/src/share/classes/java/lang/IllegalArgumentException.java b/jdk/src/java.base/share/classes/java/lang/IllegalArgumentException.java similarity index 100% rename from jdk/src/share/classes/java/lang/IllegalArgumentException.java rename to jdk/src/java.base/share/classes/java/lang/IllegalArgumentException.java diff --git a/jdk/src/share/classes/java/lang/IllegalMonitorStateException.java b/jdk/src/java.base/share/classes/java/lang/IllegalMonitorStateException.java similarity index 100% rename from jdk/src/share/classes/java/lang/IllegalMonitorStateException.java rename to jdk/src/java.base/share/classes/java/lang/IllegalMonitorStateException.java diff --git a/jdk/src/share/classes/java/lang/IllegalStateException.java b/jdk/src/java.base/share/classes/java/lang/IllegalStateException.java similarity index 100% rename from jdk/src/share/classes/java/lang/IllegalStateException.java rename to jdk/src/java.base/share/classes/java/lang/IllegalStateException.java diff --git a/jdk/src/share/classes/java/lang/IllegalThreadStateException.java b/jdk/src/java.base/share/classes/java/lang/IllegalThreadStateException.java similarity index 100% rename from jdk/src/share/classes/java/lang/IllegalThreadStateException.java rename to jdk/src/java.base/share/classes/java/lang/IllegalThreadStateException.java diff --git a/jdk/src/share/classes/java/lang/IncompatibleClassChangeError.java b/jdk/src/java.base/share/classes/java/lang/IncompatibleClassChangeError.java similarity index 100% rename from jdk/src/share/classes/java/lang/IncompatibleClassChangeError.java rename to jdk/src/java.base/share/classes/java/lang/IncompatibleClassChangeError.java diff --git a/jdk/src/share/classes/java/lang/IndexOutOfBoundsException.java b/jdk/src/java.base/share/classes/java/lang/IndexOutOfBoundsException.java similarity index 100% rename from jdk/src/share/classes/java/lang/IndexOutOfBoundsException.java rename to jdk/src/java.base/share/classes/java/lang/IndexOutOfBoundsException.java diff --git a/jdk/src/share/classes/java/lang/InheritableThreadLocal.java b/jdk/src/java.base/share/classes/java/lang/InheritableThreadLocal.java similarity index 100% rename from jdk/src/share/classes/java/lang/InheritableThreadLocal.java rename to jdk/src/java.base/share/classes/java/lang/InheritableThreadLocal.java diff --git a/jdk/src/share/classes/java/lang/InstantiationError.java b/jdk/src/java.base/share/classes/java/lang/InstantiationError.java similarity index 100% rename from jdk/src/share/classes/java/lang/InstantiationError.java rename to jdk/src/java.base/share/classes/java/lang/InstantiationError.java diff --git a/jdk/src/share/classes/java/lang/InstantiationException.java b/jdk/src/java.base/share/classes/java/lang/InstantiationException.java similarity index 100% rename from jdk/src/share/classes/java/lang/InstantiationException.java rename to jdk/src/java.base/share/classes/java/lang/InstantiationException.java diff --git a/jdk/src/share/classes/java/lang/Integer.java b/jdk/src/java.base/share/classes/java/lang/Integer.java similarity index 100% rename from jdk/src/share/classes/java/lang/Integer.java rename to jdk/src/java.base/share/classes/java/lang/Integer.java diff --git a/jdk/src/share/classes/java/lang/InternalError.java b/jdk/src/java.base/share/classes/java/lang/InternalError.java similarity index 100% rename from jdk/src/share/classes/java/lang/InternalError.java rename to jdk/src/java.base/share/classes/java/lang/InternalError.java diff --git a/jdk/src/share/classes/java/lang/InterruptedException.java b/jdk/src/java.base/share/classes/java/lang/InterruptedException.java similarity index 100% rename from jdk/src/share/classes/java/lang/InterruptedException.java rename to jdk/src/java.base/share/classes/java/lang/InterruptedException.java diff --git a/jdk/src/share/classes/java/lang/Iterable.java b/jdk/src/java.base/share/classes/java/lang/Iterable.java similarity index 100% rename from jdk/src/share/classes/java/lang/Iterable.java rename to jdk/src/java.base/share/classes/java/lang/Iterable.java diff --git a/jdk/src/share/classes/java/lang/LinkageError.java b/jdk/src/java.base/share/classes/java/lang/LinkageError.java similarity index 100% rename from jdk/src/share/classes/java/lang/LinkageError.java rename to jdk/src/java.base/share/classes/java/lang/LinkageError.java diff --git a/jdk/src/share/classes/java/lang/Long.java b/jdk/src/java.base/share/classes/java/lang/Long.java similarity index 100% rename from jdk/src/share/classes/java/lang/Long.java rename to jdk/src/java.base/share/classes/java/lang/Long.java diff --git a/jdk/src/share/classes/java/lang/Math.java b/jdk/src/java.base/share/classes/java/lang/Math.java similarity index 100% rename from jdk/src/share/classes/java/lang/Math.java rename to jdk/src/java.base/share/classes/java/lang/Math.java diff --git a/jdk/src/share/classes/java/lang/NegativeArraySizeException.java b/jdk/src/java.base/share/classes/java/lang/NegativeArraySizeException.java similarity index 100% rename from jdk/src/share/classes/java/lang/NegativeArraySizeException.java rename to jdk/src/java.base/share/classes/java/lang/NegativeArraySizeException.java diff --git a/jdk/src/share/classes/java/lang/NoClassDefFoundError.java b/jdk/src/java.base/share/classes/java/lang/NoClassDefFoundError.java similarity index 100% rename from jdk/src/share/classes/java/lang/NoClassDefFoundError.java rename to jdk/src/java.base/share/classes/java/lang/NoClassDefFoundError.java diff --git a/jdk/src/share/classes/java/lang/NoSuchFieldError.java b/jdk/src/java.base/share/classes/java/lang/NoSuchFieldError.java similarity index 100% rename from jdk/src/share/classes/java/lang/NoSuchFieldError.java rename to jdk/src/java.base/share/classes/java/lang/NoSuchFieldError.java diff --git a/jdk/src/share/classes/java/lang/NoSuchFieldException.java b/jdk/src/java.base/share/classes/java/lang/NoSuchFieldException.java similarity index 100% rename from jdk/src/share/classes/java/lang/NoSuchFieldException.java rename to jdk/src/java.base/share/classes/java/lang/NoSuchFieldException.java diff --git a/jdk/src/share/classes/java/lang/NoSuchMethodError.java b/jdk/src/java.base/share/classes/java/lang/NoSuchMethodError.java similarity index 100% rename from jdk/src/share/classes/java/lang/NoSuchMethodError.java rename to jdk/src/java.base/share/classes/java/lang/NoSuchMethodError.java diff --git a/jdk/src/share/classes/java/lang/NoSuchMethodException.java b/jdk/src/java.base/share/classes/java/lang/NoSuchMethodException.java similarity index 100% rename from jdk/src/share/classes/java/lang/NoSuchMethodException.java rename to jdk/src/java.base/share/classes/java/lang/NoSuchMethodException.java diff --git a/jdk/src/share/classes/java/lang/NullPointerException.java b/jdk/src/java.base/share/classes/java/lang/NullPointerException.java similarity index 100% rename from jdk/src/share/classes/java/lang/NullPointerException.java rename to jdk/src/java.base/share/classes/java/lang/NullPointerException.java diff --git a/jdk/src/share/classes/java/lang/Number.java b/jdk/src/java.base/share/classes/java/lang/Number.java similarity index 100% rename from jdk/src/share/classes/java/lang/Number.java rename to jdk/src/java.base/share/classes/java/lang/Number.java diff --git a/jdk/src/share/classes/java/lang/NumberFormatException.java b/jdk/src/java.base/share/classes/java/lang/NumberFormatException.java similarity index 100% rename from jdk/src/share/classes/java/lang/NumberFormatException.java rename to jdk/src/java.base/share/classes/java/lang/NumberFormatException.java diff --git a/jdk/src/share/classes/java/lang/Object.java b/jdk/src/java.base/share/classes/java/lang/Object.java similarity index 100% rename from jdk/src/share/classes/java/lang/Object.java rename to jdk/src/java.base/share/classes/java/lang/Object.java diff --git a/jdk/src/share/classes/java/lang/OutOfMemoryError.java b/jdk/src/java.base/share/classes/java/lang/OutOfMemoryError.java similarity index 100% rename from jdk/src/share/classes/java/lang/OutOfMemoryError.java rename to jdk/src/java.base/share/classes/java/lang/OutOfMemoryError.java diff --git a/jdk/src/share/classes/java/lang/Override.java b/jdk/src/java.base/share/classes/java/lang/Override.java similarity index 100% rename from jdk/src/share/classes/java/lang/Override.java rename to jdk/src/java.base/share/classes/java/lang/Override.java diff --git a/jdk/src/share/classes/java/lang/Package.java b/jdk/src/java.base/share/classes/java/lang/Package.java similarity index 100% rename from jdk/src/share/classes/java/lang/Package.java rename to jdk/src/java.base/share/classes/java/lang/Package.java diff --git a/jdk/src/share/classes/java/lang/Process.java b/jdk/src/java.base/share/classes/java/lang/Process.java similarity index 100% rename from jdk/src/share/classes/java/lang/Process.java rename to jdk/src/java.base/share/classes/java/lang/Process.java diff --git a/jdk/src/share/classes/java/lang/ProcessBuilder.java b/jdk/src/java.base/share/classes/java/lang/ProcessBuilder.java similarity index 100% rename from jdk/src/share/classes/java/lang/ProcessBuilder.java rename to jdk/src/java.base/share/classes/java/lang/ProcessBuilder.java diff --git a/jdk/src/share/classes/java/lang/Readable.java b/jdk/src/java.base/share/classes/java/lang/Readable.java similarity index 100% rename from jdk/src/share/classes/java/lang/Readable.java rename to jdk/src/java.base/share/classes/java/lang/Readable.java diff --git a/jdk/src/share/classes/java/lang/ReflectiveOperationException.java b/jdk/src/java.base/share/classes/java/lang/ReflectiveOperationException.java similarity index 100% rename from jdk/src/share/classes/java/lang/ReflectiveOperationException.java rename to jdk/src/java.base/share/classes/java/lang/ReflectiveOperationException.java diff --git a/jdk/src/share/classes/java/lang/Runnable.java b/jdk/src/java.base/share/classes/java/lang/Runnable.java similarity index 100% rename from jdk/src/share/classes/java/lang/Runnable.java rename to jdk/src/java.base/share/classes/java/lang/Runnable.java diff --git a/jdk/src/share/classes/java/lang/Runtime.java b/jdk/src/java.base/share/classes/java/lang/Runtime.java similarity index 100% rename from jdk/src/share/classes/java/lang/Runtime.java rename to jdk/src/java.base/share/classes/java/lang/Runtime.java diff --git a/jdk/src/share/classes/java/lang/RuntimeException.java b/jdk/src/java.base/share/classes/java/lang/RuntimeException.java similarity index 100% rename from jdk/src/share/classes/java/lang/RuntimeException.java rename to jdk/src/java.base/share/classes/java/lang/RuntimeException.java diff --git a/jdk/src/share/classes/java/lang/RuntimePermission.java b/jdk/src/java.base/share/classes/java/lang/RuntimePermission.java similarity index 100% rename from jdk/src/share/classes/java/lang/RuntimePermission.java rename to jdk/src/java.base/share/classes/java/lang/RuntimePermission.java diff --git a/jdk/src/share/classes/java/lang/SafeVarargs.java b/jdk/src/java.base/share/classes/java/lang/SafeVarargs.java similarity index 100% rename from jdk/src/share/classes/java/lang/SafeVarargs.java rename to jdk/src/java.base/share/classes/java/lang/SafeVarargs.java diff --git a/jdk/src/share/classes/java/lang/SecurityException.java b/jdk/src/java.base/share/classes/java/lang/SecurityException.java similarity index 100% rename from jdk/src/share/classes/java/lang/SecurityException.java rename to jdk/src/java.base/share/classes/java/lang/SecurityException.java diff --git a/jdk/src/share/classes/java/lang/SecurityManager.java b/jdk/src/java.base/share/classes/java/lang/SecurityManager.java similarity index 100% rename from jdk/src/share/classes/java/lang/SecurityManager.java rename to jdk/src/java.base/share/classes/java/lang/SecurityManager.java diff --git a/jdk/src/share/classes/java/lang/Short.java b/jdk/src/java.base/share/classes/java/lang/Short.java similarity index 100% rename from jdk/src/share/classes/java/lang/Short.java rename to jdk/src/java.base/share/classes/java/lang/Short.java diff --git a/jdk/src/share/classes/java/lang/Shutdown.java b/jdk/src/java.base/share/classes/java/lang/Shutdown.java similarity index 100% rename from jdk/src/share/classes/java/lang/Shutdown.java rename to jdk/src/java.base/share/classes/java/lang/Shutdown.java diff --git a/jdk/src/share/classes/java/lang/StackOverflowError.java b/jdk/src/java.base/share/classes/java/lang/StackOverflowError.java similarity index 100% rename from jdk/src/share/classes/java/lang/StackOverflowError.java rename to jdk/src/java.base/share/classes/java/lang/StackOverflowError.java diff --git a/jdk/src/share/classes/java/lang/StackTraceElement.java b/jdk/src/java.base/share/classes/java/lang/StackTraceElement.java similarity index 100% rename from jdk/src/share/classes/java/lang/StackTraceElement.java rename to jdk/src/java.base/share/classes/java/lang/StackTraceElement.java diff --git a/jdk/src/share/classes/java/lang/StrictMath.java b/jdk/src/java.base/share/classes/java/lang/StrictMath.java similarity index 100% rename from jdk/src/share/classes/java/lang/StrictMath.java rename to jdk/src/java.base/share/classes/java/lang/StrictMath.java diff --git a/jdk/src/share/classes/java/lang/String.java b/jdk/src/java.base/share/classes/java/lang/String.java similarity index 100% rename from jdk/src/share/classes/java/lang/String.java rename to jdk/src/java.base/share/classes/java/lang/String.java diff --git a/jdk/src/share/classes/java/lang/StringBuffer.java b/jdk/src/java.base/share/classes/java/lang/StringBuffer.java similarity index 100% rename from jdk/src/share/classes/java/lang/StringBuffer.java rename to jdk/src/java.base/share/classes/java/lang/StringBuffer.java diff --git a/jdk/src/share/classes/java/lang/StringBuilder.java b/jdk/src/java.base/share/classes/java/lang/StringBuilder.java similarity index 100% rename from jdk/src/share/classes/java/lang/StringBuilder.java rename to jdk/src/java.base/share/classes/java/lang/StringBuilder.java diff --git a/jdk/src/share/classes/java/lang/StringCoding.java b/jdk/src/java.base/share/classes/java/lang/StringCoding.java similarity index 98% rename from jdk/src/share/classes/java/lang/StringCoding.java rename to jdk/src/java.base/share/classes/java/lang/StringCoding.java index 24ed0c06bbe..a4c71b4cf21 100644 --- a/jdk/src/share/classes/java/lang/StringCoding.java +++ b/jdk/src/java.base/share/classes/java/lang/StringCoding.java @@ -196,19 +196,19 @@ class StringCoding { static char[] decode(Charset cs, byte[] ba, int off, int len) { // (1)We never cache the "external" cs, the only benefit of creating // an additional StringDe/Encoder object to wrap it is to share the - // de/encode() method. These SD/E objects are short-lifed, the young-gen - // gc should be able to take care of them well. But the best approash + // de/encode() method. These SD/E objects are short-lived, the young-gen + // gc should be able to take care of them well. But the best approach // is still not to generate them if not really necessary. // (2)The defensive copy of the input byte/char[] has a big performance // impact, as well as the outgoing result byte/char[]. Need to do the // optimization check of (sm==null && classLoader0==null) for both. // (3)getClass().getClassLoader0() is expensive // (4)There might be a timing gap in isTrusted setting. getClassLoader0() - // is only chcked (and then isTrusted gets set) when (SM==null). It is + // is only checked (and then isTrusted gets set) when (SM==null). It is // possible that the SM==null for now but then SM is NOT null later // when safeTrim() is invoked...the "safe" way to do is to redundant // check (... && (isTrusted || SM == null || getClassLoader0())) in trim - // but it then can be argued that the SM is null when the opertaion + // but it then can be argued that the SM is null when the operation // is started... CharsetDecoder cd = cs.newDecoder(); int en = scale(len, cd.maxCharsPerByte()); diff --git a/jdk/src/share/classes/java/lang/StringIndexOutOfBoundsException.java b/jdk/src/java.base/share/classes/java/lang/StringIndexOutOfBoundsException.java similarity index 100% rename from jdk/src/share/classes/java/lang/StringIndexOutOfBoundsException.java rename to jdk/src/java.base/share/classes/java/lang/StringIndexOutOfBoundsException.java diff --git a/jdk/src/share/classes/java/lang/SuppressWarnings.java b/jdk/src/java.base/share/classes/java/lang/SuppressWarnings.java similarity index 100% rename from jdk/src/share/classes/java/lang/SuppressWarnings.java rename to jdk/src/java.base/share/classes/java/lang/SuppressWarnings.java diff --git a/jdk/src/share/classes/java/lang/System.java b/jdk/src/java.base/share/classes/java/lang/System.java similarity index 99% rename from jdk/src/share/classes/java/lang/System.java rename to jdk/src/java.base/share/classes/java/lang/System.java index fbac697c245..345cdae1df7 100644 --- a/jdk/src/share/classes/java/lang/System.java +++ b/jdk/src/java.base/share/classes/java/lang/System.java @@ -1193,7 +1193,7 @@ public final class System { // Setup Java signal handlers for HUP, TERM, and INT (where available). Terminator.setup(); - // Initialize any miscellenous operating system settings that need to be + // Initialize any miscellaneous operating system settings that need to be // set for the class libraries. Currently this is no-op everywhere except // for Windows where the process-wide error mode is set before the java.io // classes are used. diff --git a/jdk/src/share/classes/java/lang/Thread.java b/jdk/src/java.base/share/classes/java/lang/Thread.java similarity index 100% rename from jdk/src/share/classes/java/lang/Thread.java rename to jdk/src/java.base/share/classes/java/lang/Thread.java diff --git a/jdk/src/share/classes/java/lang/ThreadDeath.java b/jdk/src/java.base/share/classes/java/lang/ThreadDeath.java similarity index 100% rename from jdk/src/share/classes/java/lang/ThreadDeath.java rename to jdk/src/java.base/share/classes/java/lang/ThreadDeath.java diff --git a/jdk/src/share/classes/java/lang/ThreadGroup.java b/jdk/src/java.base/share/classes/java/lang/ThreadGroup.java similarity index 100% rename from jdk/src/share/classes/java/lang/ThreadGroup.java rename to jdk/src/java.base/share/classes/java/lang/ThreadGroup.java diff --git a/jdk/src/share/classes/java/lang/ThreadLocal.java b/jdk/src/java.base/share/classes/java/lang/ThreadLocal.java similarity index 100% rename from jdk/src/share/classes/java/lang/ThreadLocal.java rename to jdk/src/java.base/share/classes/java/lang/ThreadLocal.java diff --git a/jdk/src/share/classes/java/lang/Throwable.java b/jdk/src/java.base/share/classes/java/lang/Throwable.java similarity index 99% rename from jdk/src/share/classes/java/lang/Throwable.java rename to jdk/src/java.base/share/classes/java/lang/Throwable.java index 396d8e90ecc..d71f9ecdf0d 100644 --- a/jdk/src/share/classes/java/lang/Throwable.java +++ b/jdk/src/java.base/share/classes/java/lang/Throwable.java @@ -139,7 +139,7 @@ public class Throwable implements Serializable { * {@linkplain #setStackTrace(StackTraceElement[]) Setting the * stack trace} to a one-element array containing this sentinel * value indicates future attempts to set the stack trace will be - * ignored. The sentinal is equal to the result of calling:
+ * ignored. The sentinel is equal to the result of calling:
* {@code new StackTraceElement("", "", null, Integer.MIN_VALUE)} */ public static final StackTraceElement STACK_TRACE_ELEMENT_SENTINEL = diff --git a/jdk/src/share/classes/java/lang/TypeNotPresentException.java b/jdk/src/java.base/share/classes/java/lang/TypeNotPresentException.java similarity index 100% rename from jdk/src/share/classes/java/lang/TypeNotPresentException.java rename to jdk/src/java.base/share/classes/java/lang/TypeNotPresentException.java diff --git a/jdk/src/share/classes/java/lang/UnknownError.java b/jdk/src/java.base/share/classes/java/lang/UnknownError.java similarity index 100% rename from jdk/src/share/classes/java/lang/UnknownError.java rename to jdk/src/java.base/share/classes/java/lang/UnknownError.java diff --git a/jdk/src/share/classes/java/lang/UnsatisfiedLinkError.java b/jdk/src/java.base/share/classes/java/lang/UnsatisfiedLinkError.java similarity index 100% rename from jdk/src/share/classes/java/lang/UnsatisfiedLinkError.java rename to jdk/src/java.base/share/classes/java/lang/UnsatisfiedLinkError.java diff --git a/jdk/src/share/classes/java/lang/UnsupportedClassVersionError.java b/jdk/src/java.base/share/classes/java/lang/UnsupportedClassVersionError.java similarity index 100% rename from jdk/src/share/classes/java/lang/UnsupportedClassVersionError.java rename to jdk/src/java.base/share/classes/java/lang/UnsupportedClassVersionError.java diff --git a/jdk/src/share/classes/java/lang/UnsupportedOperationException.java b/jdk/src/java.base/share/classes/java/lang/UnsupportedOperationException.java similarity index 100% rename from jdk/src/share/classes/java/lang/UnsupportedOperationException.java rename to jdk/src/java.base/share/classes/java/lang/UnsupportedOperationException.java diff --git a/jdk/src/share/classes/java/lang/VerifyError.java b/jdk/src/java.base/share/classes/java/lang/VerifyError.java similarity index 100% rename from jdk/src/share/classes/java/lang/VerifyError.java rename to jdk/src/java.base/share/classes/java/lang/VerifyError.java diff --git a/jdk/src/share/classes/java/lang/VirtualMachineError.java b/jdk/src/java.base/share/classes/java/lang/VirtualMachineError.java similarity index 100% rename from jdk/src/share/classes/java/lang/VirtualMachineError.java rename to jdk/src/java.base/share/classes/java/lang/VirtualMachineError.java diff --git a/jdk/src/share/classes/java/lang/Void.java b/jdk/src/java.base/share/classes/java/lang/Void.java similarity index 100% rename from jdk/src/share/classes/java/lang/Void.java rename to jdk/src/java.base/share/classes/java/lang/Void.java diff --git a/jdk/src/share/classes/java/lang/annotation/Annotation.java b/jdk/src/java.base/share/classes/java/lang/annotation/Annotation.java similarity index 100% rename from jdk/src/share/classes/java/lang/annotation/Annotation.java rename to jdk/src/java.base/share/classes/java/lang/annotation/Annotation.java diff --git a/jdk/src/share/classes/java/lang/annotation/AnnotationFormatError.java b/jdk/src/java.base/share/classes/java/lang/annotation/AnnotationFormatError.java similarity index 100% rename from jdk/src/share/classes/java/lang/annotation/AnnotationFormatError.java rename to jdk/src/java.base/share/classes/java/lang/annotation/AnnotationFormatError.java diff --git a/jdk/src/share/classes/java/lang/annotation/AnnotationTypeMismatchException.java b/jdk/src/java.base/share/classes/java/lang/annotation/AnnotationTypeMismatchException.java similarity index 100% rename from jdk/src/share/classes/java/lang/annotation/AnnotationTypeMismatchException.java rename to jdk/src/java.base/share/classes/java/lang/annotation/AnnotationTypeMismatchException.java diff --git a/jdk/src/share/classes/java/lang/annotation/Documented.java b/jdk/src/java.base/share/classes/java/lang/annotation/Documented.java similarity index 100% rename from jdk/src/share/classes/java/lang/annotation/Documented.java rename to jdk/src/java.base/share/classes/java/lang/annotation/Documented.java diff --git a/jdk/src/share/classes/java/lang/annotation/ElementType.java b/jdk/src/java.base/share/classes/java/lang/annotation/ElementType.java similarity index 100% rename from jdk/src/share/classes/java/lang/annotation/ElementType.java rename to jdk/src/java.base/share/classes/java/lang/annotation/ElementType.java diff --git a/jdk/src/share/classes/java/lang/annotation/IncompleteAnnotationException.java b/jdk/src/java.base/share/classes/java/lang/annotation/IncompleteAnnotationException.java similarity index 100% rename from jdk/src/share/classes/java/lang/annotation/IncompleteAnnotationException.java rename to jdk/src/java.base/share/classes/java/lang/annotation/IncompleteAnnotationException.java diff --git a/jdk/src/share/classes/java/lang/annotation/Inherited.java b/jdk/src/java.base/share/classes/java/lang/annotation/Inherited.java similarity index 100% rename from jdk/src/share/classes/java/lang/annotation/Inherited.java rename to jdk/src/java.base/share/classes/java/lang/annotation/Inherited.java diff --git a/jdk/src/share/classes/java/lang/annotation/Native.java b/jdk/src/java.base/share/classes/java/lang/annotation/Native.java similarity index 100% rename from jdk/src/share/classes/java/lang/annotation/Native.java rename to jdk/src/java.base/share/classes/java/lang/annotation/Native.java diff --git a/jdk/src/share/classes/java/lang/annotation/Repeatable.java b/jdk/src/java.base/share/classes/java/lang/annotation/Repeatable.java similarity index 100% rename from jdk/src/share/classes/java/lang/annotation/Repeatable.java rename to jdk/src/java.base/share/classes/java/lang/annotation/Repeatable.java diff --git a/jdk/src/share/classes/java/lang/annotation/Retention.java b/jdk/src/java.base/share/classes/java/lang/annotation/Retention.java similarity index 100% rename from jdk/src/share/classes/java/lang/annotation/Retention.java rename to jdk/src/java.base/share/classes/java/lang/annotation/Retention.java diff --git a/jdk/src/share/classes/java/lang/annotation/RetentionPolicy.java b/jdk/src/java.base/share/classes/java/lang/annotation/RetentionPolicy.java similarity index 100% rename from jdk/src/share/classes/java/lang/annotation/RetentionPolicy.java rename to jdk/src/java.base/share/classes/java/lang/annotation/RetentionPolicy.java diff --git a/jdk/src/share/classes/java/lang/annotation/Target.java b/jdk/src/java.base/share/classes/java/lang/annotation/Target.java similarity index 100% rename from jdk/src/share/classes/java/lang/annotation/Target.java rename to jdk/src/java.base/share/classes/java/lang/annotation/Target.java diff --git a/jdk/src/share/classes/java/lang/annotation/package-info.java b/jdk/src/java.base/share/classes/java/lang/annotation/package-info.java similarity index 100% rename from jdk/src/share/classes/java/lang/annotation/package-info.java rename to jdk/src/java.base/share/classes/java/lang/annotation/package-info.java diff --git a/jdk/src/share/classes/java/lang/doc-files/ValueBased.html b/jdk/src/java.base/share/classes/java/lang/doc-files/ValueBased.html similarity index 100% rename from jdk/src/share/classes/java/lang/doc-files/ValueBased.html rename to jdk/src/java.base/share/classes/java/lang/doc-files/ValueBased.html diff --git a/jdk/src/share/classes/java/lang/doc-files/capchi.gif b/jdk/src/java.base/share/classes/java/lang/doc-files/capchi.gif similarity index 100% rename from jdk/src/share/classes/java/lang/doc-files/capchi.gif rename to jdk/src/java.base/share/classes/java/lang/doc-files/capchi.gif diff --git a/jdk/src/share/classes/java/lang/doc-files/capiota.gif b/jdk/src/java.base/share/classes/java/lang/doc-files/capiota.gif similarity index 100% rename from jdk/src/share/classes/java/lang/doc-files/capiota.gif rename to jdk/src/java.base/share/classes/java/lang/doc-files/capiota.gif diff --git a/jdk/src/share/classes/java/lang/doc-files/capsigma.gif b/jdk/src/java.base/share/classes/java/lang/doc-files/capsigma.gif similarity index 100% rename from jdk/src/share/classes/java/lang/doc-files/capsigma.gif rename to jdk/src/java.base/share/classes/java/lang/doc-files/capsigma.gif diff --git a/jdk/src/share/classes/java/lang/doc-files/captheta.gif b/jdk/src/java.base/share/classes/java/lang/doc-files/captheta.gif similarity index 100% rename from jdk/src/share/classes/java/lang/doc-files/captheta.gif rename to jdk/src/java.base/share/classes/java/lang/doc-files/captheta.gif diff --git a/jdk/src/share/classes/java/lang/doc-files/capupsil.gif b/jdk/src/java.base/share/classes/java/lang/doc-files/capupsil.gif similarity index 100% rename from jdk/src/share/classes/java/lang/doc-files/capupsil.gif rename to jdk/src/java.base/share/classes/java/lang/doc-files/capupsil.gif diff --git a/jdk/src/share/classes/java/lang/doc-files/chi.gif b/jdk/src/java.base/share/classes/java/lang/doc-files/chi.gif similarity index 100% rename from jdk/src/share/classes/java/lang/doc-files/chi.gif rename to jdk/src/java.base/share/classes/java/lang/doc-files/chi.gif diff --git a/jdk/src/share/classes/java/lang/doc-files/iota.gif b/jdk/src/java.base/share/classes/java/lang/doc-files/iota.gif similarity index 100% rename from jdk/src/share/classes/java/lang/doc-files/iota.gif rename to jdk/src/java.base/share/classes/java/lang/doc-files/iota.gif diff --git a/jdk/src/share/classes/java/lang/doc-files/javalang.doc.anc21.gif b/jdk/src/java.base/share/classes/java/lang/doc-files/javalang.doc.anc21.gif similarity index 100% rename from jdk/src/share/classes/java/lang/doc-files/javalang.doc.anc21.gif rename to jdk/src/java.base/share/classes/java/lang/doc-files/javalang.doc.anc21.gif diff --git a/jdk/src/share/classes/java/lang/doc-files/javalang.doc.anc38.gif b/jdk/src/java.base/share/classes/java/lang/doc-files/javalang.doc.anc38.gif similarity index 100% rename from jdk/src/share/classes/java/lang/doc-files/javalang.doc.anc38.gif rename to jdk/src/java.base/share/classes/java/lang/doc-files/javalang.doc.anc38.gif diff --git a/jdk/src/share/classes/java/lang/doc-files/javalang.doc.anc40.gif b/jdk/src/java.base/share/classes/java/lang/doc-files/javalang.doc.anc40.gif similarity index 100% rename from jdk/src/share/classes/java/lang/doc-files/javalang.doc.anc40.gif rename to jdk/src/java.base/share/classes/java/lang/doc-files/javalang.doc.anc40.gif diff --git a/jdk/src/share/classes/java/lang/doc-files/javalang.doc.anc41.gif b/jdk/src/java.base/share/classes/java/lang/doc-files/javalang.doc.anc41.gif similarity index 100% rename from jdk/src/share/classes/java/lang/doc-files/javalang.doc.anc41.gif rename to jdk/src/java.base/share/classes/java/lang/doc-files/javalang.doc.anc41.gif diff --git a/jdk/src/share/classes/java/lang/doc-files/sigma1.gif b/jdk/src/java.base/share/classes/java/lang/doc-files/sigma1.gif similarity index 100% rename from jdk/src/share/classes/java/lang/doc-files/sigma1.gif rename to jdk/src/java.base/share/classes/java/lang/doc-files/sigma1.gif diff --git a/jdk/src/share/classes/java/lang/doc-files/theta.gif b/jdk/src/java.base/share/classes/java/lang/doc-files/theta.gif similarity index 100% rename from jdk/src/share/classes/java/lang/doc-files/theta.gif rename to jdk/src/java.base/share/classes/java/lang/doc-files/theta.gif diff --git a/jdk/src/share/classes/java/lang/doc-files/upsilon.gif b/jdk/src/java.base/share/classes/java/lang/doc-files/upsilon.gif similarity index 100% rename from jdk/src/share/classes/java/lang/doc-files/upsilon.gif rename to jdk/src/java.base/share/classes/java/lang/doc-files/upsilon.gif diff --git a/jdk/src/share/classes/java/lang/invoke/AbstractValidatingLambdaMetafactory.java b/jdk/src/java.base/share/classes/java/lang/invoke/AbstractValidatingLambdaMetafactory.java similarity index 100% rename from jdk/src/share/classes/java/lang/invoke/AbstractValidatingLambdaMetafactory.java rename to jdk/src/java.base/share/classes/java/lang/invoke/AbstractValidatingLambdaMetafactory.java diff --git a/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java b/jdk/src/java.base/share/classes/java/lang/invoke/BoundMethodHandle.java similarity index 100% rename from jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java rename to jdk/src/java.base/share/classes/java/lang/invoke/BoundMethodHandle.java diff --git a/jdk/src/share/classes/java/lang/invoke/CallSite.java b/jdk/src/java.base/share/classes/java/lang/invoke/CallSite.java similarity index 100% rename from jdk/src/share/classes/java/lang/invoke/CallSite.java rename to jdk/src/java.base/share/classes/java/lang/invoke/CallSite.java diff --git a/jdk/src/share/classes/java/lang/invoke/ConstantCallSite.java b/jdk/src/java.base/share/classes/java/lang/invoke/ConstantCallSite.java similarity index 100% rename from jdk/src/share/classes/java/lang/invoke/ConstantCallSite.java rename to jdk/src/java.base/share/classes/java/lang/invoke/ConstantCallSite.java diff --git a/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java b/jdk/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java similarity index 100% rename from jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java rename to jdk/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java diff --git a/jdk/src/share/classes/java/lang/invoke/DontInline.java b/jdk/src/java.base/share/classes/java/lang/invoke/DontInline.java similarity index 100% rename from jdk/src/share/classes/java/lang/invoke/DontInline.java rename to jdk/src/java.base/share/classes/java/lang/invoke/DontInline.java diff --git a/jdk/src/share/classes/java/lang/invoke/ForceInline.java b/jdk/src/java.base/share/classes/java/lang/invoke/ForceInline.java similarity index 100% rename from jdk/src/share/classes/java/lang/invoke/ForceInline.java rename to jdk/src/java.base/share/classes/java/lang/invoke/ForceInline.java diff --git a/jdk/src/share/classes/java/lang/invoke/InfoFromMemberName.java b/jdk/src/java.base/share/classes/java/lang/invoke/InfoFromMemberName.java similarity index 100% rename from jdk/src/share/classes/java/lang/invoke/InfoFromMemberName.java rename to jdk/src/java.base/share/classes/java/lang/invoke/InfoFromMemberName.java diff --git a/jdk/src/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java b/jdk/src/java.base/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java similarity index 99% rename from jdk/src/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java rename to jdk/src/java.base/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java index 752c0976d9e..9d8db4eef78 100644 --- a/jdk/src/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java +++ b/jdk/src/java.base/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java @@ -98,7 +98,7 @@ import static jdk.internal.org.objectweb.asm.Opcodes.*; private final String implMethodClassName; // Name of type containing implementation "CC" private final String implMethodName; // Name of implementation method "impl" private final String implMethodDesc; // Type descriptor for implementation methods "(I)Ljava/lang/String;" - private final Class implMethodReturnClass; // class for implementaion method return type "Ljava/lang/String;" + private final Class implMethodReturnClass; // class for implementation method return type "Ljava/lang/String;" private final MethodType constructorType; // Generated class constructor type "(CC)void" private final ClassWriter cw; // ASM class writer private final String[] argNames; // Generated names for the constructor arguments diff --git a/jdk/src/share/classes/java/lang/invoke/InvokeDynamic.java b/jdk/src/java.base/share/classes/java/lang/invoke/InvokeDynamic.java similarity index 100% rename from jdk/src/share/classes/java/lang/invoke/InvokeDynamic.java rename to jdk/src/java.base/share/classes/java/lang/invoke/InvokeDynamic.java diff --git a/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java b/jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java similarity index 99% rename from jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java rename to jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java index 3ab5d9c4dcf..58e56dd246a 100644 --- a/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java +++ b/jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java @@ -209,7 +209,7 @@ class InvokerBytecodeGenerator { throw new InternalError("observed CP placeholder twice: " + cpPlaceholder); } // insert placeholder in CP and remember the patch - int index = cw.newConst((Object) cpPlaceholder); // TODO check if aready in the constant pool + int index = cw.newConst((Object) cpPlaceholder); // TODO check if already in the constant pool cpPatches.put(cpPlaceholder, new CpPatch(index, cpPlaceholder, arg)); return cpPlaceholder; } diff --git a/jdk/src/share/classes/java/lang/invoke/Invokers.java b/jdk/src/java.base/share/classes/java/lang/invoke/Invokers.java similarity index 99% rename from jdk/src/share/classes/java/lang/invoke/Invokers.java rename to jdk/src/java.base/share/classes/java/lang/invoke/Invokers.java index b9c18b548bd..d3116d12963 100644 --- a/jdk/src/share/classes/java/lang/invoke/Invokers.java +++ b/jdk/src/java.base/share/classes/java/lang/invoke/Invokers.java @@ -37,7 +37,7 @@ import static java.lang.invoke.LambdaForm.*; * @author jrose */ class Invokers { - // exact type (sans leading taget MH) for the outgoing call + // exact type (sans leading target MH) for the outgoing call private final MethodType targetType; // FIXME: Get rid of the invokers that are not useful. diff --git a/jdk/src/share/classes/java/lang/invoke/LambdaConversionException.java b/jdk/src/java.base/share/classes/java/lang/invoke/LambdaConversionException.java similarity index 100% rename from jdk/src/share/classes/java/lang/invoke/LambdaConversionException.java rename to jdk/src/java.base/share/classes/java/lang/invoke/LambdaConversionException.java diff --git a/jdk/src/share/classes/java/lang/invoke/LambdaForm.java b/jdk/src/java.base/share/classes/java/lang/invoke/LambdaForm.java similarity index 100% rename from jdk/src/share/classes/java/lang/invoke/LambdaForm.java rename to jdk/src/java.base/share/classes/java/lang/invoke/LambdaForm.java diff --git a/jdk/src/share/classes/java/lang/invoke/LambdaMetafactory.java b/jdk/src/java.base/share/classes/java/lang/invoke/LambdaMetafactory.java similarity index 100% rename from jdk/src/share/classes/java/lang/invoke/LambdaMetafactory.java rename to jdk/src/java.base/share/classes/java/lang/invoke/LambdaMetafactory.java diff --git a/jdk/src/share/classes/java/lang/invoke/MemberName.java b/jdk/src/java.base/share/classes/java/lang/invoke/MemberName.java similarity index 99% rename from jdk/src/share/classes/java/lang/invoke/MemberName.java rename to jdk/src/java.base/share/classes/java/lang/invoke/MemberName.java index 9cc901eea7a..75b26be4e0c 100644 --- a/jdk/src/share/classes/java/lang/invoke/MemberName.java +++ b/jdk/src/java.base/share/classes/java/lang/invoke/MemberName.java @@ -59,7 +59,7 @@ import java.util.Objects; * and properly use the named member. *

* When resolved, a member name's internal implementation may include references to JVM metadata. - * This representation is stateless and only decriptive. + * This representation is stateless and only descriptive. * It provides no private information and no capability to use the member. *

* By contrast, a {@linkplain java.lang.reflect.Method} contains fuller information diff --git a/jdk/src/share/classes/java/lang/invoke/MethodHandle.java b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandle.java similarity index 99% rename from jdk/src/share/classes/java/lang/invoke/MethodHandle.java rename to jdk/src/java.base/share/classes/java/lang/invoke/MethodHandle.java index 19664528f26..5ed091e408f 100644 --- a/jdk/src/share/classes/java/lang/invoke/MethodHandle.java +++ b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandle.java @@ -679,7 +679,7 @@ public abstract class MethodHandle { * This method provides the crucial behavioral difference between * {@link #invokeExact invokeExact} and plain, inexact {@link #invoke invoke}. * The two methods - * perform the same steps when the caller's type descriptor exactly m atches + * perform the same steps when the caller's type descriptor exactly matches * the callee's, but when the types differ, plain {@link #invoke invoke} * also calls {@code asType} (or some internal equivalent) in order * to match up the caller's and callee's types. diff --git a/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java similarity index 99% rename from jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java rename to jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java index abd8999aeaa..3e4ee65e161 100644 --- a/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java +++ b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java @@ -621,7 +621,7 @@ import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP; } /** - * The LambaForm shape for catchException combinator is the following: + * The LambdaForm shape for catchException combinator is the following: * 

{@code
      *  guardWithCatch=Lambda(a0:L,a1:L,a2:L)=>{
      *    t3:L=BoundMethodHandle$Species_LLLLL.argL0(a0:L);
@@ -702,7 +702,7 @@ import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP;
         MethodType type = target.type();
         LambdaForm form = makeGuardWithCatchForm(type.basicType());
 
-        // Prepare auxiliary method handles used during LambdaForm interpreation.
+        // Prepare auxiliary method handles used during LambdaForm interpretation.
         // Box arguments and wrap them into Object[]: ValueConversions.array().
         MethodType varargsType = type.changeReturnType(Object[].class);
         MethodHandle collectArgs = ValueConversions.varargsArray(type.parameterCount())
diff --git a/jdk/src/share/classes/java/lang/invoke/MethodHandleInfo.java b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleInfo.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/invoke/MethodHandleInfo.java
rename to jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleInfo.java
diff --git a/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java
similarity index 99%
rename from jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java
rename to jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java
index 0f5169e95e2..01c3b33001d 100644
--- a/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java
@@ -509,7 +509,7 @@ class MethodHandleNatives {
 
     /**
      * Is this method a caller-sensitive method?
-     * I.e., does it call Reflection.getCallerClass or a similer method
+     * I.e., does it call Reflection.getCallerClass or a similar method
      * to ask about the identity of its caller?
      */
     static boolean isCallerSensitive(MemberName mem) {
diff --git a/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleProxies.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java
rename to jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleProxies.java
diff --git a/jdk/src/share/classes/java/lang/invoke/MethodHandleStatics.java b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleStatics.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/invoke/MethodHandleStatics.java
rename to jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleStatics.java
diff --git a/jdk/src/share/classes/java/lang/invoke/MethodHandles.java b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/invoke/MethodHandles.java
rename to jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
diff --git a/jdk/src/share/classes/java/lang/invoke/MethodType.java b/jdk/src/java.base/share/classes/java/lang/invoke/MethodType.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/invoke/MethodType.java
rename to jdk/src/java.base/share/classes/java/lang/invoke/MethodType.java
diff --git a/jdk/src/share/classes/java/lang/invoke/MethodTypeForm.java b/jdk/src/java.base/share/classes/java/lang/invoke/MethodTypeForm.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/invoke/MethodTypeForm.java
rename to jdk/src/java.base/share/classes/java/lang/invoke/MethodTypeForm.java
diff --git a/jdk/src/share/classes/java/lang/invoke/MutableCallSite.java b/jdk/src/java.base/share/classes/java/lang/invoke/MutableCallSite.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/invoke/MutableCallSite.java
rename to jdk/src/java.base/share/classes/java/lang/invoke/MutableCallSite.java
diff --git a/jdk/src/share/classes/java/lang/invoke/ProxyClassesDumper.java b/jdk/src/java.base/share/classes/java/lang/invoke/ProxyClassesDumper.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/invoke/ProxyClassesDumper.java
rename to jdk/src/java.base/share/classes/java/lang/invoke/ProxyClassesDumper.java
diff --git a/jdk/src/share/classes/java/lang/invoke/SerializedLambda.java b/jdk/src/java.base/share/classes/java/lang/invoke/SerializedLambda.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/invoke/SerializedLambda.java
rename to jdk/src/java.base/share/classes/java/lang/invoke/SerializedLambda.java
diff --git a/jdk/src/share/classes/java/lang/invoke/SimpleMethodHandle.java b/jdk/src/java.base/share/classes/java/lang/invoke/SimpleMethodHandle.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/invoke/SimpleMethodHandle.java
rename to jdk/src/java.base/share/classes/java/lang/invoke/SimpleMethodHandle.java
diff --git a/jdk/src/share/classes/java/lang/invoke/Stable.java b/jdk/src/java.base/share/classes/java/lang/invoke/Stable.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/invoke/Stable.java
rename to jdk/src/java.base/share/classes/java/lang/invoke/Stable.java
diff --git a/jdk/src/share/classes/java/lang/invoke/SwitchPoint.java b/jdk/src/java.base/share/classes/java/lang/invoke/SwitchPoint.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/invoke/SwitchPoint.java
rename to jdk/src/java.base/share/classes/java/lang/invoke/SwitchPoint.java
diff --git a/jdk/src/share/classes/java/lang/invoke/TypeConvertingMethodAdapter.java b/jdk/src/java.base/share/classes/java/lang/invoke/TypeConvertingMethodAdapter.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/invoke/TypeConvertingMethodAdapter.java
rename to jdk/src/java.base/share/classes/java/lang/invoke/TypeConvertingMethodAdapter.java
diff --git a/jdk/src/share/classes/java/lang/invoke/VolatileCallSite.java b/jdk/src/java.base/share/classes/java/lang/invoke/VolatileCallSite.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/invoke/VolatileCallSite.java
rename to jdk/src/java.base/share/classes/java/lang/invoke/VolatileCallSite.java
diff --git a/jdk/src/share/classes/java/lang/invoke/WrongMethodTypeException.java b/jdk/src/java.base/share/classes/java/lang/invoke/WrongMethodTypeException.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/invoke/WrongMethodTypeException.java
rename to jdk/src/java.base/share/classes/java/lang/invoke/WrongMethodTypeException.java
diff --git a/jdk/src/share/classes/java/lang/invoke/package-info.java b/jdk/src/java.base/share/classes/java/lang/invoke/package-info.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/invoke/package-info.java
rename to jdk/src/java.base/share/classes/java/lang/invoke/package-info.java
diff --git a/jdk/src/share/classes/java/lang/package-info.java b/jdk/src/java.base/share/classes/java/lang/package-info.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/package-info.java
rename to jdk/src/java.base/share/classes/java/lang/package-info.java
diff --git a/jdk/src/share/classes/java/lang/ref/FinalReference.java b/jdk/src/java.base/share/classes/java/lang/ref/FinalReference.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/ref/FinalReference.java
rename to jdk/src/java.base/share/classes/java/lang/ref/FinalReference.java
diff --git a/jdk/src/share/classes/java/lang/ref/Finalizer.java b/jdk/src/java.base/share/classes/java/lang/ref/Finalizer.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/ref/Finalizer.java
rename to jdk/src/java.base/share/classes/java/lang/ref/Finalizer.java
diff --git a/jdk/src/share/classes/java/lang/ref/PhantomReference.java b/jdk/src/java.base/share/classes/java/lang/ref/PhantomReference.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/ref/PhantomReference.java
rename to jdk/src/java.base/share/classes/java/lang/ref/PhantomReference.java
diff --git a/jdk/src/share/classes/java/lang/ref/Reference.java b/jdk/src/java.base/share/classes/java/lang/ref/Reference.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/ref/Reference.java
rename to jdk/src/java.base/share/classes/java/lang/ref/Reference.java
diff --git a/jdk/src/share/classes/java/lang/ref/ReferenceQueue.java b/jdk/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/ref/ReferenceQueue.java
rename to jdk/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java
diff --git a/jdk/src/share/classes/java/lang/ref/SoftReference.java b/jdk/src/java.base/share/classes/java/lang/ref/SoftReference.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/ref/SoftReference.java
rename to jdk/src/java.base/share/classes/java/lang/ref/SoftReference.java
diff --git a/jdk/src/share/classes/java/lang/ref/WeakReference.java b/jdk/src/java.base/share/classes/java/lang/ref/WeakReference.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/ref/WeakReference.java
rename to jdk/src/java.base/share/classes/java/lang/ref/WeakReference.java
diff --git a/jdk/src/share/classes/java/lang/ref/package.html b/jdk/src/java.base/share/classes/java/lang/ref/package.html
similarity index 100%
rename from jdk/src/share/classes/java/lang/ref/package.html
rename to jdk/src/java.base/share/classes/java/lang/ref/package.html
diff --git a/jdk/src/share/classes/java/lang/reflect/AccessibleObject.java b/jdk/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java
similarity index 99%
rename from jdk/src/share/classes/java/lang/reflect/AccessibleObject.java
rename to jdk/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java
index f85ab432388..01a074f36e0 100644
--- a/jdk/src/share/classes/java/lang/reflect/AccessibleObject.java
+++ b/jdk/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java
@@ -78,7 +78,7 @@ public class AccessibleObject implements AnnotatedElement {
      * object is a {@link Constructor} object for the class {@link
      * java.lang.Class}).  In the event of such a SecurityException, the
      * accessibility of objects is set to {@code flag} for array elements
-     * upto (and excluding) the element for which the exception occurred; the
+     * up to (and excluding) the element for which the exception occurred; the
      * accessibility of elements beyond (and including) the element for which
      * the exception occurred is unchanged.
      *
diff --git a/jdk/src/share/classes/java/lang/reflect/AnnotatedArrayType.java b/jdk/src/java.base/share/classes/java/lang/reflect/AnnotatedArrayType.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/reflect/AnnotatedArrayType.java
rename to jdk/src/java.base/share/classes/java/lang/reflect/AnnotatedArrayType.java
diff --git a/jdk/src/share/classes/java/lang/reflect/AnnotatedElement.java b/jdk/src/java.base/share/classes/java/lang/reflect/AnnotatedElement.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/reflect/AnnotatedElement.java
rename to jdk/src/java.base/share/classes/java/lang/reflect/AnnotatedElement.java
diff --git a/jdk/src/share/classes/java/lang/reflect/AnnotatedParameterizedType.java b/jdk/src/java.base/share/classes/java/lang/reflect/AnnotatedParameterizedType.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/reflect/AnnotatedParameterizedType.java
rename to jdk/src/java.base/share/classes/java/lang/reflect/AnnotatedParameterizedType.java
diff --git a/jdk/src/share/classes/java/lang/reflect/AnnotatedType.java b/jdk/src/java.base/share/classes/java/lang/reflect/AnnotatedType.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/reflect/AnnotatedType.java
rename to jdk/src/java.base/share/classes/java/lang/reflect/AnnotatedType.java
diff --git a/jdk/src/share/classes/java/lang/reflect/AnnotatedTypeVariable.java b/jdk/src/java.base/share/classes/java/lang/reflect/AnnotatedTypeVariable.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/reflect/AnnotatedTypeVariable.java
rename to jdk/src/java.base/share/classes/java/lang/reflect/AnnotatedTypeVariable.java
diff --git a/jdk/src/share/classes/java/lang/reflect/AnnotatedWildcardType.java b/jdk/src/java.base/share/classes/java/lang/reflect/AnnotatedWildcardType.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/reflect/AnnotatedWildcardType.java
rename to jdk/src/java.base/share/classes/java/lang/reflect/AnnotatedWildcardType.java
diff --git a/jdk/src/share/classes/java/lang/reflect/Array.java b/jdk/src/java.base/share/classes/java/lang/reflect/Array.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/reflect/Array.java
rename to jdk/src/java.base/share/classes/java/lang/reflect/Array.java
diff --git a/jdk/src/share/classes/java/lang/reflect/Constructor.java b/jdk/src/java.base/share/classes/java/lang/reflect/Constructor.java
similarity index 96%
rename from jdk/src/share/classes/java/lang/reflect/Constructor.java
rename to jdk/src/java.base/share/classes/java/lang/reflect/Constructor.java
index f424deec74a..4b112bf16b3 100644
--- a/jdk/src/share/classes/java/lang/reflect/Constructor.java
+++ b/jdk/src/java.base/share/classes/java/lang/reflect/Constructor.java
@@ -544,15 +544,33 @@ public final class Constructor extends Executable {
      */
     @Override
     public AnnotatedType getAnnotatedReceiverType() {
-        if (getDeclaringClass().getEnclosingClass() == null)
-            return super.getAnnotatedReceiverType();
+        Class thisDeclClass = getDeclaringClass();
+        Class enclosingClass = thisDeclClass.getEnclosingClass();
 
+        if (enclosingClass == null) {
+            // A Constructor for a top-level class
+            return null;
+        }
+
+        Class outerDeclaringClass = thisDeclClass.getDeclaringClass();
+        if (outerDeclaringClass == null) {
+            // A constructor for a local or anonymous class
+            return null;
+        }
+
+        // Either static nested or inner class
+        if (Modifier.isStatic(thisDeclClass.getModifiers())) {
+            // static nested
+            return null;
+        }
+
+        // A Constructor for an inner class
         return TypeAnnotationParser.buildAnnotatedType(getTypeAnnotationBytes0(),
                 sun.misc.SharedSecrets.getJavaLangAccess().
-                        getConstantPool(getDeclaringClass()),
+                    getConstantPool(thisDeclClass),
                 this,
-                getDeclaringClass(),
-                getDeclaringClass().getEnclosingClass(),
+                thisDeclClass,
+                enclosingClass,
                 TypeAnnotation.TypeAnnotationTarget.METHOD_RECEIVER);
     }
 }
diff --git a/jdk/src/share/classes/java/lang/reflect/Executable.java b/jdk/src/java.base/share/classes/java/lang/reflect/Executable.java
similarity index 96%
rename from jdk/src/share/classes/java/lang/reflect/Executable.java
rename to jdk/src/java.base/share/classes/java/lang/reflect/Executable.java
index 8493d10eaa4..99eb1eb8b90 100644
--- a/jdk/src/share/classes/java/lang/reflect/Executable.java
+++ b/jdk/src/java.base/share/classes/java/lang/reflect/Executable.java
@@ -585,21 +585,24 @@ public abstract class Executable extends AccessibleObject
     /**
      * Returns an {@code AnnotatedType} object that represents the use of a
      * type to specify the receiver type of the method/constructor represented
-     * by this Executable object. The receiver type of a method/constructor is
-     * available only if the method/constructor has a receiver
-     * parameter (JLS 8.4.1).
+     * by this {@code Executable} object.
      *
-     * If this {@code Executable} object represents a constructor or instance
-     * method that does not have a receiver parameter, or has a receiver
-     * parameter with no annotations on its type, then the return value is an
-     * {@code AnnotatedType} object representing an element with no
+     * The receiver type of a method/constructor is available only if the
+     * method/constructor has a receiver parameter (JLS 8.4.1). If this {@code
+     * Executable} object represents an instance method or represents a
+     * constructor of an inner member class, and the
+     * method/constructor either has no receiver parameter or has a
+     * receiver parameter with no annotations on its type, then the return
+     * value is an {@code AnnotatedType} object representing an element with no
      * annotations.
      *
-     * If this {@code Executable} object represents a static method, then the
-     * return value is null.
+     * If this {@code Executable} object represents a static method or
+     * represents a constructor of a top level, static member, local, or
+     * anoymous class, then the return value is null.
      *
      * @return an object representing the receiver type of the method or
-     * constructor represented by this {@code Executable}
+     * constructor represented by this {@code Executable} or {@code null} if
+     * this {@code Executable} can not have a receiver parameter
      */
     public AnnotatedType getAnnotatedReceiverType() {
         if (Modifier.isStatic(this.getModifiers()))
diff --git a/jdk/src/share/classes/java/lang/reflect/Field.java b/jdk/src/java.base/share/classes/java/lang/reflect/Field.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/reflect/Field.java
rename to jdk/src/java.base/share/classes/java/lang/reflect/Field.java
diff --git a/jdk/src/share/classes/java/lang/reflect/GenericArrayType.java b/jdk/src/java.base/share/classes/java/lang/reflect/GenericArrayType.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/reflect/GenericArrayType.java
rename to jdk/src/java.base/share/classes/java/lang/reflect/GenericArrayType.java
diff --git a/jdk/src/share/classes/java/lang/reflect/GenericDeclaration.java b/jdk/src/java.base/share/classes/java/lang/reflect/GenericDeclaration.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/reflect/GenericDeclaration.java
rename to jdk/src/java.base/share/classes/java/lang/reflect/GenericDeclaration.java
diff --git a/jdk/src/share/classes/java/lang/reflect/GenericSignatureFormatError.java b/jdk/src/java.base/share/classes/java/lang/reflect/GenericSignatureFormatError.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/reflect/GenericSignatureFormatError.java
rename to jdk/src/java.base/share/classes/java/lang/reflect/GenericSignatureFormatError.java
diff --git a/jdk/src/share/classes/java/lang/reflect/InvocationHandler.java b/jdk/src/java.base/share/classes/java/lang/reflect/InvocationHandler.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/reflect/InvocationHandler.java
rename to jdk/src/java.base/share/classes/java/lang/reflect/InvocationHandler.java
diff --git a/jdk/src/share/classes/java/lang/reflect/InvocationTargetException.java b/jdk/src/java.base/share/classes/java/lang/reflect/InvocationTargetException.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/reflect/InvocationTargetException.java
rename to jdk/src/java.base/share/classes/java/lang/reflect/InvocationTargetException.java
diff --git a/jdk/src/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java b/jdk/src/java.base/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java
rename to jdk/src/java.base/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java
diff --git a/jdk/src/share/classes/java/lang/reflect/MalformedParametersException.java b/jdk/src/java.base/share/classes/java/lang/reflect/MalformedParametersException.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/reflect/MalformedParametersException.java
rename to jdk/src/java.base/share/classes/java/lang/reflect/MalformedParametersException.java
diff --git a/jdk/src/share/classes/java/lang/reflect/Member.java b/jdk/src/java.base/share/classes/java/lang/reflect/Member.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/reflect/Member.java
rename to jdk/src/java.base/share/classes/java/lang/reflect/Member.java
diff --git a/jdk/src/share/classes/java/lang/reflect/Method.java b/jdk/src/java.base/share/classes/java/lang/reflect/Method.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/reflect/Method.java
rename to jdk/src/java.base/share/classes/java/lang/reflect/Method.java
diff --git a/jdk/src/share/classes/java/lang/reflect/Modifier.java b/jdk/src/java.base/share/classes/java/lang/reflect/Modifier.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/reflect/Modifier.java
rename to jdk/src/java.base/share/classes/java/lang/reflect/Modifier.java
diff --git a/jdk/src/share/classes/java/lang/reflect/Parameter.java b/jdk/src/java.base/share/classes/java/lang/reflect/Parameter.java
similarity index 99%
rename from jdk/src/share/classes/java/lang/reflect/Parameter.java
rename to jdk/src/java.base/share/classes/java/lang/reflect/Parameter.java
index f035b8e5e73..69c568f09fe 100644
--- a/jdk/src/share/classes/java/lang/reflect/Parameter.java
+++ b/jdk/src/java.base/share/classes/java/lang/reflect/Parameter.java
@@ -173,7 +173,7 @@ public final class Parameter implements AnnotatedElement {
      *         a name.
      */
     public String getName() {
-        // Note: empty strings as paramete names are now outlawed.
+        // Note: empty strings as parameter names are now outlawed.
         // The .equals("") is for compatibility with current JVM
         // behavior.  It may be removed at some point.
         if(name == null || name.equals(""))
diff --git a/jdk/src/share/classes/java/lang/reflect/ParameterizedType.java b/jdk/src/java.base/share/classes/java/lang/reflect/ParameterizedType.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/reflect/ParameterizedType.java
rename to jdk/src/java.base/share/classes/java/lang/reflect/ParameterizedType.java
diff --git a/jdk/src/share/classes/java/lang/reflect/Proxy.java b/jdk/src/java.base/share/classes/java/lang/reflect/Proxy.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/reflect/Proxy.java
rename to jdk/src/java.base/share/classes/java/lang/reflect/Proxy.java
diff --git a/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java b/jdk/src/java.base/share/classes/java/lang/reflect/ReflectAccess.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/reflect/ReflectAccess.java
rename to jdk/src/java.base/share/classes/java/lang/reflect/ReflectAccess.java
diff --git a/jdk/src/share/classes/java/lang/reflect/ReflectPermission.java b/jdk/src/java.base/share/classes/java/lang/reflect/ReflectPermission.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/reflect/ReflectPermission.java
rename to jdk/src/java.base/share/classes/java/lang/reflect/ReflectPermission.java
diff --git a/jdk/src/share/classes/java/lang/reflect/Type.java b/jdk/src/java.base/share/classes/java/lang/reflect/Type.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/reflect/Type.java
rename to jdk/src/java.base/share/classes/java/lang/reflect/Type.java
diff --git a/jdk/src/share/classes/java/lang/reflect/TypeVariable.java b/jdk/src/java.base/share/classes/java/lang/reflect/TypeVariable.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/reflect/TypeVariable.java
rename to jdk/src/java.base/share/classes/java/lang/reflect/TypeVariable.java
diff --git a/jdk/src/share/classes/java/lang/reflect/UndeclaredThrowableException.java b/jdk/src/java.base/share/classes/java/lang/reflect/UndeclaredThrowableException.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/reflect/UndeclaredThrowableException.java
rename to jdk/src/java.base/share/classes/java/lang/reflect/UndeclaredThrowableException.java
diff --git a/jdk/src/share/classes/java/lang/reflect/WeakCache.java b/jdk/src/java.base/share/classes/java/lang/reflect/WeakCache.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/reflect/WeakCache.java
rename to jdk/src/java.base/share/classes/java/lang/reflect/WeakCache.java
diff --git a/jdk/src/share/classes/java/lang/reflect/WildcardType.java b/jdk/src/java.base/share/classes/java/lang/reflect/WildcardType.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/reflect/WildcardType.java
rename to jdk/src/java.base/share/classes/java/lang/reflect/WildcardType.java
diff --git a/jdk/src/share/classes/java/lang/reflect/package-info.java b/jdk/src/java.base/share/classes/java/lang/reflect/package-info.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/reflect/package-info.java
rename to jdk/src/java.base/share/classes/java/lang/reflect/package-info.java
diff --git a/jdk/src/share/classes/java/math/BigDecimal.java b/jdk/src/java.base/share/classes/java/math/BigDecimal.java
similarity index 100%
rename from jdk/src/share/classes/java/math/BigDecimal.java
rename to jdk/src/java.base/share/classes/java/math/BigDecimal.java
diff --git a/jdk/src/share/classes/java/math/BigInteger.java b/jdk/src/java.base/share/classes/java/math/BigInteger.java
similarity index 100%
rename from jdk/src/share/classes/java/math/BigInteger.java
rename to jdk/src/java.base/share/classes/java/math/BigInteger.java
diff --git a/jdk/src/share/classes/java/math/BitSieve.java b/jdk/src/java.base/share/classes/java/math/BitSieve.java
similarity index 100%
rename from jdk/src/share/classes/java/math/BitSieve.java
rename to jdk/src/java.base/share/classes/java/math/BitSieve.java
diff --git a/jdk/src/share/classes/java/math/MathContext.java b/jdk/src/java.base/share/classes/java/math/MathContext.java
similarity index 100%
rename from jdk/src/share/classes/java/math/MathContext.java
rename to jdk/src/java.base/share/classes/java/math/MathContext.java
diff --git a/jdk/src/share/classes/java/math/MutableBigInteger.java b/jdk/src/java.base/share/classes/java/math/MutableBigInteger.java
similarity index 100%
rename from jdk/src/share/classes/java/math/MutableBigInteger.java
rename to jdk/src/java.base/share/classes/java/math/MutableBigInteger.java
diff --git a/jdk/src/share/classes/java/math/RoundingMode.java b/jdk/src/java.base/share/classes/java/math/RoundingMode.java
similarity index 100%
rename from jdk/src/share/classes/java/math/RoundingMode.java
rename to jdk/src/java.base/share/classes/java/math/RoundingMode.java
diff --git a/jdk/src/share/classes/java/math/SignedMutableBigInteger.java b/jdk/src/java.base/share/classes/java/math/SignedMutableBigInteger.java
similarity index 100%
rename from jdk/src/share/classes/java/math/SignedMutableBigInteger.java
rename to jdk/src/java.base/share/classes/java/math/SignedMutableBigInteger.java
diff --git a/jdk/src/share/classes/java/math/package-info.java b/jdk/src/java.base/share/classes/java/math/package-info.java
similarity index 100%
rename from jdk/src/share/classes/java/math/package-info.java
rename to jdk/src/java.base/share/classes/java/math/package-info.java
diff --git a/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java b/jdk/src/java.base/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
similarity index 100%
rename from jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
rename to jdk/src/java.base/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
diff --git a/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java b/jdk/src/java.base/share/classes/java/net/AbstractPlainSocketImpl.java
similarity index 100%
rename from jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
rename to jdk/src/java.base/share/classes/java/net/AbstractPlainSocketImpl.java
diff --git a/jdk/src/share/classes/java/net/Authenticator.java b/jdk/src/java.base/share/classes/java/net/Authenticator.java
similarity index 100%
rename from jdk/src/share/classes/java/net/Authenticator.java
rename to jdk/src/java.base/share/classes/java/net/Authenticator.java
diff --git a/jdk/src/share/classes/java/net/BindException.java b/jdk/src/java.base/share/classes/java/net/BindException.java
similarity index 100%
rename from jdk/src/share/classes/java/net/BindException.java
rename to jdk/src/java.base/share/classes/java/net/BindException.java
diff --git a/jdk/src/share/classes/java/net/CacheRequest.java b/jdk/src/java.base/share/classes/java/net/CacheRequest.java
similarity index 100%
rename from jdk/src/share/classes/java/net/CacheRequest.java
rename to jdk/src/java.base/share/classes/java/net/CacheRequest.java
diff --git a/jdk/src/share/classes/java/net/CacheResponse.java b/jdk/src/java.base/share/classes/java/net/CacheResponse.java
similarity index 100%
rename from jdk/src/share/classes/java/net/CacheResponse.java
rename to jdk/src/java.base/share/classes/java/net/CacheResponse.java
diff --git a/jdk/src/share/classes/java/net/ConnectException.java b/jdk/src/java.base/share/classes/java/net/ConnectException.java
similarity index 100%
rename from jdk/src/share/classes/java/net/ConnectException.java
rename to jdk/src/java.base/share/classes/java/net/ConnectException.java
diff --git a/jdk/src/share/classes/java/net/ContentHandler.java b/jdk/src/java.base/share/classes/java/net/ContentHandler.java
similarity index 100%
rename from jdk/src/share/classes/java/net/ContentHandler.java
rename to jdk/src/java.base/share/classes/java/net/ContentHandler.java
diff --git a/jdk/src/share/classes/java/net/ContentHandlerFactory.java b/jdk/src/java.base/share/classes/java/net/ContentHandlerFactory.java
similarity index 100%
rename from jdk/src/share/classes/java/net/ContentHandlerFactory.java
rename to jdk/src/java.base/share/classes/java/net/ContentHandlerFactory.java
diff --git a/jdk/src/share/classes/java/net/CookieHandler.java b/jdk/src/java.base/share/classes/java/net/CookieHandler.java
similarity index 100%
rename from jdk/src/share/classes/java/net/CookieHandler.java
rename to jdk/src/java.base/share/classes/java/net/CookieHandler.java
diff --git a/jdk/src/share/classes/java/net/CookieManager.java b/jdk/src/java.base/share/classes/java/net/CookieManager.java
similarity index 100%
rename from jdk/src/share/classes/java/net/CookieManager.java
rename to jdk/src/java.base/share/classes/java/net/CookieManager.java
diff --git a/jdk/src/share/classes/java/net/CookiePolicy.java b/jdk/src/java.base/share/classes/java/net/CookiePolicy.java
similarity index 100%
rename from jdk/src/share/classes/java/net/CookiePolicy.java
rename to jdk/src/java.base/share/classes/java/net/CookiePolicy.java
diff --git a/jdk/src/share/classes/java/net/CookieStore.java b/jdk/src/java.base/share/classes/java/net/CookieStore.java
similarity index 100%
rename from jdk/src/share/classes/java/net/CookieStore.java
rename to jdk/src/java.base/share/classes/java/net/CookieStore.java
diff --git a/jdk/src/share/classes/java/net/DatagramPacket.java b/jdk/src/java.base/share/classes/java/net/DatagramPacket.java
similarity index 100%
rename from jdk/src/share/classes/java/net/DatagramPacket.java
rename to jdk/src/java.base/share/classes/java/net/DatagramPacket.java
diff --git a/jdk/src/share/classes/java/net/DatagramSocket.java b/jdk/src/java.base/share/classes/java/net/DatagramSocket.java
similarity index 100%
rename from jdk/src/share/classes/java/net/DatagramSocket.java
rename to jdk/src/java.base/share/classes/java/net/DatagramSocket.java
diff --git a/jdk/src/share/classes/java/net/DatagramSocketImpl.java b/jdk/src/java.base/share/classes/java/net/DatagramSocketImpl.java
similarity index 100%
rename from jdk/src/share/classes/java/net/DatagramSocketImpl.java
rename to jdk/src/java.base/share/classes/java/net/DatagramSocketImpl.java
diff --git a/jdk/src/share/classes/java/net/DatagramSocketImplFactory.java b/jdk/src/java.base/share/classes/java/net/DatagramSocketImplFactory.java
similarity index 100%
rename from jdk/src/share/classes/java/net/DatagramSocketImplFactory.java
rename to jdk/src/java.base/share/classes/java/net/DatagramSocketImplFactory.java
diff --git a/jdk/src/share/classes/java/net/FileNameMap.java b/jdk/src/java.base/share/classes/java/net/FileNameMap.java
similarity index 100%
rename from jdk/src/share/classes/java/net/FileNameMap.java
rename to jdk/src/java.base/share/classes/java/net/FileNameMap.java
diff --git a/jdk/src/share/classes/java/net/HostPortrange.java b/jdk/src/java.base/share/classes/java/net/HostPortrange.java
similarity index 100%
rename from jdk/src/share/classes/java/net/HostPortrange.java
rename to jdk/src/java.base/share/classes/java/net/HostPortrange.java
diff --git a/jdk/src/share/classes/java/net/HttpConnectSocketImpl.java b/jdk/src/java.base/share/classes/java/net/HttpConnectSocketImpl.java
similarity index 100%
rename from jdk/src/share/classes/java/net/HttpConnectSocketImpl.java
rename to jdk/src/java.base/share/classes/java/net/HttpConnectSocketImpl.java
diff --git a/jdk/src/share/classes/java/net/HttpCookie.java b/jdk/src/java.base/share/classes/java/net/HttpCookie.java
similarity index 100%
rename from jdk/src/share/classes/java/net/HttpCookie.java
rename to jdk/src/java.base/share/classes/java/net/HttpCookie.java
diff --git a/jdk/src/share/classes/java/net/HttpRetryException.java b/jdk/src/java.base/share/classes/java/net/HttpRetryException.java
similarity index 100%
rename from jdk/src/share/classes/java/net/HttpRetryException.java
rename to jdk/src/java.base/share/classes/java/net/HttpRetryException.java
diff --git a/jdk/src/share/classes/java/net/HttpURLConnection.java b/jdk/src/java.base/share/classes/java/net/HttpURLConnection.java
similarity index 100%
rename from jdk/src/share/classes/java/net/HttpURLConnection.java
rename to jdk/src/java.base/share/classes/java/net/HttpURLConnection.java
diff --git a/jdk/src/share/classes/java/net/IDN.java b/jdk/src/java.base/share/classes/java/net/IDN.java
similarity index 100%
rename from jdk/src/share/classes/java/net/IDN.java
rename to jdk/src/java.base/share/classes/java/net/IDN.java
diff --git a/jdk/src/share/classes/java/net/InMemoryCookieStore.java b/jdk/src/java.base/share/classes/java/net/InMemoryCookieStore.java
similarity index 100%
rename from jdk/src/share/classes/java/net/InMemoryCookieStore.java
rename to jdk/src/java.base/share/classes/java/net/InMemoryCookieStore.java
diff --git a/jdk/src/share/classes/java/net/Inet4Address.java b/jdk/src/java.base/share/classes/java/net/Inet4Address.java
similarity index 100%
rename from jdk/src/share/classes/java/net/Inet4Address.java
rename to jdk/src/java.base/share/classes/java/net/Inet4Address.java
diff --git a/jdk/src/share/classes/java/net/Inet4AddressImpl.java b/jdk/src/java.base/share/classes/java/net/Inet4AddressImpl.java
similarity index 100%
rename from jdk/src/share/classes/java/net/Inet4AddressImpl.java
rename to jdk/src/java.base/share/classes/java/net/Inet4AddressImpl.java
diff --git a/jdk/src/share/classes/java/net/Inet6Address.java b/jdk/src/java.base/share/classes/java/net/Inet6Address.java
similarity index 100%
rename from jdk/src/share/classes/java/net/Inet6Address.java
rename to jdk/src/java.base/share/classes/java/net/Inet6Address.java
diff --git a/jdk/src/share/classes/java/net/Inet6AddressImpl.java b/jdk/src/java.base/share/classes/java/net/Inet6AddressImpl.java
similarity index 100%
rename from jdk/src/share/classes/java/net/Inet6AddressImpl.java
rename to jdk/src/java.base/share/classes/java/net/Inet6AddressImpl.java
diff --git a/jdk/src/share/classes/java/net/InetAddress.java b/jdk/src/java.base/share/classes/java/net/InetAddress.java
similarity index 100%
rename from jdk/src/share/classes/java/net/InetAddress.java
rename to jdk/src/java.base/share/classes/java/net/InetAddress.java
diff --git a/jdk/src/share/classes/java/net/InetAddressContainer.java b/jdk/src/java.base/share/classes/java/net/InetAddressContainer.java
similarity index 100%
rename from jdk/src/share/classes/java/net/InetAddressContainer.java
rename to jdk/src/java.base/share/classes/java/net/InetAddressContainer.java
diff --git a/jdk/src/share/classes/java/net/InetAddressImpl.java b/jdk/src/java.base/share/classes/java/net/InetAddressImpl.java
similarity index 100%
rename from jdk/src/share/classes/java/net/InetAddressImpl.java
rename to jdk/src/java.base/share/classes/java/net/InetAddressImpl.java
diff --git a/jdk/src/share/classes/java/net/InetSocketAddress.java b/jdk/src/java.base/share/classes/java/net/InetSocketAddress.java
similarity index 100%
rename from jdk/src/share/classes/java/net/InetSocketAddress.java
rename to jdk/src/java.base/share/classes/java/net/InetSocketAddress.java
diff --git a/jdk/src/share/classes/java/net/InterfaceAddress.java b/jdk/src/java.base/share/classes/java/net/InterfaceAddress.java
similarity index 100%
rename from jdk/src/share/classes/java/net/InterfaceAddress.java
rename to jdk/src/java.base/share/classes/java/net/InterfaceAddress.java
diff --git a/jdk/src/share/classes/java/net/JarURLConnection.java b/jdk/src/java.base/share/classes/java/net/JarURLConnection.java
similarity index 100%
rename from jdk/src/share/classes/java/net/JarURLConnection.java
rename to jdk/src/java.base/share/classes/java/net/JarURLConnection.java
diff --git a/jdk/src/share/classes/java/net/MalformedURLException.java b/jdk/src/java.base/share/classes/java/net/MalformedURLException.java
similarity index 100%
rename from jdk/src/share/classes/java/net/MalformedURLException.java
rename to jdk/src/java.base/share/classes/java/net/MalformedURLException.java
diff --git a/jdk/src/share/classes/java/net/MulticastSocket.java b/jdk/src/java.base/share/classes/java/net/MulticastSocket.java
similarity index 100%
rename from jdk/src/share/classes/java/net/MulticastSocket.java
rename to jdk/src/java.base/share/classes/java/net/MulticastSocket.java
diff --git a/jdk/src/share/classes/java/net/NetPermission.java b/jdk/src/java.base/share/classes/java/net/NetPermission.java
similarity index 100%
rename from jdk/src/share/classes/java/net/NetPermission.java
rename to jdk/src/java.base/share/classes/java/net/NetPermission.java
diff --git a/jdk/src/share/classes/java/net/NetworkInterface.java b/jdk/src/java.base/share/classes/java/net/NetworkInterface.java
similarity index 100%
rename from jdk/src/share/classes/java/net/NetworkInterface.java
rename to jdk/src/java.base/share/classes/java/net/NetworkInterface.java
diff --git a/jdk/src/share/classes/java/net/NoRouteToHostException.java b/jdk/src/java.base/share/classes/java/net/NoRouteToHostException.java
similarity index 100%
rename from jdk/src/share/classes/java/net/NoRouteToHostException.java
rename to jdk/src/java.base/share/classes/java/net/NoRouteToHostException.java
diff --git a/jdk/src/share/classes/java/net/PasswordAuthentication.java b/jdk/src/java.base/share/classes/java/net/PasswordAuthentication.java
similarity index 100%
rename from jdk/src/share/classes/java/net/PasswordAuthentication.java
rename to jdk/src/java.base/share/classes/java/net/PasswordAuthentication.java
diff --git a/jdk/src/share/classes/java/net/PortUnreachableException.java b/jdk/src/java.base/share/classes/java/net/PortUnreachableException.java
similarity index 100%
rename from jdk/src/share/classes/java/net/PortUnreachableException.java
rename to jdk/src/java.base/share/classes/java/net/PortUnreachableException.java
diff --git a/jdk/src/share/classes/java/net/ProtocolException.java b/jdk/src/java.base/share/classes/java/net/ProtocolException.java
similarity index 100%
rename from jdk/src/share/classes/java/net/ProtocolException.java
rename to jdk/src/java.base/share/classes/java/net/ProtocolException.java
diff --git a/jdk/src/share/classes/java/net/ProtocolFamily.java b/jdk/src/java.base/share/classes/java/net/ProtocolFamily.java
similarity index 100%
rename from jdk/src/share/classes/java/net/ProtocolFamily.java
rename to jdk/src/java.base/share/classes/java/net/ProtocolFamily.java
diff --git a/jdk/src/share/classes/java/net/Proxy.java b/jdk/src/java.base/share/classes/java/net/Proxy.java
similarity index 100%
rename from jdk/src/share/classes/java/net/Proxy.java
rename to jdk/src/java.base/share/classes/java/net/Proxy.java
diff --git a/jdk/src/share/classes/java/net/ProxySelector.java b/jdk/src/java.base/share/classes/java/net/ProxySelector.java
similarity index 100%
rename from jdk/src/share/classes/java/net/ProxySelector.java
rename to jdk/src/java.base/share/classes/java/net/ProxySelector.java
diff --git a/jdk/src/share/classes/java/net/ResponseCache.java b/jdk/src/java.base/share/classes/java/net/ResponseCache.java
similarity index 100%
rename from jdk/src/share/classes/java/net/ResponseCache.java
rename to jdk/src/java.base/share/classes/java/net/ResponseCache.java
diff --git a/jdk/src/share/classes/java/net/SecureCacheResponse.java b/jdk/src/java.base/share/classes/java/net/SecureCacheResponse.java
similarity index 100%
rename from jdk/src/share/classes/java/net/SecureCacheResponse.java
rename to jdk/src/java.base/share/classes/java/net/SecureCacheResponse.java
diff --git a/jdk/src/share/classes/java/net/ServerSocket.java b/jdk/src/java.base/share/classes/java/net/ServerSocket.java
similarity index 100%
rename from jdk/src/share/classes/java/net/ServerSocket.java
rename to jdk/src/java.base/share/classes/java/net/ServerSocket.java
diff --git a/jdk/src/share/classes/java/net/Socket.java b/jdk/src/java.base/share/classes/java/net/Socket.java
similarity index 100%
rename from jdk/src/share/classes/java/net/Socket.java
rename to jdk/src/java.base/share/classes/java/net/Socket.java
diff --git a/jdk/src/share/classes/java/net/SocketAddress.java b/jdk/src/java.base/share/classes/java/net/SocketAddress.java
similarity index 100%
rename from jdk/src/share/classes/java/net/SocketAddress.java
rename to jdk/src/java.base/share/classes/java/net/SocketAddress.java
diff --git a/jdk/src/share/classes/java/net/SocketException.java b/jdk/src/java.base/share/classes/java/net/SocketException.java
similarity index 100%
rename from jdk/src/share/classes/java/net/SocketException.java
rename to jdk/src/java.base/share/classes/java/net/SocketException.java
diff --git a/jdk/src/share/classes/java/net/SocketImpl.java b/jdk/src/java.base/share/classes/java/net/SocketImpl.java
similarity index 100%
rename from jdk/src/share/classes/java/net/SocketImpl.java
rename to jdk/src/java.base/share/classes/java/net/SocketImpl.java
diff --git a/jdk/src/share/classes/java/net/SocketImplFactory.java b/jdk/src/java.base/share/classes/java/net/SocketImplFactory.java
similarity index 100%
rename from jdk/src/share/classes/java/net/SocketImplFactory.java
rename to jdk/src/java.base/share/classes/java/net/SocketImplFactory.java
diff --git a/jdk/src/share/classes/java/net/SocketInputStream.java b/jdk/src/java.base/share/classes/java/net/SocketInputStream.java
similarity index 100%
rename from jdk/src/share/classes/java/net/SocketInputStream.java
rename to jdk/src/java.base/share/classes/java/net/SocketInputStream.java
diff --git a/jdk/src/share/classes/java/net/SocketOption.java b/jdk/src/java.base/share/classes/java/net/SocketOption.java
similarity index 100%
rename from jdk/src/share/classes/java/net/SocketOption.java
rename to jdk/src/java.base/share/classes/java/net/SocketOption.java
diff --git a/jdk/src/share/classes/java/net/SocketOptions.java b/jdk/src/java.base/share/classes/java/net/SocketOptions.java
similarity index 100%
rename from jdk/src/share/classes/java/net/SocketOptions.java
rename to jdk/src/java.base/share/classes/java/net/SocketOptions.java
diff --git a/jdk/src/share/classes/java/net/SocketOutputStream.java b/jdk/src/java.base/share/classes/java/net/SocketOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/java/net/SocketOutputStream.java
rename to jdk/src/java.base/share/classes/java/net/SocketOutputStream.java
diff --git a/jdk/src/share/classes/java/net/SocketPermission.java b/jdk/src/java.base/share/classes/java/net/SocketPermission.java
similarity index 100%
rename from jdk/src/share/classes/java/net/SocketPermission.java
rename to jdk/src/java.base/share/classes/java/net/SocketPermission.java
diff --git a/jdk/src/share/classes/java/net/SocketTimeoutException.java b/jdk/src/java.base/share/classes/java/net/SocketTimeoutException.java
similarity index 100%
rename from jdk/src/share/classes/java/net/SocketTimeoutException.java
rename to jdk/src/java.base/share/classes/java/net/SocketTimeoutException.java
diff --git a/jdk/src/share/classes/java/net/SocksConsts.java b/jdk/src/java.base/share/classes/java/net/SocksConsts.java
similarity index 100%
rename from jdk/src/share/classes/java/net/SocksConsts.java
rename to jdk/src/java.base/share/classes/java/net/SocksConsts.java
diff --git a/jdk/src/share/classes/java/net/SocksSocketImpl.java b/jdk/src/java.base/share/classes/java/net/SocksSocketImpl.java
similarity index 100%
rename from jdk/src/share/classes/java/net/SocksSocketImpl.java
rename to jdk/src/java.base/share/classes/java/net/SocksSocketImpl.java
diff --git a/jdk/src/share/classes/java/net/StandardProtocolFamily.java b/jdk/src/java.base/share/classes/java/net/StandardProtocolFamily.java
similarity index 100%
rename from jdk/src/share/classes/java/net/StandardProtocolFamily.java
rename to jdk/src/java.base/share/classes/java/net/StandardProtocolFamily.java
diff --git a/jdk/src/share/classes/java/net/StandardSocketOptions.java b/jdk/src/java.base/share/classes/java/net/StandardSocketOptions.java
similarity index 100%
rename from jdk/src/share/classes/java/net/StandardSocketOptions.java
rename to jdk/src/java.base/share/classes/java/net/StandardSocketOptions.java
diff --git a/jdk/src/share/classes/java/net/URI.java b/jdk/src/java.base/share/classes/java/net/URI.java
similarity index 100%
rename from jdk/src/share/classes/java/net/URI.java
rename to jdk/src/java.base/share/classes/java/net/URI.java
diff --git a/jdk/src/share/classes/java/net/URISyntaxException.java b/jdk/src/java.base/share/classes/java/net/URISyntaxException.java
similarity index 100%
rename from jdk/src/share/classes/java/net/URISyntaxException.java
rename to jdk/src/java.base/share/classes/java/net/URISyntaxException.java
diff --git a/jdk/src/share/classes/java/net/URL.java b/jdk/src/java.base/share/classes/java/net/URL.java
similarity index 100%
rename from jdk/src/share/classes/java/net/URL.java
rename to jdk/src/java.base/share/classes/java/net/URL.java
diff --git a/jdk/src/share/classes/java/net/URLClassLoader.java b/jdk/src/java.base/share/classes/java/net/URLClassLoader.java
similarity index 100%
rename from jdk/src/share/classes/java/net/URLClassLoader.java
rename to jdk/src/java.base/share/classes/java/net/URLClassLoader.java
diff --git a/jdk/src/share/classes/java/net/URLConnection.java b/jdk/src/java.base/share/classes/java/net/URLConnection.java
similarity index 100%
rename from jdk/src/share/classes/java/net/URLConnection.java
rename to jdk/src/java.base/share/classes/java/net/URLConnection.java
diff --git a/jdk/src/share/classes/java/net/URLDecoder.java b/jdk/src/java.base/share/classes/java/net/URLDecoder.java
similarity index 100%
rename from jdk/src/share/classes/java/net/URLDecoder.java
rename to jdk/src/java.base/share/classes/java/net/URLDecoder.java
diff --git a/jdk/src/share/classes/java/net/URLEncoder.java b/jdk/src/java.base/share/classes/java/net/URLEncoder.java
similarity index 100%
rename from jdk/src/share/classes/java/net/URLEncoder.java
rename to jdk/src/java.base/share/classes/java/net/URLEncoder.java
diff --git a/jdk/src/share/classes/java/net/URLPermission.java b/jdk/src/java.base/share/classes/java/net/URLPermission.java
similarity index 100%
rename from jdk/src/share/classes/java/net/URLPermission.java
rename to jdk/src/java.base/share/classes/java/net/URLPermission.java
diff --git a/jdk/src/share/classes/java/net/URLStreamHandler.java b/jdk/src/java.base/share/classes/java/net/URLStreamHandler.java
similarity index 100%
rename from jdk/src/share/classes/java/net/URLStreamHandler.java
rename to jdk/src/java.base/share/classes/java/net/URLStreamHandler.java
diff --git a/jdk/src/share/classes/java/net/URLStreamHandlerFactory.java b/jdk/src/java.base/share/classes/java/net/URLStreamHandlerFactory.java
similarity index 100%
rename from jdk/src/share/classes/java/net/URLStreamHandlerFactory.java
rename to jdk/src/java.base/share/classes/java/net/URLStreamHandlerFactory.java
diff --git a/jdk/src/share/classes/java/net/UnknownHostException.java b/jdk/src/java.base/share/classes/java/net/UnknownHostException.java
similarity index 100%
rename from jdk/src/share/classes/java/net/UnknownHostException.java
rename to jdk/src/java.base/share/classes/java/net/UnknownHostException.java
diff --git a/jdk/src/share/classes/java/net/UnknownServiceException.java b/jdk/src/java.base/share/classes/java/net/UnknownServiceException.java
similarity index 100%
rename from jdk/src/share/classes/java/net/UnknownServiceException.java
rename to jdk/src/java.base/share/classes/java/net/UnknownServiceException.java
diff --git a/jdk/src/share/classes/java/net/doc-files/net-properties.html b/jdk/src/java.base/share/classes/java/net/doc-files/net-properties.html
similarity index 100%
rename from jdk/src/share/classes/java/net/doc-files/net-properties.html
rename to jdk/src/java.base/share/classes/java/net/doc-files/net-properties.html
diff --git a/jdk/src/share/classes/java/net/package-info.java b/jdk/src/java.base/share/classes/java/net/package-info.java
similarity index 100%
rename from jdk/src/share/classes/java/net/package-info.java
rename to jdk/src/java.base/share/classes/java/net/package-info.java
diff --git a/jdk/src/share/classes/java/nio/Bits.java b/jdk/src/java.base/share/classes/java/nio/Bits.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/Bits.java
rename to jdk/src/java.base/share/classes/java/nio/Bits.java
diff --git a/jdk/src/share/classes/java/nio/Buffer.java b/jdk/src/java.base/share/classes/java/nio/Buffer.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/Buffer.java
rename to jdk/src/java.base/share/classes/java/nio/Buffer.java
diff --git a/jdk/src/share/classes/java/nio/ByteBufferAs-X-Buffer.java.template b/jdk/src/java.base/share/classes/java/nio/ByteBufferAs-X-Buffer.java.template
similarity index 100%
rename from jdk/src/share/classes/java/nio/ByteBufferAs-X-Buffer.java.template
rename to jdk/src/java.base/share/classes/java/nio/ByteBufferAs-X-Buffer.java.template
diff --git a/jdk/src/share/classes/java/nio/ByteOrder.java b/jdk/src/java.base/share/classes/java/nio/ByteOrder.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/ByteOrder.java
rename to jdk/src/java.base/share/classes/java/nio/ByteOrder.java
diff --git a/jdk/src/share/classes/java/nio/CharBufferSpliterator.java b/jdk/src/java.base/share/classes/java/nio/CharBufferSpliterator.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/CharBufferSpliterator.java
rename to jdk/src/java.base/share/classes/java/nio/CharBufferSpliterator.java
diff --git a/jdk/src/share/classes/java/nio/Direct-X-Buffer-bin.java.template b/jdk/src/java.base/share/classes/java/nio/Direct-X-Buffer-bin.java.template
similarity index 100%
rename from jdk/src/share/classes/java/nio/Direct-X-Buffer-bin.java.template
rename to jdk/src/java.base/share/classes/java/nio/Direct-X-Buffer-bin.java.template
diff --git a/jdk/src/share/classes/java/nio/Direct-X-Buffer.java.template b/jdk/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template
similarity index 100%
rename from jdk/src/share/classes/java/nio/Direct-X-Buffer.java.template
rename to jdk/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template
diff --git a/jdk/src/share/classes/java/nio/Heap-X-Buffer.java.template b/jdk/src/java.base/share/classes/java/nio/Heap-X-Buffer.java.template
similarity index 100%
rename from jdk/src/share/classes/java/nio/Heap-X-Buffer.java.template
rename to jdk/src/java.base/share/classes/java/nio/Heap-X-Buffer.java.template
diff --git a/jdk/src/share/classes/java/nio/MappedByteBuffer.java b/jdk/src/java.base/share/classes/java/nio/MappedByteBuffer.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/MappedByteBuffer.java
rename to jdk/src/java.base/share/classes/java/nio/MappedByteBuffer.java
diff --git a/jdk/src/share/classes/java/nio/StringCharBuffer.java b/jdk/src/java.base/share/classes/java/nio/StringCharBuffer.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/StringCharBuffer.java
rename to jdk/src/java.base/share/classes/java/nio/StringCharBuffer.java
diff --git a/jdk/src/share/classes/java/nio/X-Buffer-bin.java.template b/jdk/src/java.base/share/classes/java/nio/X-Buffer-bin.java.template
similarity index 100%
rename from jdk/src/share/classes/java/nio/X-Buffer-bin.java.template
rename to jdk/src/java.base/share/classes/java/nio/X-Buffer-bin.java.template
diff --git a/jdk/src/share/classes/java/nio/X-Buffer.java.template b/jdk/src/java.base/share/classes/java/nio/X-Buffer.java.template
similarity index 100%
rename from jdk/src/share/classes/java/nio/X-Buffer.java.template
rename to jdk/src/java.base/share/classes/java/nio/X-Buffer.java.template
diff --git a/jdk/src/share/classes/java/nio/channels/AsynchronousByteChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/AsynchronousByteChannel.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/AsynchronousByteChannel.java
rename to jdk/src/java.base/share/classes/java/nio/channels/AsynchronousByteChannel.java
diff --git a/jdk/src/share/classes/java/nio/channels/AsynchronousChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/AsynchronousChannel.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/AsynchronousChannel.java
rename to jdk/src/java.base/share/classes/java/nio/channels/AsynchronousChannel.java
diff --git a/jdk/src/share/classes/java/nio/channels/AsynchronousChannelGroup.java b/jdk/src/java.base/share/classes/java/nio/channels/AsynchronousChannelGroup.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/AsynchronousChannelGroup.java
rename to jdk/src/java.base/share/classes/java/nio/channels/AsynchronousChannelGroup.java
diff --git a/jdk/src/share/classes/java/nio/channels/AsynchronousFileChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/AsynchronousFileChannel.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/AsynchronousFileChannel.java
rename to jdk/src/java.base/share/classes/java/nio/channels/AsynchronousFileChannel.java
diff --git a/jdk/src/share/classes/java/nio/channels/AsynchronousServerSocketChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/AsynchronousServerSocketChannel.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/AsynchronousServerSocketChannel.java
rename to jdk/src/java.base/share/classes/java/nio/channels/AsynchronousServerSocketChannel.java
diff --git a/jdk/src/share/classes/java/nio/channels/AsynchronousSocketChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/AsynchronousSocketChannel.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/AsynchronousSocketChannel.java
rename to jdk/src/java.base/share/classes/java/nio/channels/AsynchronousSocketChannel.java
diff --git a/jdk/src/share/classes/java/nio/channels/ByteChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/ByteChannel.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/ByteChannel.java
rename to jdk/src/java.base/share/classes/java/nio/channels/ByteChannel.java
diff --git a/jdk/src/share/classes/java/nio/channels/Channel.java b/jdk/src/java.base/share/classes/java/nio/channels/Channel.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/Channel.java
rename to jdk/src/java.base/share/classes/java/nio/channels/Channel.java
diff --git a/jdk/src/share/classes/java/nio/channels/Channels.java b/jdk/src/java.base/share/classes/java/nio/channels/Channels.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/Channels.java
rename to jdk/src/java.base/share/classes/java/nio/channels/Channels.java
diff --git a/jdk/src/share/classes/java/nio/channels/CompletionHandler.java b/jdk/src/java.base/share/classes/java/nio/channels/CompletionHandler.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/CompletionHandler.java
rename to jdk/src/java.base/share/classes/java/nio/channels/CompletionHandler.java
diff --git a/jdk/src/share/classes/java/nio/channels/DatagramChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/DatagramChannel.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/DatagramChannel.java
rename to jdk/src/java.base/share/classes/java/nio/channels/DatagramChannel.java
diff --git a/jdk/src/share/classes/java/nio/channels/FileChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/FileChannel.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/FileChannel.java
rename to jdk/src/java.base/share/classes/java/nio/channels/FileChannel.java
diff --git a/jdk/src/share/classes/java/nio/channels/FileLock.java b/jdk/src/java.base/share/classes/java/nio/channels/FileLock.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/FileLock.java
rename to jdk/src/java.base/share/classes/java/nio/channels/FileLock.java
diff --git a/jdk/src/share/classes/java/nio/channels/GatheringByteChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/GatheringByteChannel.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/GatheringByteChannel.java
rename to jdk/src/java.base/share/classes/java/nio/channels/GatheringByteChannel.java
diff --git a/jdk/src/share/classes/java/nio/channels/InterruptibleChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/InterruptibleChannel.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/InterruptibleChannel.java
rename to jdk/src/java.base/share/classes/java/nio/channels/InterruptibleChannel.java
diff --git a/jdk/src/share/classes/java/nio/channels/MembershipKey.java b/jdk/src/java.base/share/classes/java/nio/channels/MembershipKey.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/MembershipKey.java
rename to jdk/src/java.base/share/classes/java/nio/channels/MembershipKey.java
diff --git a/jdk/src/share/classes/java/nio/channels/MulticastChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/MulticastChannel.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/MulticastChannel.java
rename to jdk/src/java.base/share/classes/java/nio/channels/MulticastChannel.java
diff --git a/jdk/src/share/classes/java/nio/channels/NetworkChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/NetworkChannel.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/NetworkChannel.java
rename to jdk/src/java.base/share/classes/java/nio/channels/NetworkChannel.java
diff --git a/jdk/src/share/classes/java/nio/channels/Pipe.java b/jdk/src/java.base/share/classes/java/nio/channels/Pipe.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/Pipe.java
rename to jdk/src/java.base/share/classes/java/nio/channels/Pipe.java
diff --git a/jdk/src/share/classes/java/nio/channels/ReadableByteChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/ReadableByteChannel.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/ReadableByteChannel.java
rename to jdk/src/java.base/share/classes/java/nio/channels/ReadableByteChannel.java
diff --git a/jdk/src/share/classes/java/nio/channels/ScatteringByteChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/ScatteringByteChannel.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/ScatteringByteChannel.java
rename to jdk/src/java.base/share/classes/java/nio/channels/ScatteringByteChannel.java
diff --git a/jdk/src/share/classes/java/nio/channels/SeekableByteChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/SeekableByteChannel.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/SeekableByteChannel.java
rename to jdk/src/java.base/share/classes/java/nio/channels/SeekableByteChannel.java
diff --git a/jdk/src/share/classes/java/nio/channels/SelectableChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/SelectableChannel.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/SelectableChannel.java
rename to jdk/src/java.base/share/classes/java/nio/channels/SelectableChannel.java
diff --git a/jdk/src/share/classes/java/nio/channels/SelectionKey.java b/jdk/src/java.base/share/classes/java/nio/channels/SelectionKey.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/SelectionKey.java
rename to jdk/src/java.base/share/classes/java/nio/channels/SelectionKey.java
diff --git a/jdk/src/share/classes/java/nio/channels/Selector.java b/jdk/src/java.base/share/classes/java/nio/channels/Selector.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/Selector.java
rename to jdk/src/java.base/share/classes/java/nio/channels/Selector.java
diff --git a/jdk/src/share/classes/java/nio/channels/ServerSocketChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/ServerSocketChannel.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/ServerSocketChannel.java
rename to jdk/src/java.base/share/classes/java/nio/channels/ServerSocketChannel.java
diff --git a/jdk/src/share/classes/java/nio/channels/SocketChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/SocketChannel.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/SocketChannel.java
rename to jdk/src/java.base/share/classes/java/nio/channels/SocketChannel.java
diff --git a/jdk/src/share/classes/java/nio/channels/WritableByteChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/WritableByteChannel.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/WritableByteChannel.java
rename to jdk/src/java.base/share/classes/java/nio/channels/WritableByteChannel.java
diff --git a/jdk/src/share/classes/java/nio/channels/exceptions b/jdk/src/java.base/share/classes/java/nio/channels/exceptions
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/exceptions
rename to jdk/src/java.base/share/classes/java/nio/channels/exceptions
diff --git a/jdk/src/share/classes/java/nio/channels/package-info.java b/jdk/src/java.base/share/classes/java/nio/channels/package-info.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/package-info.java
rename to jdk/src/java.base/share/classes/java/nio/channels/package-info.java
diff --git a/jdk/src/share/classes/java/nio/channels/spi/AbstractInterruptibleChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/spi/AbstractInterruptibleChannel.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/spi/AbstractInterruptibleChannel.java
rename to jdk/src/java.base/share/classes/java/nio/channels/spi/AbstractInterruptibleChannel.java
diff --git a/jdk/src/share/classes/java/nio/channels/spi/AbstractSelectableChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/spi/AbstractSelectableChannel.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/spi/AbstractSelectableChannel.java
rename to jdk/src/java.base/share/classes/java/nio/channels/spi/AbstractSelectableChannel.java
diff --git a/jdk/src/share/classes/java/nio/channels/spi/AbstractSelectionKey.java b/jdk/src/java.base/share/classes/java/nio/channels/spi/AbstractSelectionKey.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/spi/AbstractSelectionKey.java
rename to jdk/src/java.base/share/classes/java/nio/channels/spi/AbstractSelectionKey.java
diff --git a/jdk/src/share/classes/java/nio/channels/spi/AbstractSelector.java b/jdk/src/java.base/share/classes/java/nio/channels/spi/AbstractSelector.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/spi/AbstractSelector.java
rename to jdk/src/java.base/share/classes/java/nio/channels/spi/AbstractSelector.java
diff --git a/jdk/src/share/classes/java/nio/channels/spi/AsynchronousChannelProvider.java b/jdk/src/java.base/share/classes/java/nio/channels/spi/AsynchronousChannelProvider.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/spi/AsynchronousChannelProvider.java
rename to jdk/src/java.base/share/classes/java/nio/channels/spi/AsynchronousChannelProvider.java
diff --git a/jdk/src/share/classes/java/nio/channels/spi/SelectorProvider.java b/jdk/src/java.base/share/classes/java/nio/channels/spi/SelectorProvider.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/spi/SelectorProvider.java
rename to jdk/src/java.base/share/classes/java/nio/channels/spi/SelectorProvider.java
diff --git a/jdk/src/share/classes/java/nio/channels/spi/package.html b/jdk/src/java.base/share/classes/java/nio/channels/spi/package.html
similarity index 100%
rename from jdk/src/share/classes/java/nio/channels/spi/package.html
rename to jdk/src/java.base/share/classes/java/nio/channels/spi/package.html
diff --git a/jdk/src/share/classes/java/nio/charset/Charset-X-Coder.java.template b/jdk/src/java.base/share/classes/java/nio/charset/Charset-X-Coder.java.template
similarity index 100%
rename from jdk/src/share/classes/java/nio/charset/Charset-X-Coder.java.template
rename to jdk/src/java.base/share/classes/java/nio/charset/Charset-X-Coder.java.template
diff --git a/jdk/src/share/classes/java/nio/charset/Charset.java b/jdk/src/java.base/share/classes/java/nio/charset/Charset.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/charset/Charset.java
rename to jdk/src/java.base/share/classes/java/nio/charset/Charset.java
diff --git a/jdk/src/share/classes/java/nio/charset/CoderMalfunctionError.java b/jdk/src/java.base/share/classes/java/nio/charset/CoderMalfunctionError.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/charset/CoderMalfunctionError.java
rename to jdk/src/java.base/share/classes/java/nio/charset/CoderMalfunctionError.java
diff --git a/jdk/src/share/classes/java/nio/charset/CoderResult.java b/jdk/src/java.base/share/classes/java/nio/charset/CoderResult.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/charset/CoderResult.java
rename to jdk/src/java.base/share/classes/java/nio/charset/CoderResult.java
diff --git a/jdk/src/share/classes/java/nio/charset/CodingErrorAction.java b/jdk/src/java.base/share/classes/java/nio/charset/CodingErrorAction.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/charset/CodingErrorAction.java
rename to jdk/src/java.base/share/classes/java/nio/charset/CodingErrorAction.java
diff --git a/jdk/src/share/classes/java/nio/charset/MalformedInputException.java b/jdk/src/java.base/share/classes/java/nio/charset/MalformedInputException.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/charset/MalformedInputException.java
rename to jdk/src/java.base/share/classes/java/nio/charset/MalformedInputException.java
diff --git a/jdk/src/share/classes/java/nio/charset/StandardCharsets.java b/jdk/src/java.base/share/classes/java/nio/charset/StandardCharsets.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/charset/StandardCharsets.java
rename to jdk/src/java.base/share/classes/java/nio/charset/StandardCharsets.java
diff --git a/jdk/src/share/classes/java/nio/charset/UnmappableCharacterException.java b/jdk/src/java.base/share/classes/java/nio/charset/UnmappableCharacterException.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/charset/UnmappableCharacterException.java
rename to jdk/src/java.base/share/classes/java/nio/charset/UnmappableCharacterException.java
diff --git a/jdk/src/share/classes/java/nio/charset/exceptions b/jdk/src/java.base/share/classes/java/nio/charset/exceptions
similarity index 100%
rename from jdk/src/share/classes/java/nio/charset/exceptions
rename to jdk/src/java.base/share/classes/java/nio/charset/exceptions
diff --git a/jdk/src/share/classes/java/nio/charset/package.html b/jdk/src/java.base/share/classes/java/nio/charset/package.html
similarity index 100%
rename from jdk/src/share/classes/java/nio/charset/package.html
rename to jdk/src/java.base/share/classes/java/nio/charset/package.html
diff --git a/jdk/src/share/classes/java/nio/charset/spi/CharsetProvider.java b/jdk/src/java.base/share/classes/java/nio/charset/spi/CharsetProvider.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/charset/spi/CharsetProvider.java
rename to jdk/src/java.base/share/classes/java/nio/charset/spi/CharsetProvider.java
diff --git a/jdk/src/share/classes/java/nio/charset/spi/package.html b/jdk/src/java.base/share/classes/java/nio/charset/spi/package.html
similarity index 100%
rename from jdk/src/share/classes/java/nio/charset/spi/package.html
rename to jdk/src/java.base/share/classes/java/nio/charset/spi/package.html
diff --git a/jdk/src/share/classes/java/nio/exceptions b/jdk/src/java.base/share/classes/java/nio/exceptions
similarity index 100%
rename from jdk/src/share/classes/java/nio/exceptions
rename to jdk/src/java.base/share/classes/java/nio/exceptions
diff --git a/jdk/src/share/classes/java/nio/file/AccessDeniedException.java b/jdk/src/java.base/share/classes/java/nio/file/AccessDeniedException.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/AccessDeniedException.java
rename to jdk/src/java.base/share/classes/java/nio/file/AccessDeniedException.java
diff --git a/jdk/src/share/classes/java/nio/file/AccessMode.java b/jdk/src/java.base/share/classes/java/nio/file/AccessMode.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/AccessMode.java
rename to jdk/src/java.base/share/classes/java/nio/file/AccessMode.java
diff --git a/jdk/src/share/classes/java/nio/file/AtomicMoveNotSupportedException.java b/jdk/src/java.base/share/classes/java/nio/file/AtomicMoveNotSupportedException.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/AtomicMoveNotSupportedException.java
rename to jdk/src/java.base/share/classes/java/nio/file/AtomicMoveNotSupportedException.java
diff --git a/jdk/src/share/classes/java/nio/file/ClosedDirectoryStreamException.java b/jdk/src/java.base/share/classes/java/nio/file/ClosedDirectoryStreamException.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/ClosedDirectoryStreamException.java
rename to jdk/src/java.base/share/classes/java/nio/file/ClosedDirectoryStreamException.java
diff --git a/jdk/src/share/classes/java/nio/file/ClosedFileSystemException.java b/jdk/src/java.base/share/classes/java/nio/file/ClosedFileSystemException.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/ClosedFileSystemException.java
rename to jdk/src/java.base/share/classes/java/nio/file/ClosedFileSystemException.java
diff --git a/jdk/src/share/classes/java/nio/file/ClosedWatchServiceException.java b/jdk/src/java.base/share/classes/java/nio/file/ClosedWatchServiceException.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/ClosedWatchServiceException.java
rename to jdk/src/java.base/share/classes/java/nio/file/ClosedWatchServiceException.java
diff --git a/jdk/src/share/classes/java/nio/file/CopyMoveHelper.java b/jdk/src/java.base/share/classes/java/nio/file/CopyMoveHelper.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/CopyMoveHelper.java
rename to jdk/src/java.base/share/classes/java/nio/file/CopyMoveHelper.java
diff --git a/jdk/src/share/classes/java/nio/file/CopyOption.java b/jdk/src/java.base/share/classes/java/nio/file/CopyOption.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/CopyOption.java
rename to jdk/src/java.base/share/classes/java/nio/file/CopyOption.java
diff --git a/jdk/src/share/classes/java/nio/file/DirectoryIteratorException.java b/jdk/src/java.base/share/classes/java/nio/file/DirectoryIteratorException.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/DirectoryIteratorException.java
rename to jdk/src/java.base/share/classes/java/nio/file/DirectoryIteratorException.java
diff --git a/jdk/src/share/classes/java/nio/file/DirectoryNotEmptyException.java b/jdk/src/java.base/share/classes/java/nio/file/DirectoryNotEmptyException.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/DirectoryNotEmptyException.java
rename to jdk/src/java.base/share/classes/java/nio/file/DirectoryNotEmptyException.java
diff --git a/jdk/src/share/classes/java/nio/file/DirectoryStream.java b/jdk/src/java.base/share/classes/java/nio/file/DirectoryStream.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/DirectoryStream.java
rename to jdk/src/java.base/share/classes/java/nio/file/DirectoryStream.java
diff --git a/jdk/src/share/classes/java/nio/file/FileAlreadyExistsException.java b/jdk/src/java.base/share/classes/java/nio/file/FileAlreadyExistsException.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/FileAlreadyExistsException.java
rename to jdk/src/java.base/share/classes/java/nio/file/FileAlreadyExistsException.java
diff --git a/jdk/src/share/classes/java/nio/file/FileStore.java b/jdk/src/java.base/share/classes/java/nio/file/FileStore.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/FileStore.java
rename to jdk/src/java.base/share/classes/java/nio/file/FileStore.java
diff --git a/jdk/src/share/classes/java/nio/file/FileSystem.java b/jdk/src/java.base/share/classes/java/nio/file/FileSystem.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/FileSystem.java
rename to jdk/src/java.base/share/classes/java/nio/file/FileSystem.java
diff --git a/jdk/src/share/classes/java/nio/file/FileSystemAlreadyExistsException.java b/jdk/src/java.base/share/classes/java/nio/file/FileSystemAlreadyExistsException.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/FileSystemAlreadyExistsException.java
rename to jdk/src/java.base/share/classes/java/nio/file/FileSystemAlreadyExistsException.java
diff --git a/jdk/src/share/classes/java/nio/file/FileSystemException.java b/jdk/src/java.base/share/classes/java/nio/file/FileSystemException.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/FileSystemException.java
rename to jdk/src/java.base/share/classes/java/nio/file/FileSystemException.java
diff --git a/jdk/src/share/classes/java/nio/file/FileSystemLoopException.java b/jdk/src/java.base/share/classes/java/nio/file/FileSystemLoopException.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/FileSystemLoopException.java
rename to jdk/src/java.base/share/classes/java/nio/file/FileSystemLoopException.java
diff --git a/jdk/src/share/classes/java/nio/file/FileSystemNotFoundException.java b/jdk/src/java.base/share/classes/java/nio/file/FileSystemNotFoundException.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/FileSystemNotFoundException.java
rename to jdk/src/java.base/share/classes/java/nio/file/FileSystemNotFoundException.java
diff --git a/jdk/src/share/classes/java/nio/file/FileSystems.java b/jdk/src/java.base/share/classes/java/nio/file/FileSystems.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/FileSystems.java
rename to jdk/src/java.base/share/classes/java/nio/file/FileSystems.java
diff --git a/jdk/src/share/classes/java/nio/file/FileTreeIterator.java b/jdk/src/java.base/share/classes/java/nio/file/FileTreeIterator.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/FileTreeIterator.java
rename to jdk/src/java.base/share/classes/java/nio/file/FileTreeIterator.java
diff --git a/jdk/src/share/classes/java/nio/file/FileTreeWalker.java b/jdk/src/java.base/share/classes/java/nio/file/FileTreeWalker.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/FileTreeWalker.java
rename to jdk/src/java.base/share/classes/java/nio/file/FileTreeWalker.java
diff --git a/jdk/src/share/classes/java/nio/file/FileVisitOption.java b/jdk/src/java.base/share/classes/java/nio/file/FileVisitOption.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/FileVisitOption.java
rename to jdk/src/java.base/share/classes/java/nio/file/FileVisitOption.java
diff --git a/jdk/src/share/classes/java/nio/file/FileVisitResult.java b/jdk/src/java.base/share/classes/java/nio/file/FileVisitResult.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/FileVisitResult.java
rename to jdk/src/java.base/share/classes/java/nio/file/FileVisitResult.java
diff --git a/jdk/src/share/classes/java/nio/file/FileVisitor.java b/jdk/src/java.base/share/classes/java/nio/file/FileVisitor.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/FileVisitor.java
rename to jdk/src/java.base/share/classes/java/nio/file/FileVisitor.java
diff --git a/jdk/src/share/classes/java/nio/file/Files.java b/jdk/src/java.base/share/classes/java/nio/file/Files.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/Files.java
rename to jdk/src/java.base/share/classes/java/nio/file/Files.java
diff --git a/jdk/src/share/classes/java/nio/file/InvalidPathException.java b/jdk/src/java.base/share/classes/java/nio/file/InvalidPathException.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/InvalidPathException.java
rename to jdk/src/java.base/share/classes/java/nio/file/InvalidPathException.java
diff --git a/jdk/src/share/classes/java/nio/file/LinkOption.java b/jdk/src/java.base/share/classes/java/nio/file/LinkOption.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/LinkOption.java
rename to jdk/src/java.base/share/classes/java/nio/file/LinkOption.java
diff --git a/jdk/src/share/classes/java/nio/file/LinkPermission.java b/jdk/src/java.base/share/classes/java/nio/file/LinkPermission.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/LinkPermission.java
rename to jdk/src/java.base/share/classes/java/nio/file/LinkPermission.java
diff --git a/jdk/src/share/classes/java/nio/file/NoSuchFileException.java b/jdk/src/java.base/share/classes/java/nio/file/NoSuchFileException.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/NoSuchFileException.java
rename to jdk/src/java.base/share/classes/java/nio/file/NoSuchFileException.java
diff --git a/jdk/src/share/classes/java/nio/file/NotDirectoryException.java b/jdk/src/java.base/share/classes/java/nio/file/NotDirectoryException.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/NotDirectoryException.java
rename to jdk/src/java.base/share/classes/java/nio/file/NotDirectoryException.java
diff --git a/jdk/src/share/classes/java/nio/file/NotLinkException.java b/jdk/src/java.base/share/classes/java/nio/file/NotLinkException.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/NotLinkException.java
rename to jdk/src/java.base/share/classes/java/nio/file/NotLinkException.java
diff --git a/jdk/src/share/classes/java/nio/file/OpenOption.java b/jdk/src/java.base/share/classes/java/nio/file/OpenOption.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/OpenOption.java
rename to jdk/src/java.base/share/classes/java/nio/file/OpenOption.java
diff --git a/jdk/src/share/classes/java/nio/file/Path.java b/jdk/src/java.base/share/classes/java/nio/file/Path.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/Path.java
rename to jdk/src/java.base/share/classes/java/nio/file/Path.java
diff --git a/jdk/src/share/classes/java/nio/file/PathMatcher.java b/jdk/src/java.base/share/classes/java/nio/file/PathMatcher.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/PathMatcher.java
rename to jdk/src/java.base/share/classes/java/nio/file/PathMatcher.java
diff --git a/jdk/src/share/classes/java/nio/file/Paths.java b/jdk/src/java.base/share/classes/java/nio/file/Paths.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/Paths.java
rename to jdk/src/java.base/share/classes/java/nio/file/Paths.java
diff --git a/jdk/src/share/classes/java/nio/file/ProviderMismatchException.java b/jdk/src/java.base/share/classes/java/nio/file/ProviderMismatchException.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/ProviderMismatchException.java
rename to jdk/src/java.base/share/classes/java/nio/file/ProviderMismatchException.java
diff --git a/jdk/src/share/classes/java/nio/file/ProviderNotFoundException.java b/jdk/src/java.base/share/classes/java/nio/file/ProviderNotFoundException.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/ProviderNotFoundException.java
rename to jdk/src/java.base/share/classes/java/nio/file/ProviderNotFoundException.java
diff --git a/jdk/src/share/classes/java/nio/file/ReadOnlyFileSystemException.java b/jdk/src/java.base/share/classes/java/nio/file/ReadOnlyFileSystemException.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/ReadOnlyFileSystemException.java
rename to jdk/src/java.base/share/classes/java/nio/file/ReadOnlyFileSystemException.java
diff --git a/jdk/src/share/classes/java/nio/file/SecureDirectoryStream.java b/jdk/src/java.base/share/classes/java/nio/file/SecureDirectoryStream.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/SecureDirectoryStream.java
rename to jdk/src/java.base/share/classes/java/nio/file/SecureDirectoryStream.java
diff --git a/jdk/src/share/classes/java/nio/file/SimpleFileVisitor.java b/jdk/src/java.base/share/classes/java/nio/file/SimpleFileVisitor.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/SimpleFileVisitor.java
rename to jdk/src/java.base/share/classes/java/nio/file/SimpleFileVisitor.java
diff --git a/jdk/src/share/classes/java/nio/file/StandardCopyOption.java b/jdk/src/java.base/share/classes/java/nio/file/StandardCopyOption.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/StandardCopyOption.java
rename to jdk/src/java.base/share/classes/java/nio/file/StandardCopyOption.java
diff --git a/jdk/src/share/classes/java/nio/file/StandardOpenOption.java b/jdk/src/java.base/share/classes/java/nio/file/StandardOpenOption.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/StandardOpenOption.java
rename to jdk/src/java.base/share/classes/java/nio/file/StandardOpenOption.java
diff --git a/jdk/src/share/classes/java/nio/file/StandardWatchEventKinds.java b/jdk/src/java.base/share/classes/java/nio/file/StandardWatchEventKinds.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/StandardWatchEventKinds.java
rename to jdk/src/java.base/share/classes/java/nio/file/StandardWatchEventKinds.java
diff --git a/jdk/src/share/classes/java/nio/file/TempFileHelper.java b/jdk/src/java.base/share/classes/java/nio/file/TempFileHelper.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/TempFileHelper.java
rename to jdk/src/java.base/share/classes/java/nio/file/TempFileHelper.java
diff --git a/jdk/src/share/classes/java/nio/file/WatchEvent.java b/jdk/src/java.base/share/classes/java/nio/file/WatchEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/WatchEvent.java
rename to jdk/src/java.base/share/classes/java/nio/file/WatchEvent.java
diff --git a/jdk/src/share/classes/java/nio/file/WatchKey.java b/jdk/src/java.base/share/classes/java/nio/file/WatchKey.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/WatchKey.java
rename to jdk/src/java.base/share/classes/java/nio/file/WatchKey.java
diff --git a/jdk/src/share/classes/java/nio/file/WatchService.java b/jdk/src/java.base/share/classes/java/nio/file/WatchService.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/WatchService.java
rename to jdk/src/java.base/share/classes/java/nio/file/WatchService.java
diff --git a/jdk/src/share/classes/java/nio/file/Watchable.java b/jdk/src/java.base/share/classes/java/nio/file/Watchable.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/Watchable.java
rename to jdk/src/java.base/share/classes/java/nio/file/Watchable.java
diff --git a/jdk/src/share/classes/java/nio/file/attribute/AclEntry.java b/jdk/src/java.base/share/classes/java/nio/file/attribute/AclEntry.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/attribute/AclEntry.java
rename to jdk/src/java.base/share/classes/java/nio/file/attribute/AclEntry.java
diff --git a/jdk/src/share/classes/java/nio/file/attribute/AclEntryFlag.java b/jdk/src/java.base/share/classes/java/nio/file/attribute/AclEntryFlag.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/attribute/AclEntryFlag.java
rename to jdk/src/java.base/share/classes/java/nio/file/attribute/AclEntryFlag.java
diff --git a/jdk/src/share/classes/java/nio/file/attribute/AclEntryPermission.java b/jdk/src/java.base/share/classes/java/nio/file/attribute/AclEntryPermission.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/attribute/AclEntryPermission.java
rename to jdk/src/java.base/share/classes/java/nio/file/attribute/AclEntryPermission.java
diff --git a/jdk/src/share/classes/java/nio/file/attribute/AclEntryType.java b/jdk/src/java.base/share/classes/java/nio/file/attribute/AclEntryType.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/attribute/AclEntryType.java
rename to jdk/src/java.base/share/classes/java/nio/file/attribute/AclEntryType.java
diff --git a/jdk/src/share/classes/java/nio/file/attribute/AclFileAttributeView.java b/jdk/src/java.base/share/classes/java/nio/file/attribute/AclFileAttributeView.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/attribute/AclFileAttributeView.java
rename to jdk/src/java.base/share/classes/java/nio/file/attribute/AclFileAttributeView.java
diff --git a/jdk/src/share/classes/java/nio/file/attribute/AttributeView.java b/jdk/src/java.base/share/classes/java/nio/file/attribute/AttributeView.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/attribute/AttributeView.java
rename to jdk/src/java.base/share/classes/java/nio/file/attribute/AttributeView.java
diff --git a/jdk/src/share/classes/java/nio/file/attribute/BasicFileAttributeView.java b/jdk/src/java.base/share/classes/java/nio/file/attribute/BasicFileAttributeView.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/attribute/BasicFileAttributeView.java
rename to jdk/src/java.base/share/classes/java/nio/file/attribute/BasicFileAttributeView.java
diff --git a/jdk/src/share/classes/java/nio/file/attribute/BasicFileAttributes.java b/jdk/src/java.base/share/classes/java/nio/file/attribute/BasicFileAttributes.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/attribute/BasicFileAttributes.java
rename to jdk/src/java.base/share/classes/java/nio/file/attribute/BasicFileAttributes.java
diff --git a/jdk/src/share/classes/java/nio/file/attribute/DosFileAttributeView.java b/jdk/src/java.base/share/classes/java/nio/file/attribute/DosFileAttributeView.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/attribute/DosFileAttributeView.java
rename to jdk/src/java.base/share/classes/java/nio/file/attribute/DosFileAttributeView.java
diff --git a/jdk/src/share/classes/java/nio/file/attribute/DosFileAttributes.java b/jdk/src/java.base/share/classes/java/nio/file/attribute/DosFileAttributes.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/attribute/DosFileAttributes.java
rename to jdk/src/java.base/share/classes/java/nio/file/attribute/DosFileAttributes.java
diff --git a/jdk/src/share/classes/java/nio/file/attribute/FileAttribute.java b/jdk/src/java.base/share/classes/java/nio/file/attribute/FileAttribute.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/attribute/FileAttribute.java
rename to jdk/src/java.base/share/classes/java/nio/file/attribute/FileAttribute.java
diff --git a/jdk/src/share/classes/java/nio/file/attribute/FileAttributeView.java b/jdk/src/java.base/share/classes/java/nio/file/attribute/FileAttributeView.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/attribute/FileAttributeView.java
rename to jdk/src/java.base/share/classes/java/nio/file/attribute/FileAttributeView.java
diff --git a/jdk/src/share/classes/java/nio/file/attribute/FileOwnerAttributeView.java b/jdk/src/java.base/share/classes/java/nio/file/attribute/FileOwnerAttributeView.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/attribute/FileOwnerAttributeView.java
rename to jdk/src/java.base/share/classes/java/nio/file/attribute/FileOwnerAttributeView.java
diff --git a/jdk/src/share/classes/java/nio/file/attribute/FileStoreAttributeView.java b/jdk/src/java.base/share/classes/java/nio/file/attribute/FileStoreAttributeView.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/attribute/FileStoreAttributeView.java
rename to jdk/src/java.base/share/classes/java/nio/file/attribute/FileStoreAttributeView.java
diff --git a/jdk/src/share/classes/java/nio/file/attribute/FileTime.java b/jdk/src/java.base/share/classes/java/nio/file/attribute/FileTime.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/attribute/FileTime.java
rename to jdk/src/java.base/share/classes/java/nio/file/attribute/FileTime.java
diff --git a/jdk/src/share/classes/java/nio/file/attribute/GroupPrincipal.java b/jdk/src/java.base/share/classes/java/nio/file/attribute/GroupPrincipal.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/attribute/GroupPrincipal.java
rename to jdk/src/java.base/share/classes/java/nio/file/attribute/GroupPrincipal.java
diff --git a/jdk/src/share/classes/java/nio/file/attribute/PosixFileAttributeView.java b/jdk/src/java.base/share/classes/java/nio/file/attribute/PosixFileAttributeView.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/attribute/PosixFileAttributeView.java
rename to jdk/src/java.base/share/classes/java/nio/file/attribute/PosixFileAttributeView.java
diff --git a/jdk/src/share/classes/java/nio/file/attribute/PosixFileAttributes.java b/jdk/src/java.base/share/classes/java/nio/file/attribute/PosixFileAttributes.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/attribute/PosixFileAttributes.java
rename to jdk/src/java.base/share/classes/java/nio/file/attribute/PosixFileAttributes.java
diff --git a/jdk/src/share/classes/java/nio/file/attribute/PosixFilePermission.java b/jdk/src/java.base/share/classes/java/nio/file/attribute/PosixFilePermission.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/attribute/PosixFilePermission.java
rename to jdk/src/java.base/share/classes/java/nio/file/attribute/PosixFilePermission.java
diff --git a/jdk/src/share/classes/java/nio/file/attribute/PosixFilePermissions.java b/jdk/src/java.base/share/classes/java/nio/file/attribute/PosixFilePermissions.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/attribute/PosixFilePermissions.java
rename to jdk/src/java.base/share/classes/java/nio/file/attribute/PosixFilePermissions.java
diff --git a/jdk/src/share/classes/java/nio/file/attribute/UserDefinedFileAttributeView.java b/jdk/src/java.base/share/classes/java/nio/file/attribute/UserDefinedFileAttributeView.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/attribute/UserDefinedFileAttributeView.java
rename to jdk/src/java.base/share/classes/java/nio/file/attribute/UserDefinedFileAttributeView.java
diff --git a/jdk/src/share/classes/java/nio/file/attribute/UserPrincipal.java b/jdk/src/java.base/share/classes/java/nio/file/attribute/UserPrincipal.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/attribute/UserPrincipal.java
rename to jdk/src/java.base/share/classes/java/nio/file/attribute/UserPrincipal.java
diff --git a/jdk/src/share/classes/java/nio/file/attribute/UserPrincipalLookupService.java b/jdk/src/java.base/share/classes/java/nio/file/attribute/UserPrincipalLookupService.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/attribute/UserPrincipalLookupService.java
rename to jdk/src/java.base/share/classes/java/nio/file/attribute/UserPrincipalLookupService.java
diff --git a/jdk/src/share/classes/java/nio/file/attribute/UserPrincipalNotFoundException.java b/jdk/src/java.base/share/classes/java/nio/file/attribute/UserPrincipalNotFoundException.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/attribute/UserPrincipalNotFoundException.java
rename to jdk/src/java.base/share/classes/java/nio/file/attribute/UserPrincipalNotFoundException.java
diff --git a/jdk/src/share/classes/java/nio/file/attribute/package-info.java b/jdk/src/java.base/share/classes/java/nio/file/attribute/package-info.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/attribute/package-info.java
rename to jdk/src/java.base/share/classes/java/nio/file/attribute/package-info.java
diff --git a/jdk/src/share/classes/java/nio/file/package-info.java b/jdk/src/java.base/share/classes/java/nio/file/package-info.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/package-info.java
rename to jdk/src/java.base/share/classes/java/nio/file/package-info.java
diff --git a/jdk/src/share/classes/java/nio/file/spi/FileSystemProvider.java b/jdk/src/java.base/share/classes/java/nio/file/spi/FileSystemProvider.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/spi/FileSystemProvider.java
rename to jdk/src/java.base/share/classes/java/nio/file/spi/FileSystemProvider.java
diff --git a/jdk/src/share/classes/java/nio/file/spi/FileTypeDetector.java b/jdk/src/java.base/share/classes/java/nio/file/spi/FileTypeDetector.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/spi/FileTypeDetector.java
rename to jdk/src/java.base/share/classes/java/nio/file/spi/FileTypeDetector.java
diff --git a/jdk/src/share/classes/java/nio/file/spi/package-info.java b/jdk/src/java.base/share/classes/java/nio/file/spi/package-info.java
similarity index 100%
rename from jdk/src/share/classes/java/nio/file/spi/package-info.java
rename to jdk/src/java.base/share/classes/java/nio/file/spi/package-info.java
diff --git a/jdk/src/share/classes/java/nio/package.html b/jdk/src/java.base/share/classes/java/nio/package.html
similarity index 100%
rename from jdk/src/share/classes/java/nio/package.html
rename to jdk/src/java.base/share/classes/java/nio/package.html
diff --git a/jdk/src/share/classes/java/security/AccessControlContext.java b/jdk/src/java.base/share/classes/java/security/AccessControlContext.java
similarity index 100%
rename from jdk/src/share/classes/java/security/AccessControlContext.java
rename to jdk/src/java.base/share/classes/java/security/AccessControlContext.java
diff --git a/jdk/src/share/classes/java/security/AccessControlException.java b/jdk/src/java.base/share/classes/java/security/AccessControlException.java
similarity index 100%
rename from jdk/src/share/classes/java/security/AccessControlException.java
rename to jdk/src/java.base/share/classes/java/security/AccessControlException.java
diff --git a/jdk/src/share/classes/java/security/AccessController.java b/jdk/src/java.base/share/classes/java/security/AccessController.java
similarity index 100%
rename from jdk/src/share/classes/java/security/AccessController.java
rename to jdk/src/java.base/share/classes/java/security/AccessController.java
diff --git a/jdk/src/share/classes/java/security/AlgorithmConstraints.java b/jdk/src/java.base/share/classes/java/security/AlgorithmConstraints.java
similarity index 100%
rename from jdk/src/share/classes/java/security/AlgorithmConstraints.java
rename to jdk/src/java.base/share/classes/java/security/AlgorithmConstraints.java
diff --git a/jdk/src/share/classes/java/security/AlgorithmParameterGenerator.java b/jdk/src/java.base/share/classes/java/security/AlgorithmParameterGenerator.java
similarity index 100%
rename from jdk/src/share/classes/java/security/AlgorithmParameterGenerator.java
rename to jdk/src/java.base/share/classes/java/security/AlgorithmParameterGenerator.java
diff --git a/jdk/src/share/classes/java/security/AlgorithmParameterGeneratorSpi.java b/jdk/src/java.base/share/classes/java/security/AlgorithmParameterGeneratorSpi.java
similarity index 100%
rename from jdk/src/share/classes/java/security/AlgorithmParameterGeneratorSpi.java
rename to jdk/src/java.base/share/classes/java/security/AlgorithmParameterGeneratorSpi.java
diff --git a/jdk/src/share/classes/java/security/AlgorithmParameters.java b/jdk/src/java.base/share/classes/java/security/AlgorithmParameters.java
similarity index 100%
rename from jdk/src/share/classes/java/security/AlgorithmParameters.java
rename to jdk/src/java.base/share/classes/java/security/AlgorithmParameters.java
diff --git a/jdk/src/share/classes/java/security/AlgorithmParametersSpi.java b/jdk/src/java.base/share/classes/java/security/AlgorithmParametersSpi.java
similarity index 100%
rename from jdk/src/share/classes/java/security/AlgorithmParametersSpi.java
rename to jdk/src/java.base/share/classes/java/security/AlgorithmParametersSpi.java
diff --git a/jdk/src/share/classes/java/security/AllPermission.java b/jdk/src/java.base/share/classes/java/security/AllPermission.java
similarity index 100%
rename from jdk/src/share/classes/java/security/AllPermission.java
rename to jdk/src/java.base/share/classes/java/security/AllPermission.java
diff --git a/jdk/src/share/classes/java/security/AuthProvider.java b/jdk/src/java.base/share/classes/java/security/AuthProvider.java
similarity index 100%
rename from jdk/src/share/classes/java/security/AuthProvider.java
rename to jdk/src/java.base/share/classes/java/security/AuthProvider.java
diff --git a/jdk/src/share/classes/java/security/BasicPermission.java b/jdk/src/java.base/share/classes/java/security/BasicPermission.java
similarity index 100%
rename from jdk/src/share/classes/java/security/BasicPermission.java
rename to jdk/src/java.base/share/classes/java/security/BasicPermission.java
diff --git a/jdk/src/share/classes/java/security/Certificate.java b/jdk/src/java.base/share/classes/java/security/Certificate.java
similarity index 100%
rename from jdk/src/share/classes/java/security/Certificate.java
rename to jdk/src/java.base/share/classes/java/security/Certificate.java
diff --git a/jdk/src/share/classes/java/security/CodeSigner.java b/jdk/src/java.base/share/classes/java/security/CodeSigner.java
similarity index 100%
rename from jdk/src/share/classes/java/security/CodeSigner.java
rename to jdk/src/java.base/share/classes/java/security/CodeSigner.java
diff --git a/jdk/src/share/classes/java/security/CodeSource.java b/jdk/src/java.base/share/classes/java/security/CodeSource.java
similarity index 100%
rename from jdk/src/share/classes/java/security/CodeSource.java
rename to jdk/src/java.base/share/classes/java/security/CodeSource.java
diff --git a/jdk/src/share/classes/java/security/CryptoPrimitive.java b/jdk/src/java.base/share/classes/java/security/CryptoPrimitive.java
similarity index 100%
rename from jdk/src/share/classes/java/security/CryptoPrimitive.java
rename to jdk/src/java.base/share/classes/java/security/CryptoPrimitive.java
diff --git a/jdk/src/share/classes/java/security/DigestException.java b/jdk/src/java.base/share/classes/java/security/DigestException.java
similarity index 100%
rename from jdk/src/share/classes/java/security/DigestException.java
rename to jdk/src/java.base/share/classes/java/security/DigestException.java
diff --git a/jdk/src/share/classes/java/security/DigestInputStream.java b/jdk/src/java.base/share/classes/java/security/DigestInputStream.java
similarity index 100%
rename from jdk/src/share/classes/java/security/DigestInputStream.java
rename to jdk/src/java.base/share/classes/java/security/DigestInputStream.java
diff --git a/jdk/src/share/classes/java/security/DigestOutputStream.java b/jdk/src/java.base/share/classes/java/security/DigestOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/java/security/DigestOutputStream.java
rename to jdk/src/java.base/share/classes/java/security/DigestOutputStream.java
diff --git a/jdk/src/share/classes/java/security/DomainCombiner.java b/jdk/src/java.base/share/classes/java/security/DomainCombiner.java
similarity index 100%
rename from jdk/src/share/classes/java/security/DomainCombiner.java
rename to jdk/src/java.base/share/classes/java/security/DomainCombiner.java
diff --git a/jdk/src/share/classes/java/security/DomainLoadStoreParameter.java b/jdk/src/java.base/share/classes/java/security/DomainLoadStoreParameter.java
similarity index 100%
rename from jdk/src/share/classes/java/security/DomainLoadStoreParameter.java
rename to jdk/src/java.base/share/classes/java/security/DomainLoadStoreParameter.java
diff --git a/jdk/src/share/classes/java/security/GeneralSecurityException.java b/jdk/src/java.base/share/classes/java/security/GeneralSecurityException.java
similarity index 100%
rename from jdk/src/share/classes/java/security/GeneralSecurityException.java
rename to jdk/src/java.base/share/classes/java/security/GeneralSecurityException.java
diff --git a/jdk/src/share/classes/java/security/Guard.java b/jdk/src/java.base/share/classes/java/security/Guard.java
similarity index 100%
rename from jdk/src/share/classes/java/security/Guard.java
rename to jdk/src/java.base/share/classes/java/security/Guard.java
diff --git a/jdk/src/share/classes/java/security/GuardedObject.java b/jdk/src/java.base/share/classes/java/security/GuardedObject.java
similarity index 100%
rename from jdk/src/share/classes/java/security/GuardedObject.java
rename to jdk/src/java.base/share/classes/java/security/GuardedObject.java
diff --git a/jdk/src/share/classes/java/security/Identity.java b/jdk/src/java.base/share/classes/java/security/Identity.java
similarity index 100%
rename from jdk/src/share/classes/java/security/Identity.java
rename to jdk/src/java.base/share/classes/java/security/Identity.java
diff --git a/jdk/src/share/classes/java/security/IdentityScope.java b/jdk/src/java.base/share/classes/java/security/IdentityScope.java
similarity index 100%
rename from jdk/src/share/classes/java/security/IdentityScope.java
rename to jdk/src/java.base/share/classes/java/security/IdentityScope.java
diff --git a/jdk/src/share/classes/java/security/InvalidAlgorithmParameterException.java b/jdk/src/java.base/share/classes/java/security/InvalidAlgorithmParameterException.java
similarity index 100%
rename from jdk/src/share/classes/java/security/InvalidAlgorithmParameterException.java
rename to jdk/src/java.base/share/classes/java/security/InvalidAlgorithmParameterException.java
diff --git a/jdk/src/share/classes/java/security/InvalidKeyException.java b/jdk/src/java.base/share/classes/java/security/InvalidKeyException.java
similarity index 100%
rename from jdk/src/share/classes/java/security/InvalidKeyException.java
rename to jdk/src/java.base/share/classes/java/security/InvalidKeyException.java
diff --git a/jdk/src/share/classes/java/security/InvalidParameterException.java b/jdk/src/java.base/share/classes/java/security/InvalidParameterException.java
similarity index 100%
rename from jdk/src/share/classes/java/security/InvalidParameterException.java
rename to jdk/src/java.base/share/classes/java/security/InvalidParameterException.java
diff --git a/jdk/src/share/classes/java/security/Key.java b/jdk/src/java.base/share/classes/java/security/Key.java
similarity index 100%
rename from jdk/src/share/classes/java/security/Key.java
rename to jdk/src/java.base/share/classes/java/security/Key.java
diff --git a/jdk/src/share/classes/java/security/KeyException.java b/jdk/src/java.base/share/classes/java/security/KeyException.java
similarity index 100%
rename from jdk/src/share/classes/java/security/KeyException.java
rename to jdk/src/java.base/share/classes/java/security/KeyException.java
diff --git a/jdk/src/share/classes/java/security/KeyFactory.java b/jdk/src/java.base/share/classes/java/security/KeyFactory.java
similarity index 100%
rename from jdk/src/share/classes/java/security/KeyFactory.java
rename to jdk/src/java.base/share/classes/java/security/KeyFactory.java
diff --git a/jdk/src/share/classes/java/security/KeyFactorySpi.java b/jdk/src/java.base/share/classes/java/security/KeyFactorySpi.java
similarity index 100%
rename from jdk/src/share/classes/java/security/KeyFactorySpi.java
rename to jdk/src/java.base/share/classes/java/security/KeyFactorySpi.java
diff --git a/jdk/src/share/classes/java/security/KeyManagementException.java b/jdk/src/java.base/share/classes/java/security/KeyManagementException.java
similarity index 100%
rename from jdk/src/share/classes/java/security/KeyManagementException.java
rename to jdk/src/java.base/share/classes/java/security/KeyManagementException.java
diff --git a/jdk/src/share/classes/java/security/KeyPair.java b/jdk/src/java.base/share/classes/java/security/KeyPair.java
similarity index 100%
rename from jdk/src/share/classes/java/security/KeyPair.java
rename to jdk/src/java.base/share/classes/java/security/KeyPair.java
diff --git a/jdk/src/share/classes/java/security/KeyPairGenerator.java b/jdk/src/java.base/share/classes/java/security/KeyPairGenerator.java
similarity index 100%
rename from jdk/src/share/classes/java/security/KeyPairGenerator.java
rename to jdk/src/java.base/share/classes/java/security/KeyPairGenerator.java
diff --git a/jdk/src/share/classes/java/security/KeyPairGeneratorSpi.java b/jdk/src/java.base/share/classes/java/security/KeyPairGeneratorSpi.java
similarity index 100%
rename from jdk/src/share/classes/java/security/KeyPairGeneratorSpi.java
rename to jdk/src/java.base/share/classes/java/security/KeyPairGeneratorSpi.java
diff --git a/jdk/src/share/classes/java/security/KeyRep.java b/jdk/src/java.base/share/classes/java/security/KeyRep.java
similarity index 100%
rename from jdk/src/share/classes/java/security/KeyRep.java
rename to jdk/src/java.base/share/classes/java/security/KeyRep.java
diff --git a/jdk/src/share/classes/java/security/KeyStore.java b/jdk/src/java.base/share/classes/java/security/KeyStore.java
similarity index 100%
rename from jdk/src/share/classes/java/security/KeyStore.java
rename to jdk/src/java.base/share/classes/java/security/KeyStore.java
diff --git a/jdk/src/share/classes/java/security/KeyStoreException.java b/jdk/src/java.base/share/classes/java/security/KeyStoreException.java
similarity index 100%
rename from jdk/src/share/classes/java/security/KeyStoreException.java
rename to jdk/src/java.base/share/classes/java/security/KeyStoreException.java
diff --git a/jdk/src/share/classes/java/security/KeyStoreSpi.java b/jdk/src/java.base/share/classes/java/security/KeyStoreSpi.java
similarity index 100%
rename from jdk/src/share/classes/java/security/KeyStoreSpi.java
rename to jdk/src/java.base/share/classes/java/security/KeyStoreSpi.java
diff --git a/jdk/src/share/classes/java/security/MessageDigest.java b/jdk/src/java.base/share/classes/java/security/MessageDigest.java
similarity index 100%
rename from jdk/src/share/classes/java/security/MessageDigest.java
rename to jdk/src/java.base/share/classes/java/security/MessageDigest.java
diff --git a/jdk/src/share/classes/java/security/MessageDigestSpi.java b/jdk/src/java.base/share/classes/java/security/MessageDigestSpi.java
similarity index 100%
rename from jdk/src/share/classes/java/security/MessageDigestSpi.java
rename to jdk/src/java.base/share/classes/java/security/MessageDigestSpi.java
diff --git a/jdk/src/share/classes/java/security/NoSuchAlgorithmException.java b/jdk/src/java.base/share/classes/java/security/NoSuchAlgorithmException.java
similarity index 100%
rename from jdk/src/share/classes/java/security/NoSuchAlgorithmException.java
rename to jdk/src/java.base/share/classes/java/security/NoSuchAlgorithmException.java
diff --git a/jdk/src/share/classes/java/security/NoSuchProviderException.java b/jdk/src/java.base/share/classes/java/security/NoSuchProviderException.java
similarity index 100%
rename from jdk/src/share/classes/java/security/NoSuchProviderException.java
rename to jdk/src/java.base/share/classes/java/security/NoSuchProviderException.java
diff --git a/jdk/src/share/classes/java/security/PKCS12Attribute.java b/jdk/src/java.base/share/classes/java/security/PKCS12Attribute.java
similarity index 100%
rename from jdk/src/share/classes/java/security/PKCS12Attribute.java
rename to jdk/src/java.base/share/classes/java/security/PKCS12Attribute.java
diff --git a/jdk/src/share/classes/java/security/Permission.java b/jdk/src/java.base/share/classes/java/security/Permission.java
similarity index 100%
rename from jdk/src/share/classes/java/security/Permission.java
rename to jdk/src/java.base/share/classes/java/security/Permission.java
diff --git a/jdk/src/share/classes/java/security/PermissionCollection.java b/jdk/src/java.base/share/classes/java/security/PermissionCollection.java
similarity index 100%
rename from jdk/src/share/classes/java/security/PermissionCollection.java
rename to jdk/src/java.base/share/classes/java/security/PermissionCollection.java
diff --git a/jdk/src/share/classes/java/security/Permissions.java b/jdk/src/java.base/share/classes/java/security/Permissions.java
similarity index 100%
rename from jdk/src/share/classes/java/security/Permissions.java
rename to jdk/src/java.base/share/classes/java/security/Permissions.java
diff --git a/jdk/src/share/classes/java/security/Policy.java b/jdk/src/java.base/share/classes/java/security/Policy.java
similarity index 100%
rename from jdk/src/share/classes/java/security/Policy.java
rename to jdk/src/java.base/share/classes/java/security/Policy.java
diff --git a/jdk/src/share/classes/java/security/PolicySpi.java b/jdk/src/java.base/share/classes/java/security/PolicySpi.java
similarity index 100%
rename from jdk/src/share/classes/java/security/PolicySpi.java
rename to jdk/src/java.base/share/classes/java/security/PolicySpi.java
diff --git a/jdk/src/share/classes/java/security/Principal.java b/jdk/src/java.base/share/classes/java/security/Principal.java
similarity index 100%
rename from jdk/src/share/classes/java/security/Principal.java
rename to jdk/src/java.base/share/classes/java/security/Principal.java
diff --git a/jdk/src/share/classes/java/security/PrivateKey.java b/jdk/src/java.base/share/classes/java/security/PrivateKey.java
similarity index 100%
rename from jdk/src/share/classes/java/security/PrivateKey.java
rename to jdk/src/java.base/share/classes/java/security/PrivateKey.java
diff --git a/jdk/src/share/classes/java/security/PrivilegedAction.java b/jdk/src/java.base/share/classes/java/security/PrivilegedAction.java
similarity index 100%
rename from jdk/src/share/classes/java/security/PrivilegedAction.java
rename to jdk/src/java.base/share/classes/java/security/PrivilegedAction.java
diff --git a/jdk/src/share/classes/java/security/PrivilegedActionException.java b/jdk/src/java.base/share/classes/java/security/PrivilegedActionException.java
similarity index 100%
rename from jdk/src/share/classes/java/security/PrivilegedActionException.java
rename to jdk/src/java.base/share/classes/java/security/PrivilegedActionException.java
diff --git a/jdk/src/share/classes/java/security/PrivilegedExceptionAction.java b/jdk/src/java.base/share/classes/java/security/PrivilegedExceptionAction.java
similarity index 100%
rename from jdk/src/share/classes/java/security/PrivilegedExceptionAction.java
rename to jdk/src/java.base/share/classes/java/security/PrivilegedExceptionAction.java
diff --git a/jdk/src/share/classes/java/security/ProtectionDomain.java b/jdk/src/java.base/share/classes/java/security/ProtectionDomain.java
similarity index 100%
rename from jdk/src/share/classes/java/security/ProtectionDomain.java
rename to jdk/src/java.base/share/classes/java/security/ProtectionDomain.java
diff --git a/jdk/src/share/classes/java/security/Provider.java b/jdk/src/java.base/share/classes/java/security/Provider.java
similarity index 100%
rename from jdk/src/share/classes/java/security/Provider.java
rename to jdk/src/java.base/share/classes/java/security/Provider.java
diff --git a/jdk/src/share/classes/java/security/ProviderException.java b/jdk/src/java.base/share/classes/java/security/ProviderException.java
similarity index 100%
rename from jdk/src/share/classes/java/security/ProviderException.java
rename to jdk/src/java.base/share/classes/java/security/ProviderException.java
diff --git a/jdk/src/share/classes/java/security/PublicKey.java b/jdk/src/java.base/share/classes/java/security/PublicKey.java
similarity index 100%
rename from jdk/src/share/classes/java/security/PublicKey.java
rename to jdk/src/java.base/share/classes/java/security/PublicKey.java
diff --git a/jdk/src/share/classes/java/security/SecureClassLoader.java b/jdk/src/java.base/share/classes/java/security/SecureClassLoader.java
similarity index 100%
rename from jdk/src/share/classes/java/security/SecureClassLoader.java
rename to jdk/src/java.base/share/classes/java/security/SecureClassLoader.java
diff --git a/jdk/src/share/classes/java/security/SecureRandom.java b/jdk/src/java.base/share/classes/java/security/SecureRandom.java
similarity index 98%
rename from jdk/src/share/classes/java/security/SecureRandom.java
rename to jdk/src/java.base/share/classes/java/security/SecureRandom.java
index b9ae7220b38..0accb4cc7a4 100644
--- a/jdk/src/share/classes/java/security/SecureRandom.java
+++ b/jdk/src/java.base/share/classes/java/security/SecureRandom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,15 +39,16 @@ import sun.security.jca.GetInstance.Instance;
  *
  * 
A cryptographically strong random number
  * minimally complies with the statistical random number generator tests
- * specified in 
+ * specified in
+ * 
  * FIPS 140-2, Security Requirements for Cryptographic Modules,
  * section 4.9.1.
  * Additionally, SecureRandom must produce non-deterministic output.
  * Therefore any seed material passed to a SecureRandom object must be
  * unpredictable, and all SecureRandom output sequences must be
  * cryptographically strong, as described in
- * 
- * RFC 1750: Randomness Recommendations for Security.
+ * 
+ * RFC 4086: Randomness Requirements for Security.
  *
  * 
A caller obtains a SecureRandom instance via the
  * no-argument constructor or one of the {@code getInstance} methods:
diff --git a/jdk/src/share/classes/java/security/SecureRandomSpi.java b/jdk/src/java.base/share/classes/java/security/SecureRandomSpi.java
similarity index 100%
rename from jdk/src/share/classes/java/security/SecureRandomSpi.java
rename to jdk/src/java.base/share/classes/java/security/SecureRandomSpi.java
diff --git a/jdk/src/share/classes/java/security/Security.java b/jdk/src/java.base/share/classes/java/security/Security.java
similarity index 100%
rename from jdk/src/share/classes/java/security/Security.java
rename to jdk/src/java.base/share/classes/java/security/Security.java
diff --git a/jdk/src/share/classes/java/security/SecurityPermission.java b/jdk/src/java.base/share/classes/java/security/SecurityPermission.java
similarity index 100%
rename from jdk/src/share/classes/java/security/SecurityPermission.java
rename to jdk/src/java.base/share/classes/java/security/SecurityPermission.java
diff --git a/jdk/src/share/classes/java/security/Signature.java b/jdk/src/java.base/share/classes/java/security/Signature.java
similarity index 100%
rename from jdk/src/share/classes/java/security/Signature.java
rename to jdk/src/java.base/share/classes/java/security/Signature.java
diff --git a/jdk/src/share/classes/java/security/SignatureException.java b/jdk/src/java.base/share/classes/java/security/SignatureException.java
similarity index 100%
rename from jdk/src/share/classes/java/security/SignatureException.java
rename to jdk/src/java.base/share/classes/java/security/SignatureException.java
diff --git a/jdk/src/share/classes/java/security/SignatureSpi.java b/jdk/src/java.base/share/classes/java/security/SignatureSpi.java
similarity index 100%
rename from jdk/src/share/classes/java/security/SignatureSpi.java
rename to jdk/src/java.base/share/classes/java/security/SignatureSpi.java
diff --git a/jdk/src/share/classes/java/security/SignedObject.java b/jdk/src/java.base/share/classes/java/security/SignedObject.java
similarity index 100%
rename from jdk/src/share/classes/java/security/SignedObject.java
rename to jdk/src/java.base/share/classes/java/security/SignedObject.java
diff --git a/jdk/src/share/classes/java/security/Signer.java b/jdk/src/java.base/share/classes/java/security/Signer.java
similarity index 100%
rename from jdk/src/share/classes/java/security/Signer.java
rename to jdk/src/java.base/share/classes/java/security/Signer.java
diff --git a/jdk/src/share/classes/java/security/Timestamp.java b/jdk/src/java.base/share/classes/java/security/Timestamp.java
similarity index 100%
rename from jdk/src/share/classes/java/security/Timestamp.java
rename to jdk/src/java.base/share/classes/java/security/Timestamp.java
diff --git a/jdk/src/share/classes/java/security/URIParameter.java b/jdk/src/java.base/share/classes/java/security/URIParameter.java
similarity index 100%
rename from jdk/src/share/classes/java/security/URIParameter.java
rename to jdk/src/java.base/share/classes/java/security/URIParameter.java
diff --git a/jdk/src/share/classes/java/security/UnrecoverableEntryException.java b/jdk/src/java.base/share/classes/java/security/UnrecoverableEntryException.java
similarity index 100%
rename from jdk/src/share/classes/java/security/UnrecoverableEntryException.java
rename to jdk/src/java.base/share/classes/java/security/UnrecoverableEntryException.java
diff --git a/jdk/src/share/classes/java/security/UnrecoverableKeyException.java b/jdk/src/java.base/share/classes/java/security/UnrecoverableKeyException.java
similarity index 100%
rename from jdk/src/share/classes/java/security/UnrecoverableKeyException.java
rename to jdk/src/java.base/share/classes/java/security/UnrecoverableKeyException.java
diff --git a/jdk/src/share/classes/java/security/UnresolvedPermission.java b/jdk/src/java.base/share/classes/java/security/UnresolvedPermission.java
similarity index 100%
rename from jdk/src/share/classes/java/security/UnresolvedPermission.java
rename to jdk/src/java.base/share/classes/java/security/UnresolvedPermission.java
diff --git a/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java b/jdk/src/java.base/share/classes/java/security/UnresolvedPermissionCollection.java
similarity index 100%
rename from jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java
rename to jdk/src/java.base/share/classes/java/security/UnresolvedPermissionCollection.java
diff --git a/jdk/src/share/classes/java/security/cert/CRL.java b/jdk/src/java.base/share/classes/java/security/cert/CRL.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/CRL.java
rename to jdk/src/java.base/share/classes/java/security/cert/CRL.java
diff --git a/jdk/src/share/classes/java/security/cert/CRLException.java b/jdk/src/java.base/share/classes/java/security/cert/CRLException.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/CRLException.java
rename to jdk/src/java.base/share/classes/java/security/cert/CRLException.java
diff --git a/jdk/src/share/classes/java/security/cert/CRLReason.java b/jdk/src/java.base/share/classes/java/security/cert/CRLReason.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/CRLReason.java
rename to jdk/src/java.base/share/classes/java/security/cert/CRLReason.java
diff --git a/jdk/src/share/classes/java/security/cert/CRLSelector.java b/jdk/src/java.base/share/classes/java/security/cert/CRLSelector.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/CRLSelector.java
rename to jdk/src/java.base/share/classes/java/security/cert/CRLSelector.java
diff --git a/jdk/src/share/classes/java/security/cert/CertPath.java b/jdk/src/java.base/share/classes/java/security/cert/CertPath.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/CertPath.java
rename to jdk/src/java.base/share/classes/java/security/cert/CertPath.java
diff --git a/jdk/src/share/classes/java/security/cert/CertPathBuilder.java b/jdk/src/java.base/share/classes/java/security/cert/CertPathBuilder.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/CertPathBuilder.java
rename to jdk/src/java.base/share/classes/java/security/cert/CertPathBuilder.java
diff --git a/jdk/src/share/classes/java/security/cert/CertPathBuilderException.java b/jdk/src/java.base/share/classes/java/security/cert/CertPathBuilderException.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/CertPathBuilderException.java
rename to jdk/src/java.base/share/classes/java/security/cert/CertPathBuilderException.java
diff --git a/jdk/src/share/classes/java/security/cert/CertPathBuilderResult.java b/jdk/src/java.base/share/classes/java/security/cert/CertPathBuilderResult.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/CertPathBuilderResult.java
rename to jdk/src/java.base/share/classes/java/security/cert/CertPathBuilderResult.java
diff --git a/jdk/src/share/classes/java/security/cert/CertPathBuilderSpi.java b/jdk/src/java.base/share/classes/java/security/cert/CertPathBuilderSpi.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/CertPathBuilderSpi.java
rename to jdk/src/java.base/share/classes/java/security/cert/CertPathBuilderSpi.java
diff --git a/jdk/src/share/classes/java/security/cert/CertPathChecker.java b/jdk/src/java.base/share/classes/java/security/cert/CertPathChecker.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/CertPathChecker.java
rename to jdk/src/java.base/share/classes/java/security/cert/CertPathChecker.java
diff --git a/jdk/src/share/classes/java/security/cert/CertPathHelperImpl.java b/jdk/src/java.base/share/classes/java/security/cert/CertPathHelperImpl.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/CertPathHelperImpl.java
rename to jdk/src/java.base/share/classes/java/security/cert/CertPathHelperImpl.java
diff --git a/jdk/src/share/classes/java/security/cert/CertPathParameters.java b/jdk/src/java.base/share/classes/java/security/cert/CertPathParameters.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/CertPathParameters.java
rename to jdk/src/java.base/share/classes/java/security/cert/CertPathParameters.java
diff --git a/jdk/src/share/classes/java/security/cert/CertPathValidator.java b/jdk/src/java.base/share/classes/java/security/cert/CertPathValidator.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/CertPathValidator.java
rename to jdk/src/java.base/share/classes/java/security/cert/CertPathValidator.java
diff --git a/jdk/src/share/classes/java/security/cert/CertPathValidatorException.java b/jdk/src/java.base/share/classes/java/security/cert/CertPathValidatorException.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/CertPathValidatorException.java
rename to jdk/src/java.base/share/classes/java/security/cert/CertPathValidatorException.java
diff --git a/jdk/src/share/classes/java/security/cert/CertPathValidatorResult.java b/jdk/src/java.base/share/classes/java/security/cert/CertPathValidatorResult.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/CertPathValidatorResult.java
rename to jdk/src/java.base/share/classes/java/security/cert/CertPathValidatorResult.java
diff --git a/jdk/src/share/classes/java/security/cert/CertPathValidatorSpi.java b/jdk/src/java.base/share/classes/java/security/cert/CertPathValidatorSpi.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/CertPathValidatorSpi.java
rename to jdk/src/java.base/share/classes/java/security/cert/CertPathValidatorSpi.java
diff --git a/jdk/src/share/classes/java/security/cert/CertSelector.java b/jdk/src/java.base/share/classes/java/security/cert/CertSelector.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/CertSelector.java
rename to jdk/src/java.base/share/classes/java/security/cert/CertSelector.java
diff --git a/jdk/src/share/classes/java/security/cert/CertStore.java b/jdk/src/java.base/share/classes/java/security/cert/CertStore.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/CertStore.java
rename to jdk/src/java.base/share/classes/java/security/cert/CertStore.java
diff --git a/jdk/src/share/classes/java/security/cert/CertStoreException.java b/jdk/src/java.base/share/classes/java/security/cert/CertStoreException.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/CertStoreException.java
rename to jdk/src/java.base/share/classes/java/security/cert/CertStoreException.java
diff --git a/jdk/src/share/classes/java/security/cert/CertStoreParameters.java b/jdk/src/java.base/share/classes/java/security/cert/CertStoreParameters.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/CertStoreParameters.java
rename to jdk/src/java.base/share/classes/java/security/cert/CertStoreParameters.java
diff --git a/jdk/src/share/classes/java/security/cert/CertStoreSpi.java b/jdk/src/java.base/share/classes/java/security/cert/CertStoreSpi.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/CertStoreSpi.java
rename to jdk/src/java.base/share/classes/java/security/cert/CertStoreSpi.java
diff --git a/jdk/src/share/classes/java/security/cert/Certificate.java b/jdk/src/java.base/share/classes/java/security/cert/Certificate.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/Certificate.java
rename to jdk/src/java.base/share/classes/java/security/cert/Certificate.java
diff --git a/jdk/src/share/classes/java/security/cert/CertificateEncodingException.java b/jdk/src/java.base/share/classes/java/security/cert/CertificateEncodingException.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/CertificateEncodingException.java
rename to jdk/src/java.base/share/classes/java/security/cert/CertificateEncodingException.java
diff --git a/jdk/src/share/classes/java/security/cert/CertificateException.java b/jdk/src/java.base/share/classes/java/security/cert/CertificateException.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/CertificateException.java
rename to jdk/src/java.base/share/classes/java/security/cert/CertificateException.java
diff --git a/jdk/src/share/classes/java/security/cert/CertificateExpiredException.java b/jdk/src/java.base/share/classes/java/security/cert/CertificateExpiredException.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/CertificateExpiredException.java
rename to jdk/src/java.base/share/classes/java/security/cert/CertificateExpiredException.java
diff --git a/jdk/src/share/classes/java/security/cert/CertificateFactory.java b/jdk/src/java.base/share/classes/java/security/cert/CertificateFactory.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/CertificateFactory.java
rename to jdk/src/java.base/share/classes/java/security/cert/CertificateFactory.java
diff --git a/jdk/src/share/classes/java/security/cert/CertificateFactorySpi.java b/jdk/src/java.base/share/classes/java/security/cert/CertificateFactorySpi.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/CertificateFactorySpi.java
rename to jdk/src/java.base/share/classes/java/security/cert/CertificateFactorySpi.java
diff --git a/jdk/src/share/classes/java/security/cert/CertificateNotYetValidException.java b/jdk/src/java.base/share/classes/java/security/cert/CertificateNotYetValidException.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/CertificateNotYetValidException.java
rename to jdk/src/java.base/share/classes/java/security/cert/CertificateNotYetValidException.java
diff --git a/jdk/src/share/classes/java/security/cert/CertificateParsingException.java b/jdk/src/java.base/share/classes/java/security/cert/CertificateParsingException.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/CertificateParsingException.java
rename to jdk/src/java.base/share/classes/java/security/cert/CertificateParsingException.java
diff --git a/jdk/src/share/classes/java/security/cert/CertificateRevokedException.java b/jdk/src/java.base/share/classes/java/security/cert/CertificateRevokedException.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/CertificateRevokedException.java
rename to jdk/src/java.base/share/classes/java/security/cert/CertificateRevokedException.java
diff --git a/jdk/src/share/classes/java/security/cert/CollectionCertStoreParameters.java b/jdk/src/java.base/share/classes/java/security/cert/CollectionCertStoreParameters.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/CollectionCertStoreParameters.java
rename to jdk/src/java.base/share/classes/java/security/cert/CollectionCertStoreParameters.java
diff --git a/jdk/src/share/classes/java/security/cert/Extension.java b/jdk/src/java.base/share/classes/java/security/cert/Extension.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/Extension.java
rename to jdk/src/java.base/share/classes/java/security/cert/Extension.java
diff --git a/jdk/src/share/classes/java/security/cert/LDAPCertStoreParameters.java b/jdk/src/java.base/share/classes/java/security/cert/LDAPCertStoreParameters.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/LDAPCertStoreParameters.java
rename to jdk/src/java.base/share/classes/java/security/cert/LDAPCertStoreParameters.java
diff --git a/jdk/src/share/classes/java/security/cert/PKIXBuilderParameters.java b/jdk/src/java.base/share/classes/java/security/cert/PKIXBuilderParameters.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/PKIXBuilderParameters.java
rename to jdk/src/java.base/share/classes/java/security/cert/PKIXBuilderParameters.java
diff --git a/jdk/src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java b/jdk/src/java.base/share/classes/java/security/cert/PKIXCertPathBuilderResult.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java
rename to jdk/src/java.base/share/classes/java/security/cert/PKIXCertPathBuilderResult.java
diff --git a/jdk/src/share/classes/java/security/cert/PKIXCertPathChecker.java b/jdk/src/java.base/share/classes/java/security/cert/PKIXCertPathChecker.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/PKIXCertPathChecker.java
rename to jdk/src/java.base/share/classes/java/security/cert/PKIXCertPathChecker.java
diff --git a/jdk/src/share/classes/java/security/cert/PKIXCertPathValidatorResult.java b/jdk/src/java.base/share/classes/java/security/cert/PKIXCertPathValidatorResult.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/PKIXCertPathValidatorResult.java
rename to jdk/src/java.base/share/classes/java/security/cert/PKIXCertPathValidatorResult.java
diff --git a/jdk/src/share/classes/java/security/cert/PKIXParameters.java b/jdk/src/java.base/share/classes/java/security/cert/PKIXParameters.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/PKIXParameters.java
rename to jdk/src/java.base/share/classes/java/security/cert/PKIXParameters.java
diff --git a/jdk/src/share/classes/java/security/cert/PKIXReason.java b/jdk/src/java.base/share/classes/java/security/cert/PKIXReason.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/PKIXReason.java
rename to jdk/src/java.base/share/classes/java/security/cert/PKIXReason.java
diff --git a/jdk/src/share/classes/java/security/cert/PKIXRevocationChecker.java b/jdk/src/java.base/share/classes/java/security/cert/PKIXRevocationChecker.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/PKIXRevocationChecker.java
rename to jdk/src/java.base/share/classes/java/security/cert/PKIXRevocationChecker.java
diff --git a/jdk/src/share/classes/java/security/cert/PolicyNode.java b/jdk/src/java.base/share/classes/java/security/cert/PolicyNode.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/PolicyNode.java
rename to jdk/src/java.base/share/classes/java/security/cert/PolicyNode.java
diff --git a/jdk/src/share/classes/java/security/cert/PolicyQualifierInfo.java b/jdk/src/java.base/share/classes/java/security/cert/PolicyQualifierInfo.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/PolicyQualifierInfo.java
rename to jdk/src/java.base/share/classes/java/security/cert/PolicyQualifierInfo.java
diff --git a/jdk/src/share/classes/java/security/cert/TrustAnchor.java b/jdk/src/java.base/share/classes/java/security/cert/TrustAnchor.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/TrustAnchor.java
rename to jdk/src/java.base/share/classes/java/security/cert/TrustAnchor.java
diff --git a/jdk/src/share/classes/java/security/cert/X509CRL.java b/jdk/src/java.base/share/classes/java/security/cert/X509CRL.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/X509CRL.java
rename to jdk/src/java.base/share/classes/java/security/cert/X509CRL.java
diff --git a/jdk/src/share/classes/java/security/cert/X509CRLEntry.java b/jdk/src/java.base/share/classes/java/security/cert/X509CRLEntry.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/X509CRLEntry.java
rename to jdk/src/java.base/share/classes/java/security/cert/X509CRLEntry.java
diff --git a/jdk/src/share/classes/java/security/cert/X509CRLSelector.java b/jdk/src/java.base/share/classes/java/security/cert/X509CRLSelector.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/X509CRLSelector.java
rename to jdk/src/java.base/share/classes/java/security/cert/X509CRLSelector.java
diff --git a/jdk/src/share/classes/java/security/cert/X509CertSelector.java b/jdk/src/java.base/share/classes/java/security/cert/X509CertSelector.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/X509CertSelector.java
rename to jdk/src/java.base/share/classes/java/security/cert/X509CertSelector.java
diff --git a/jdk/src/share/classes/java/security/cert/X509Certificate.java b/jdk/src/java.base/share/classes/java/security/cert/X509Certificate.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/X509Certificate.java
rename to jdk/src/java.base/share/classes/java/security/cert/X509Certificate.java
diff --git a/jdk/src/share/classes/java/security/cert/X509Extension.java b/jdk/src/java.base/share/classes/java/security/cert/X509Extension.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/X509Extension.java
rename to jdk/src/java.base/share/classes/java/security/cert/X509Extension.java
diff --git a/jdk/src/share/classes/java/security/cert/package-info.java b/jdk/src/java.base/share/classes/java/security/cert/package-info.java
similarity index 100%
rename from jdk/src/share/classes/java/security/cert/package-info.java
rename to jdk/src/java.base/share/classes/java/security/cert/package-info.java
diff --git a/jdk/src/share/classes/java/security/interfaces/DSAKey.java b/jdk/src/java.base/share/classes/java/security/interfaces/DSAKey.java
similarity index 100%
rename from jdk/src/share/classes/java/security/interfaces/DSAKey.java
rename to jdk/src/java.base/share/classes/java/security/interfaces/DSAKey.java
diff --git a/jdk/src/share/classes/java/security/interfaces/DSAKeyPairGenerator.java b/jdk/src/java.base/share/classes/java/security/interfaces/DSAKeyPairGenerator.java
similarity index 100%
rename from jdk/src/share/classes/java/security/interfaces/DSAKeyPairGenerator.java
rename to jdk/src/java.base/share/classes/java/security/interfaces/DSAKeyPairGenerator.java
diff --git a/jdk/src/share/classes/java/security/interfaces/DSAParams.java b/jdk/src/java.base/share/classes/java/security/interfaces/DSAParams.java
similarity index 100%
rename from jdk/src/share/classes/java/security/interfaces/DSAParams.java
rename to jdk/src/java.base/share/classes/java/security/interfaces/DSAParams.java
diff --git a/jdk/src/share/classes/java/security/interfaces/DSAPrivateKey.java b/jdk/src/java.base/share/classes/java/security/interfaces/DSAPrivateKey.java
similarity index 100%
rename from jdk/src/share/classes/java/security/interfaces/DSAPrivateKey.java
rename to jdk/src/java.base/share/classes/java/security/interfaces/DSAPrivateKey.java
diff --git a/jdk/src/share/classes/java/security/interfaces/DSAPublicKey.java b/jdk/src/java.base/share/classes/java/security/interfaces/DSAPublicKey.java
similarity index 100%
rename from jdk/src/share/classes/java/security/interfaces/DSAPublicKey.java
rename to jdk/src/java.base/share/classes/java/security/interfaces/DSAPublicKey.java
diff --git a/jdk/src/share/classes/java/security/interfaces/ECKey.java b/jdk/src/java.base/share/classes/java/security/interfaces/ECKey.java
similarity index 100%
rename from jdk/src/share/classes/java/security/interfaces/ECKey.java
rename to jdk/src/java.base/share/classes/java/security/interfaces/ECKey.java
diff --git a/jdk/src/share/classes/java/security/interfaces/ECPrivateKey.java b/jdk/src/java.base/share/classes/java/security/interfaces/ECPrivateKey.java
similarity index 100%
rename from jdk/src/share/classes/java/security/interfaces/ECPrivateKey.java
rename to jdk/src/java.base/share/classes/java/security/interfaces/ECPrivateKey.java
diff --git a/jdk/src/share/classes/java/security/interfaces/ECPublicKey.java b/jdk/src/java.base/share/classes/java/security/interfaces/ECPublicKey.java
similarity index 100%
rename from jdk/src/share/classes/java/security/interfaces/ECPublicKey.java
rename to jdk/src/java.base/share/classes/java/security/interfaces/ECPublicKey.java
diff --git a/jdk/src/share/classes/java/security/interfaces/RSAKey.java b/jdk/src/java.base/share/classes/java/security/interfaces/RSAKey.java
similarity index 100%
rename from jdk/src/share/classes/java/security/interfaces/RSAKey.java
rename to jdk/src/java.base/share/classes/java/security/interfaces/RSAKey.java
diff --git a/jdk/src/share/classes/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java b/jdk/src/java.base/share/classes/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java
similarity index 100%
rename from jdk/src/share/classes/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java
rename to jdk/src/java.base/share/classes/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java
diff --git a/jdk/src/share/classes/java/security/interfaces/RSAPrivateCrtKey.java b/jdk/src/java.base/share/classes/java/security/interfaces/RSAPrivateCrtKey.java
similarity index 100%
rename from jdk/src/share/classes/java/security/interfaces/RSAPrivateCrtKey.java
rename to jdk/src/java.base/share/classes/java/security/interfaces/RSAPrivateCrtKey.java
diff --git a/jdk/src/share/classes/java/security/interfaces/RSAPrivateKey.java b/jdk/src/java.base/share/classes/java/security/interfaces/RSAPrivateKey.java
similarity index 100%
rename from jdk/src/share/classes/java/security/interfaces/RSAPrivateKey.java
rename to jdk/src/java.base/share/classes/java/security/interfaces/RSAPrivateKey.java
diff --git a/jdk/src/share/classes/java/security/interfaces/RSAPublicKey.java b/jdk/src/java.base/share/classes/java/security/interfaces/RSAPublicKey.java
similarity index 100%
rename from jdk/src/share/classes/java/security/interfaces/RSAPublicKey.java
rename to jdk/src/java.base/share/classes/java/security/interfaces/RSAPublicKey.java
diff --git a/jdk/src/share/classes/java/security/interfaces/package-info.java b/jdk/src/java.base/share/classes/java/security/interfaces/package-info.java
similarity index 100%
rename from jdk/src/share/classes/java/security/interfaces/package-info.java
rename to jdk/src/java.base/share/classes/java/security/interfaces/package-info.java
diff --git a/jdk/src/share/classes/java/security/package-info.java b/jdk/src/java.base/share/classes/java/security/package-info.java
similarity index 100%
rename from jdk/src/share/classes/java/security/package-info.java
rename to jdk/src/java.base/share/classes/java/security/package-info.java
diff --git a/jdk/src/share/classes/java/security/spec/AlgorithmParameterSpec.java b/jdk/src/java.base/share/classes/java/security/spec/AlgorithmParameterSpec.java
similarity index 100%
rename from jdk/src/share/classes/java/security/spec/AlgorithmParameterSpec.java
rename to jdk/src/java.base/share/classes/java/security/spec/AlgorithmParameterSpec.java
diff --git a/jdk/src/share/classes/java/security/spec/DSAGenParameterSpec.java b/jdk/src/java.base/share/classes/java/security/spec/DSAGenParameterSpec.java
similarity index 100%
rename from jdk/src/share/classes/java/security/spec/DSAGenParameterSpec.java
rename to jdk/src/java.base/share/classes/java/security/spec/DSAGenParameterSpec.java
diff --git a/jdk/src/share/classes/java/security/spec/DSAParameterSpec.java b/jdk/src/java.base/share/classes/java/security/spec/DSAParameterSpec.java
similarity index 100%
rename from jdk/src/share/classes/java/security/spec/DSAParameterSpec.java
rename to jdk/src/java.base/share/classes/java/security/spec/DSAParameterSpec.java
diff --git a/jdk/src/share/classes/java/security/spec/DSAPrivateKeySpec.java b/jdk/src/java.base/share/classes/java/security/spec/DSAPrivateKeySpec.java
similarity index 100%
rename from jdk/src/share/classes/java/security/spec/DSAPrivateKeySpec.java
rename to jdk/src/java.base/share/classes/java/security/spec/DSAPrivateKeySpec.java
diff --git a/jdk/src/share/classes/java/security/spec/DSAPublicKeySpec.java b/jdk/src/java.base/share/classes/java/security/spec/DSAPublicKeySpec.java
similarity index 100%
rename from jdk/src/share/classes/java/security/spec/DSAPublicKeySpec.java
rename to jdk/src/java.base/share/classes/java/security/spec/DSAPublicKeySpec.java
diff --git a/jdk/src/share/classes/java/security/spec/ECField.java b/jdk/src/java.base/share/classes/java/security/spec/ECField.java
similarity index 100%
rename from jdk/src/share/classes/java/security/spec/ECField.java
rename to jdk/src/java.base/share/classes/java/security/spec/ECField.java
diff --git a/jdk/src/share/classes/java/security/spec/ECFieldF2m.java b/jdk/src/java.base/share/classes/java/security/spec/ECFieldF2m.java
similarity index 100%
rename from jdk/src/share/classes/java/security/spec/ECFieldF2m.java
rename to jdk/src/java.base/share/classes/java/security/spec/ECFieldF2m.java
diff --git a/jdk/src/share/classes/java/security/spec/ECFieldFp.java b/jdk/src/java.base/share/classes/java/security/spec/ECFieldFp.java
similarity index 100%
rename from jdk/src/share/classes/java/security/spec/ECFieldFp.java
rename to jdk/src/java.base/share/classes/java/security/spec/ECFieldFp.java
diff --git a/jdk/src/share/classes/java/security/spec/ECGenParameterSpec.java b/jdk/src/java.base/share/classes/java/security/spec/ECGenParameterSpec.java
similarity index 100%
rename from jdk/src/share/classes/java/security/spec/ECGenParameterSpec.java
rename to jdk/src/java.base/share/classes/java/security/spec/ECGenParameterSpec.java
diff --git a/jdk/src/share/classes/java/security/spec/ECParameterSpec.java b/jdk/src/java.base/share/classes/java/security/spec/ECParameterSpec.java
similarity index 100%
rename from jdk/src/share/classes/java/security/spec/ECParameterSpec.java
rename to jdk/src/java.base/share/classes/java/security/spec/ECParameterSpec.java
diff --git a/jdk/src/share/classes/java/security/spec/ECPoint.java b/jdk/src/java.base/share/classes/java/security/spec/ECPoint.java
similarity index 100%
rename from jdk/src/share/classes/java/security/spec/ECPoint.java
rename to jdk/src/java.base/share/classes/java/security/spec/ECPoint.java
diff --git a/jdk/src/share/classes/java/security/spec/ECPrivateKeySpec.java b/jdk/src/java.base/share/classes/java/security/spec/ECPrivateKeySpec.java
similarity index 100%
rename from jdk/src/share/classes/java/security/spec/ECPrivateKeySpec.java
rename to jdk/src/java.base/share/classes/java/security/spec/ECPrivateKeySpec.java
diff --git a/jdk/src/share/classes/java/security/spec/ECPublicKeySpec.java b/jdk/src/java.base/share/classes/java/security/spec/ECPublicKeySpec.java
similarity index 100%
rename from jdk/src/share/classes/java/security/spec/ECPublicKeySpec.java
rename to jdk/src/java.base/share/classes/java/security/spec/ECPublicKeySpec.java
diff --git a/jdk/src/share/classes/java/security/spec/EllipticCurve.java b/jdk/src/java.base/share/classes/java/security/spec/EllipticCurve.java
similarity index 100%
rename from jdk/src/share/classes/java/security/spec/EllipticCurve.java
rename to jdk/src/java.base/share/classes/java/security/spec/EllipticCurve.java
diff --git a/jdk/src/share/classes/java/security/spec/EncodedKeySpec.java b/jdk/src/java.base/share/classes/java/security/spec/EncodedKeySpec.java
similarity index 100%
rename from jdk/src/share/classes/java/security/spec/EncodedKeySpec.java
rename to jdk/src/java.base/share/classes/java/security/spec/EncodedKeySpec.java
diff --git a/jdk/src/share/classes/java/security/spec/InvalidKeySpecException.java b/jdk/src/java.base/share/classes/java/security/spec/InvalidKeySpecException.java
similarity index 100%
rename from jdk/src/share/classes/java/security/spec/InvalidKeySpecException.java
rename to jdk/src/java.base/share/classes/java/security/spec/InvalidKeySpecException.java
diff --git a/jdk/src/share/classes/java/security/spec/InvalidParameterSpecException.java b/jdk/src/java.base/share/classes/java/security/spec/InvalidParameterSpecException.java
similarity index 100%
rename from jdk/src/share/classes/java/security/spec/InvalidParameterSpecException.java
rename to jdk/src/java.base/share/classes/java/security/spec/InvalidParameterSpecException.java
diff --git a/jdk/src/share/classes/java/security/spec/KeySpec.java b/jdk/src/java.base/share/classes/java/security/spec/KeySpec.java
similarity index 100%
rename from jdk/src/share/classes/java/security/spec/KeySpec.java
rename to jdk/src/java.base/share/classes/java/security/spec/KeySpec.java
diff --git a/jdk/src/share/classes/java/security/spec/MGF1ParameterSpec.java b/jdk/src/java.base/share/classes/java/security/spec/MGF1ParameterSpec.java
similarity index 100%
rename from jdk/src/share/classes/java/security/spec/MGF1ParameterSpec.java
rename to jdk/src/java.base/share/classes/java/security/spec/MGF1ParameterSpec.java
diff --git a/jdk/src/share/classes/java/security/spec/PKCS8EncodedKeySpec.java b/jdk/src/java.base/share/classes/java/security/spec/PKCS8EncodedKeySpec.java
similarity index 100%
rename from jdk/src/share/classes/java/security/spec/PKCS8EncodedKeySpec.java
rename to jdk/src/java.base/share/classes/java/security/spec/PKCS8EncodedKeySpec.java
diff --git a/jdk/src/share/classes/java/security/spec/PSSParameterSpec.java b/jdk/src/java.base/share/classes/java/security/spec/PSSParameterSpec.java
similarity index 100%
rename from jdk/src/share/classes/java/security/spec/PSSParameterSpec.java
rename to jdk/src/java.base/share/classes/java/security/spec/PSSParameterSpec.java
diff --git a/jdk/src/share/classes/java/security/spec/RSAKeyGenParameterSpec.java b/jdk/src/java.base/share/classes/java/security/spec/RSAKeyGenParameterSpec.java
similarity index 100%
rename from jdk/src/share/classes/java/security/spec/RSAKeyGenParameterSpec.java
rename to jdk/src/java.base/share/classes/java/security/spec/RSAKeyGenParameterSpec.java
diff --git a/jdk/src/share/classes/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java b/jdk/src/java.base/share/classes/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java
similarity index 100%
rename from jdk/src/share/classes/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java
rename to jdk/src/java.base/share/classes/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java
diff --git a/jdk/src/share/classes/java/security/spec/RSAOtherPrimeInfo.java b/jdk/src/java.base/share/classes/java/security/spec/RSAOtherPrimeInfo.java
similarity index 100%
rename from jdk/src/share/classes/java/security/spec/RSAOtherPrimeInfo.java
rename to jdk/src/java.base/share/classes/java/security/spec/RSAOtherPrimeInfo.java
diff --git a/jdk/src/share/classes/java/security/spec/RSAPrivateCrtKeySpec.java b/jdk/src/java.base/share/classes/java/security/spec/RSAPrivateCrtKeySpec.java
similarity index 100%
rename from jdk/src/share/classes/java/security/spec/RSAPrivateCrtKeySpec.java
rename to jdk/src/java.base/share/classes/java/security/spec/RSAPrivateCrtKeySpec.java
diff --git a/jdk/src/share/classes/java/security/spec/RSAPrivateKeySpec.java b/jdk/src/java.base/share/classes/java/security/spec/RSAPrivateKeySpec.java
similarity index 100%
rename from jdk/src/share/classes/java/security/spec/RSAPrivateKeySpec.java
rename to jdk/src/java.base/share/classes/java/security/spec/RSAPrivateKeySpec.java
diff --git a/jdk/src/share/classes/java/security/spec/RSAPublicKeySpec.java b/jdk/src/java.base/share/classes/java/security/spec/RSAPublicKeySpec.java
similarity index 100%
rename from jdk/src/share/classes/java/security/spec/RSAPublicKeySpec.java
rename to jdk/src/java.base/share/classes/java/security/spec/RSAPublicKeySpec.java
diff --git a/jdk/src/share/classes/java/security/spec/X509EncodedKeySpec.java b/jdk/src/java.base/share/classes/java/security/spec/X509EncodedKeySpec.java
similarity index 100%
rename from jdk/src/share/classes/java/security/spec/X509EncodedKeySpec.java
rename to jdk/src/java.base/share/classes/java/security/spec/X509EncodedKeySpec.java
diff --git a/jdk/src/share/classes/java/security/spec/package-info.java b/jdk/src/java.base/share/classes/java/security/spec/package-info.java
similarity index 100%
rename from jdk/src/share/classes/java/security/spec/package-info.java
rename to jdk/src/java.base/share/classes/java/security/spec/package-info.java
diff --git a/jdk/src/share/classes/java/text/Annotation.java b/jdk/src/java.base/share/classes/java/text/Annotation.java
similarity index 100%
rename from jdk/src/share/classes/java/text/Annotation.java
rename to jdk/src/java.base/share/classes/java/text/Annotation.java
diff --git a/jdk/src/share/classes/java/text/AttributedCharacterIterator.java b/jdk/src/java.base/share/classes/java/text/AttributedCharacterIterator.java
similarity index 100%
rename from jdk/src/share/classes/java/text/AttributedCharacterIterator.java
rename to jdk/src/java.base/share/classes/java/text/AttributedCharacterIterator.java
diff --git a/jdk/src/share/classes/java/text/AttributedString.java b/jdk/src/java.base/share/classes/java/text/AttributedString.java
similarity index 100%
rename from jdk/src/share/classes/java/text/AttributedString.java
rename to jdk/src/java.base/share/classes/java/text/AttributedString.java
diff --git a/jdk/src/share/classes/java/text/Bidi.java b/jdk/src/java.base/share/classes/java/text/Bidi.java
similarity index 100%
rename from jdk/src/share/classes/java/text/Bidi.java
rename to jdk/src/java.base/share/classes/java/text/Bidi.java
diff --git a/jdk/src/share/classes/java/text/BreakIterator.java b/jdk/src/java.base/share/classes/java/text/BreakIterator.java
similarity index 100%
rename from jdk/src/share/classes/java/text/BreakIterator.java
rename to jdk/src/java.base/share/classes/java/text/BreakIterator.java
diff --git a/jdk/src/share/classes/java/text/CalendarBuilder.java b/jdk/src/java.base/share/classes/java/text/CalendarBuilder.java
similarity index 100%
rename from jdk/src/share/classes/java/text/CalendarBuilder.java
rename to jdk/src/java.base/share/classes/java/text/CalendarBuilder.java
diff --git a/jdk/src/share/classes/java/text/CharacterIterator.java b/jdk/src/java.base/share/classes/java/text/CharacterIterator.java
similarity index 100%
rename from jdk/src/share/classes/java/text/CharacterIterator.java
rename to jdk/src/java.base/share/classes/java/text/CharacterIterator.java
diff --git a/jdk/src/share/classes/java/text/CharacterIteratorFieldDelegate.java b/jdk/src/java.base/share/classes/java/text/CharacterIteratorFieldDelegate.java
similarity index 100%
rename from jdk/src/share/classes/java/text/CharacterIteratorFieldDelegate.java
rename to jdk/src/java.base/share/classes/java/text/CharacterIteratorFieldDelegate.java
diff --git a/jdk/src/share/classes/java/text/ChoiceFormat.java b/jdk/src/java.base/share/classes/java/text/ChoiceFormat.java
similarity index 100%
rename from jdk/src/share/classes/java/text/ChoiceFormat.java
rename to jdk/src/java.base/share/classes/java/text/ChoiceFormat.java
diff --git a/jdk/src/share/classes/java/text/CollationElementIterator.java b/jdk/src/java.base/share/classes/java/text/CollationElementIterator.java
similarity index 100%
rename from jdk/src/share/classes/java/text/CollationElementIterator.java
rename to jdk/src/java.base/share/classes/java/text/CollationElementIterator.java
diff --git a/jdk/src/share/classes/java/text/CollationKey.java b/jdk/src/java.base/share/classes/java/text/CollationKey.java
similarity index 100%
rename from jdk/src/share/classes/java/text/CollationKey.java
rename to jdk/src/java.base/share/classes/java/text/CollationKey.java
diff --git a/jdk/src/share/classes/java/text/Collator.java b/jdk/src/java.base/share/classes/java/text/Collator.java
similarity index 100%
rename from jdk/src/share/classes/java/text/Collator.java
rename to jdk/src/java.base/share/classes/java/text/Collator.java
diff --git a/jdk/src/share/classes/java/text/DateFormat.java b/jdk/src/java.base/share/classes/java/text/DateFormat.java
similarity index 100%
rename from jdk/src/share/classes/java/text/DateFormat.java
rename to jdk/src/java.base/share/classes/java/text/DateFormat.java
diff --git a/jdk/src/share/classes/java/text/DateFormatSymbols.java b/jdk/src/java.base/share/classes/java/text/DateFormatSymbols.java
similarity index 100%
rename from jdk/src/share/classes/java/text/DateFormatSymbols.java
rename to jdk/src/java.base/share/classes/java/text/DateFormatSymbols.java
diff --git a/jdk/src/share/classes/java/text/DecimalFormat.java b/jdk/src/java.base/share/classes/java/text/DecimalFormat.java
similarity index 100%
rename from jdk/src/share/classes/java/text/DecimalFormat.java
rename to jdk/src/java.base/share/classes/java/text/DecimalFormat.java
diff --git a/jdk/src/share/classes/java/text/DecimalFormatSymbols.java b/jdk/src/java.base/share/classes/java/text/DecimalFormatSymbols.java
similarity index 100%
rename from jdk/src/share/classes/java/text/DecimalFormatSymbols.java
rename to jdk/src/java.base/share/classes/java/text/DecimalFormatSymbols.java
diff --git a/jdk/src/share/classes/java/text/DigitList.java b/jdk/src/java.base/share/classes/java/text/DigitList.java
similarity index 100%
rename from jdk/src/share/classes/java/text/DigitList.java
rename to jdk/src/java.base/share/classes/java/text/DigitList.java
diff --git a/jdk/src/share/classes/java/text/DontCareFieldPosition.java b/jdk/src/java.base/share/classes/java/text/DontCareFieldPosition.java
similarity index 100%
rename from jdk/src/share/classes/java/text/DontCareFieldPosition.java
rename to jdk/src/java.base/share/classes/java/text/DontCareFieldPosition.java
diff --git a/jdk/src/share/classes/java/text/EntryPair.java b/jdk/src/java.base/share/classes/java/text/EntryPair.java
similarity index 100%
rename from jdk/src/share/classes/java/text/EntryPair.java
rename to jdk/src/java.base/share/classes/java/text/EntryPair.java
diff --git a/jdk/src/share/classes/java/text/FieldPosition.java b/jdk/src/java.base/share/classes/java/text/FieldPosition.java
similarity index 100%
rename from jdk/src/share/classes/java/text/FieldPosition.java
rename to jdk/src/java.base/share/classes/java/text/FieldPosition.java
diff --git a/jdk/src/share/classes/java/text/Format.java b/jdk/src/java.base/share/classes/java/text/Format.java
similarity index 100%
rename from jdk/src/share/classes/java/text/Format.java
rename to jdk/src/java.base/share/classes/java/text/Format.java
diff --git a/jdk/src/share/classes/java/text/MergeCollation.java b/jdk/src/java.base/share/classes/java/text/MergeCollation.java
similarity index 100%
rename from jdk/src/share/classes/java/text/MergeCollation.java
rename to jdk/src/java.base/share/classes/java/text/MergeCollation.java
diff --git a/jdk/src/share/classes/java/text/MessageFormat.java b/jdk/src/java.base/share/classes/java/text/MessageFormat.java
similarity index 100%
rename from jdk/src/share/classes/java/text/MessageFormat.java
rename to jdk/src/java.base/share/classes/java/text/MessageFormat.java
diff --git a/jdk/src/share/classes/java/text/Normalizer.java b/jdk/src/java.base/share/classes/java/text/Normalizer.java
similarity index 100%
rename from jdk/src/share/classes/java/text/Normalizer.java
rename to jdk/src/java.base/share/classes/java/text/Normalizer.java
diff --git a/jdk/src/share/classes/java/text/NumberFormat.java b/jdk/src/java.base/share/classes/java/text/NumberFormat.java
similarity index 100%
rename from jdk/src/share/classes/java/text/NumberFormat.java
rename to jdk/src/java.base/share/classes/java/text/NumberFormat.java
diff --git a/jdk/src/share/classes/java/text/ParseException.java b/jdk/src/java.base/share/classes/java/text/ParseException.java
similarity index 100%
rename from jdk/src/share/classes/java/text/ParseException.java
rename to jdk/src/java.base/share/classes/java/text/ParseException.java
diff --git a/jdk/src/share/classes/java/text/ParsePosition.java b/jdk/src/java.base/share/classes/java/text/ParsePosition.java
similarity index 100%
rename from jdk/src/share/classes/java/text/ParsePosition.java
rename to jdk/src/java.base/share/classes/java/text/ParsePosition.java
diff --git a/jdk/src/share/classes/java/text/PatternEntry.java b/jdk/src/java.base/share/classes/java/text/PatternEntry.java
similarity index 100%
rename from jdk/src/share/classes/java/text/PatternEntry.java
rename to jdk/src/java.base/share/classes/java/text/PatternEntry.java
diff --git a/jdk/src/share/classes/java/text/RBCollationTables.java b/jdk/src/java.base/share/classes/java/text/RBCollationTables.java
similarity index 100%
rename from jdk/src/share/classes/java/text/RBCollationTables.java
rename to jdk/src/java.base/share/classes/java/text/RBCollationTables.java
diff --git a/jdk/src/share/classes/java/text/RBTableBuilder.java b/jdk/src/java.base/share/classes/java/text/RBTableBuilder.java
similarity index 100%
rename from jdk/src/share/classes/java/text/RBTableBuilder.java
rename to jdk/src/java.base/share/classes/java/text/RBTableBuilder.java
diff --git a/jdk/src/share/classes/java/text/RuleBasedCollationKey.java b/jdk/src/java.base/share/classes/java/text/RuleBasedCollationKey.java
similarity index 100%
rename from jdk/src/share/classes/java/text/RuleBasedCollationKey.java
rename to jdk/src/java.base/share/classes/java/text/RuleBasedCollationKey.java
diff --git a/jdk/src/share/classes/java/text/RuleBasedCollator.java b/jdk/src/java.base/share/classes/java/text/RuleBasedCollator.java
similarity index 100%
rename from jdk/src/share/classes/java/text/RuleBasedCollator.java
rename to jdk/src/java.base/share/classes/java/text/RuleBasedCollator.java
diff --git a/jdk/src/share/classes/java/text/SimpleDateFormat.java b/jdk/src/java.base/share/classes/java/text/SimpleDateFormat.java
similarity index 100%
rename from jdk/src/share/classes/java/text/SimpleDateFormat.java
rename to jdk/src/java.base/share/classes/java/text/SimpleDateFormat.java
diff --git a/jdk/src/share/classes/java/text/StringCharacterIterator.java b/jdk/src/java.base/share/classes/java/text/StringCharacterIterator.java
similarity index 100%
rename from jdk/src/share/classes/java/text/StringCharacterIterator.java
rename to jdk/src/java.base/share/classes/java/text/StringCharacterIterator.java
diff --git a/jdk/src/share/classes/java/text/package.html b/jdk/src/java.base/share/classes/java/text/package.html
similarity index 100%
rename from jdk/src/share/classes/java/text/package.html
rename to jdk/src/java.base/share/classes/java/text/package.html
diff --git a/jdk/src/share/classes/java/text/spi/BreakIteratorProvider.java b/jdk/src/java.base/share/classes/java/text/spi/BreakIteratorProvider.java
similarity index 100%
rename from jdk/src/share/classes/java/text/spi/BreakIteratorProvider.java
rename to jdk/src/java.base/share/classes/java/text/spi/BreakIteratorProvider.java
diff --git a/jdk/src/share/classes/java/text/spi/CollatorProvider.java b/jdk/src/java.base/share/classes/java/text/spi/CollatorProvider.java
similarity index 100%
rename from jdk/src/share/classes/java/text/spi/CollatorProvider.java
rename to jdk/src/java.base/share/classes/java/text/spi/CollatorProvider.java
diff --git a/jdk/src/share/classes/java/text/spi/DateFormatProvider.java b/jdk/src/java.base/share/classes/java/text/spi/DateFormatProvider.java
similarity index 100%
rename from jdk/src/share/classes/java/text/spi/DateFormatProvider.java
rename to jdk/src/java.base/share/classes/java/text/spi/DateFormatProvider.java
diff --git a/jdk/src/share/classes/java/text/spi/DateFormatSymbolsProvider.java b/jdk/src/java.base/share/classes/java/text/spi/DateFormatSymbolsProvider.java
similarity index 100%
rename from jdk/src/share/classes/java/text/spi/DateFormatSymbolsProvider.java
rename to jdk/src/java.base/share/classes/java/text/spi/DateFormatSymbolsProvider.java
diff --git a/jdk/src/share/classes/java/text/spi/DecimalFormatSymbolsProvider.java b/jdk/src/java.base/share/classes/java/text/spi/DecimalFormatSymbolsProvider.java
similarity index 100%
rename from jdk/src/share/classes/java/text/spi/DecimalFormatSymbolsProvider.java
rename to jdk/src/java.base/share/classes/java/text/spi/DecimalFormatSymbolsProvider.java
diff --git a/jdk/src/share/classes/java/text/spi/NumberFormatProvider.java b/jdk/src/java.base/share/classes/java/text/spi/NumberFormatProvider.java
similarity index 100%
rename from jdk/src/share/classes/java/text/spi/NumberFormatProvider.java
rename to jdk/src/java.base/share/classes/java/text/spi/NumberFormatProvider.java
diff --git a/jdk/src/share/classes/java/text/spi/package.html b/jdk/src/java.base/share/classes/java/text/spi/package.html
similarity index 100%
rename from jdk/src/share/classes/java/text/spi/package.html
rename to jdk/src/java.base/share/classes/java/text/spi/package.html
diff --git a/jdk/src/share/classes/java/time/Clock.java b/jdk/src/java.base/share/classes/java/time/Clock.java
similarity index 100%
rename from jdk/src/share/classes/java/time/Clock.java
rename to jdk/src/java.base/share/classes/java/time/Clock.java
diff --git a/jdk/src/share/classes/java/time/DateTimeException.java b/jdk/src/java.base/share/classes/java/time/DateTimeException.java
similarity index 100%
rename from jdk/src/share/classes/java/time/DateTimeException.java
rename to jdk/src/java.base/share/classes/java/time/DateTimeException.java
diff --git a/jdk/src/share/classes/java/time/DayOfWeek.java b/jdk/src/java.base/share/classes/java/time/DayOfWeek.java
similarity index 100%
rename from jdk/src/share/classes/java/time/DayOfWeek.java
rename to jdk/src/java.base/share/classes/java/time/DayOfWeek.java
diff --git a/jdk/src/share/classes/java/time/Duration.java b/jdk/src/java.base/share/classes/java/time/Duration.java
similarity index 96%
rename from jdk/src/share/classes/java/time/Duration.java
rename to jdk/src/java.base/share/classes/java/time/Duration.java
index cb672c4d3b4..30d146dbf64 100644
--- a/jdk/src/share/classes/java/time/Duration.java
+++ b/jdk/src/java.base/share/classes/java/time/Duration.java
@@ -388,19 +388,21 @@ public final class Duration
         Matcher matcher = PATTERN.matcher(text);
         if (matcher.matches()) {
             // check for letter T but no time sections
-            if ("T".equals(matcher.group(3)) == false) {
-                boolean negate = "-".equals(matcher.group(1));
-                String dayMatch = matcher.group(2);
-                String hourMatch = matcher.group(4);
-                String minuteMatch = matcher.group(5);
-                String secondMatch = matcher.group(6);
-                String fractionMatch = matcher.group(7);
-                if (dayMatch != null || hourMatch != null || minuteMatch != null || secondMatch != null) {
-                    long daysAsSecs = parseNumber(text, dayMatch, SECONDS_PER_DAY, "days");
-                    long hoursAsSecs = parseNumber(text, hourMatch, SECONDS_PER_HOUR, "hours");
-                    long minsAsSecs = parseNumber(text, minuteMatch, SECONDS_PER_MINUTE, "minutes");
-                    long seconds = parseNumber(text, secondMatch, 1, "seconds");
-                    int nanos = parseFraction(text,  fractionMatch, seconds < 0 ? -1 : 1);
+            if (!charMatch(text, matcher.start(3), matcher.end(3), 'T')) {
+                boolean negate = charMatch(text, matcher.start(1), matcher.end(1), '-');
+
+                int dayStart = matcher.start(2), dayEnd = matcher.end(2);
+                int hourStart = matcher.start(4), hourEnd = matcher.end(4);
+                int minuteStart = matcher.start(5), minuteEnd = matcher.end(5);
+                int secondStart = matcher.start(6), secondEnd = matcher.end(6);
+                int fractionStart = matcher.start(7), fractionEnd = matcher.end(7);
+
+                if (dayStart >= 0 || hourStart >= 0 || minuteStart >= 0 || secondStart >= 0) {
+                    long daysAsSecs = parseNumber(text, dayStart, dayEnd, SECONDS_PER_DAY, "days");
+                    long hoursAsSecs = parseNumber(text, hourStart, hourEnd, SECONDS_PER_HOUR, "hours");
+                    long minsAsSecs = parseNumber(text, minuteStart, minuteEnd, SECONDS_PER_MINUTE, "minutes");
+                    long seconds = parseNumber(text, secondStart, secondEnd, 1, "seconds");
+                    int nanos = parseFraction(text, fractionStart, fractionEnd, seconds < 0 ? -1 : 1);
                     try {
                         return create(negate, daysAsSecs, hoursAsSecs, minsAsSecs, seconds, nanos);
                     } catch (ArithmeticException ex) {
@@ -412,27 +414,37 @@ public final class Duration
         throw new DateTimeParseException("Text cannot be parsed to a Duration", text, 0);
     }
 
-    private static long parseNumber(CharSequence text, String parsed, int multiplier, String errorText) {
+    private static boolean charMatch(CharSequence text, int start, int end, char c) {
+        return (start >= 0 && end == start + 1 && text.charAt(start) == c);
+    }
+
+    private static long parseNumber(CharSequence text, int start, int end, int multiplier, String errorText) {
         // regex limits to [-+]?[0-9]+
-        if (parsed == null) {
+        if (start < 0 || end < 0) {
             return 0;
         }
         try {
-            long val = Long.parseLong(parsed);
+            long val = Long.parseLong(text, 10, start, end);
             return Math.multiplyExact(val, multiplier);
         } catch (NumberFormatException | ArithmeticException ex) {
             throw (DateTimeParseException) new DateTimeParseException("Text cannot be parsed to a Duration: " + errorText, text, 0).initCause(ex);
         }
     }
 
-    private static int parseFraction(CharSequence text, String parsed, int negate) {
+    private static int parseFraction(CharSequence text, int start, int end, int negate) {
         // regex limits to [0-9]{0,9}
-        if (parsed == null || parsed.length() == 0) {
+        if (start < 0 || end < 0 || end - start == 0) {
             return 0;
         }
         try {
-            parsed = (parsed + "000000000").substring(0, 9);
-            return Integer.parseInt(parsed) * negate;
+            int fraction = Integer.parseInt(text, 10, start, end);
+
+            // for number strings smaller than 9 digits, interpret as if there
+            // were trailing zeros
+            for (int i = end - start; i < 9; i++) {
+                fraction *= 10;
+            }
+            return fraction * negate;
         } catch (NumberFormatException | ArithmeticException ex) {
             throw (DateTimeParseException) new DateTimeParseException("Text cannot be parsed to a Duration: fraction", text, 0).initCause(ex);
         }
diff --git a/jdk/src/share/classes/java/time/Instant.java b/jdk/src/java.base/share/classes/java/time/Instant.java
similarity index 100%
rename from jdk/src/share/classes/java/time/Instant.java
rename to jdk/src/java.base/share/classes/java/time/Instant.java
diff --git a/jdk/src/share/classes/java/time/LocalDate.java b/jdk/src/java.base/share/classes/java/time/LocalDate.java
similarity index 100%
rename from jdk/src/share/classes/java/time/LocalDate.java
rename to jdk/src/java.base/share/classes/java/time/LocalDate.java
diff --git a/jdk/src/share/classes/java/time/LocalDateTime.java b/jdk/src/java.base/share/classes/java/time/LocalDateTime.java
similarity index 100%
rename from jdk/src/share/classes/java/time/LocalDateTime.java
rename to jdk/src/java.base/share/classes/java/time/LocalDateTime.java
diff --git a/jdk/src/share/classes/java/time/LocalTime.java b/jdk/src/java.base/share/classes/java/time/LocalTime.java
similarity index 100%
rename from jdk/src/share/classes/java/time/LocalTime.java
rename to jdk/src/java.base/share/classes/java/time/LocalTime.java
diff --git a/jdk/src/share/classes/java/time/Month.java b/jdk/src/java.base/share/classes/java/time/Month.java
similarity index 100%
rename from jdk/src/share/classes/java/time/Month.java
rename to jdk/src/java.base/share/classes/java/time/Month.java
diff --git a/jdk/src/share/classes/java/time/MonthDay.java b/jdk/src/java.base/share/classes/java/time/MonthDay.java
similarity index 100%
rename from jdk/src/share/classes/java/time/MonthDay.java
rename to jdk/src/java.base/share/classes/java/time/MonthDay.java
diff --git a/jdk/src/share/classes/java/time/OffsetDateTime.java b/jdk/src/java.base/share/classes/java/time/OffsetDateTime.java
similarity index 100%
rename from jdk/src/share/classes/java/time/OffsetDateTime.java
rename to jdk/src/java.base/share/classes/java/time/OffsetDateTime.java
diff --git a/jdk/src/share/classes/java/time/OffsetTime.java b/jdk/src/java.base/share/classes/java/time/OffsetTime.java
similarity index 100%
rename from jdk/src/share/classes/java/time/OffsetTime.java
rename to jdk/src/java.base/share/classes/java/time/OffsetTime.java
diff --git a/jdk/src/share/classes/java/time/Period.java b/jdk/src/java.base/share/classes/java/time/Period.java
similarity index 97%
rename from jdk/src/share/classes/java/time/Period.java
rename to jdk/src/java.base/share/classes/java/time/Period.java
index 5d808a42b41..88adb958fa0 100644
--- a/jdk/src/share/classes/java/time/Period.java
+++ b/jdk/src/java.base/share/classes/java/time/Period.java
@@ -329,17 +329,17 @@ public final class Period
         Objects.requireNonNull(text, "text");
         Matcher matcher = PATTERN.matcher(text);
         if (matcher.matches()) {
-            int negate = ("-".equals(matcher.group(1)) ? -1 : 1);
-            String yearMatch = matcher.group(2);
-            String monthMatch = matcher.group(3);
-            String weekMatch = matcher.group(4);
-            String dayMatch = matcher.group(5);
-            if (yearMatch != null || monthMatch != null || dayMatch != null || weekMatch != null) {
+            int negate = (charMatch(text, matcher.start(1), matcher.end(1), '-') ? -1 : 1);
+            int yearStart = matcher.start(2), yearEnd = matcher.end(2);
+            int monthStart = matcher.start(3), monthEnd = matcher.end(3);
+            int weekStart = matcher.start(4), weekEnd = matcher.end(4);
+            int dayStart = matcher.start(5), dayEnd = matcher.end(5);
+            if (yearStart >= 0 || monthStart >= 0 || weekStart >= 0 || dayStart >= 0) {
                 try {
-                    int years = parseNumber(text, yearMatch, negate);
-                    int months = parseNumber(text, monthMatch, negate);
-                    int weeks = parseNumber(text, weekMatch, negate);
-                    int days = parseNumber(text, dayMatch, negate);
+                    int years = parseNumber(text, yearStart, yearEnd, negate);
+                    int months = parseNumber(text, monthStart, monthEnd, negate);
+                    int weeks = parseNumber(text, weekStart, weekEnd, negate);
+                    int days = parseNumber(text, dayStart, dayEnd, negate);
                     days = Math.addExact(days, Math.multiplyExact(weeks, 7));
                     return create(years, months, days);
                 } catch (NumberFormatException ex) {
@@ -350,11 +350,15 @@ public final class Period
         throw new DateTimeParseException("Text cannot be parsed to a Period", text, 0);
     }
 
-    private static int parseNumber(CharSequence text, String str, int negate) {
-        if (str == null) {
+    private static boolean charMatch(CharSequence text, int start, int end, char c) {
+        return (start >= 0 && end == start + 1 && text.charAt(start) == c);
+    }
+
+    private static int parseNumber(CharSequence text, int start, int end, int negate) {
+        if (start < 0 || end < 0) {
             return 0;
         }
-        int val = Integer.parseInt(str);
+        int val = Integer.parseInt(text, 10, start, end);
         try {
             return Math.multiplyExact(val, negate);
         } catch (ArithmeticException ex) {
diff --git a/jdk/src/share/classes/java/time/Ser.java b/jdk/src/java.base/share/classes/java/time/Ser.java
similarity index 100%
rename from jdk/src/share/classes/java/time/Ser.java
rename to jdk/src/java.base/share/classes/java/time/Ser.java
diff --git a/jdk/src/share/classes/java/time/Year.java b/jdk/src/java.base/share/classes/java/time/Year.java
similarity index 100%
rename from jdk/src/share/classes/java/time/Year.java
rename to jdk/src/java.base/share/classes/java/time/Year.java
diff --git a/jdk/src/share/classes/java/time/YearMonth.java b/jdk/src/java.base/share/classes/java/time/YearMonth.java
similarity index 100%
rename from jdk/src/share/classes/java/time/YearMonth.java
rename to jdk/src/java.base/share/classes/java/time/YearMonth.java
diff --git a/jdk/src/share/classes/java/time/ZoneId.java b/jdk/src/java.base/share/classes/java/time/ZoneId.java
similarity index 100%
rename from jdk/src/share/classes/java/time/ZoneId.java
rename to jdk/src/java.base/share/classes/java/time/ZoneId.java
diff --git a/jdk/src/share/classes/java/time/ZoneOffset.java b/jdk/src/java.base/share/classes/java/time/ZoneOffset.java
similarity index 100%
rename from jdk/src/share/classes/java/time/ZoneOffset.java
rename to jdk/src/java.base/share/classes/java/time/ZoneOffset.java
diff --git a/jdk/src/share/classes/java/time/ZoneRegion.java b/jdk/src/java.base/share/classes/java/time/ZoneRegion.java
similarity index 100%
rename from jdk/src/share/classes/java/time/ZoneRegion.java
rename to jdk/src/java.base/share/classes/java/time/ZoneRegion.java
diff --git a/jdk/src/share/classes/java/time/ZonedDateTime.java b/jdk/src/java.base/share/classes/java/time/ZonedDateTime.java
similarity index 100%
rename from jdk/src/share/classes/java/time/ZonedDateTime.java
rename to jdk/src/java.base/share/classes/java/time/ZonedDateTime.java
diff --git a/jdk/src/share/classes/java/time/chrono/AbstractChronology.java b/jdk/src/java.base/share/classes/java/time/chrono/AbstractChronology.java
similarity index 100%
rename from jdk/src/share/classes/java/time/chrono/AbstractChronology.java
rename to jdk/src/java.base/share/classes/java/time/chrono/AbstractChronology.java
diff --git a/jdk/src/share/classes/java/time/chrono/ChronoLocalDate.java b/jdk/src/java.base/share/classes/java/time/chrono/ChronoLocalDate.java
similarity index 100%
rename from jdk/src/share/classes/java/time/chrono/ChronoLocalDate.java
rename to jdk/src/java.base/share/classes/java/time/chrono/ChronoLocalDate.java
diff --git a/jdk/src/share/classes/java/time/chrono/ChronoLocalDateImpl.java b/jdk/src/java.base/share/classes/java/time/chrono/ChronoLocalDateImpl.java
similarity index 100%
rename from jdk/src/share/classes/java/time/chrono/ChronoLocalDateImpl.java
rename to jdk/src/java.base/share/classes/java/time/chrono/ChronoLocalDateImpl.java
diff --git a/jdk/src/share/classes/java/time/chrono/ChronoLocalDateTime.java b/jdk/src/java.base/share/classes/java/time/chrono/ChronoLocalDateTime.java
similarity index 100%
rename from jdk/src/share/classes/java/time/chrono/ChronoLocalDateTime.java
rename to jdk/src/java.base/share/classes/java/time/chrono/ChronoLocalDateTime.java
diff --git a/jdk/src/share/classes/java/time/chrono/ChronoLocalDateTimeImpl.java b/jdk/src/java.base/share/classes/java/time/chrono/ChronoLocalDateTimeImpl.java
similarity index 100%
rename from jdk/src/share/classes/java/time/chrono/ChronoLocalDateTimeImpl.java
rename to jdk/src/java.base/share/classes/java/time/chrono/ChronoLocalDateTimeImpl.java
diff --git a/jdk/src/share/classes/java/time/chrono/ChronoPeriod.java b/jdk/src/java.base/share/classes/java/time/chrono/ChronoPeriod.java
similarity index 100%
rename from jdk/src/share/classes/java/time/chrono/ChronoPeriod.java
rename to jdk/src/java.base/share/classes/java/time/chrono/ChronoPeriod.java
diff --git a/jdk/src/share/classes/java/time/chrono/ChronoPeriodImpl.java b/jdk/src/java.base/share/classes/java/time/chrono/ChronoPeriodImpl.java
similarity index 100%
rename from jdk/src/share/classes/java/time/chrono/ChronoPeriodImpl.java
rename to jdk/src/java.base/share/classes/java/time/chrono/ChronoPeriodImpl.java
diff --git a/jdk/src/share/classes/java/time/chrono/ChronoZonedDateTime.java b/jdk/src/java.base/share/classes/java/time/chrono/ChronoZonedDateTime.java
similarity index 100%
rename from jdk/src/share/classes/java/time/chrono/ChronoZonedDateTime.java
rename to jdk/src/java.base/share/classes/java/time/chrono/ChronoZonedDateTime.java
diff --git a/jdk/src/share/classes/java/time/chrono/ChronoZonedDateTimeImpl.java b/jdk/src/java.base/share/classes/java/time/chrono/ChronoZonedDateTimeImpl.java
similarity index 100%
rename from jdk/src/share/classes/java/time/chrono/ChronoZonedDateTimeImpl.java
rename to jdk/src/java.base/share/classes/java/time/chrono/ChronoZonedDateTimeImpl.java
diff --git a/jdk/src/share/classes/java/time/chrono/Chronology.java b/jdk/src/java.base/share/classes/java/time/chrono/Chronology.java
similarity index 100%
rename from jdk/src/share/classes/java/time/chrono/Chronology.java
rename to jdk/src/java.base/share/classes/java/time/chrono/Chronology.java
diff --git a/jdk/src/share/classes/java/time/chrono/Era.java b/jdk/src/java.base/share/classes/java/time/chrono/Era.java
similarity index 100%
rename from jdk/src/share/classes/java/time/chrono/Era.java
rename to jdk/src/java.base/share/classes/java/time/chrono/Era.java
diff --git a/jdk/src/share/classes/java/time/chrono/HijrahChronology.java b/jdk/src/java.base/share/classes/java/time/chrono/HijrahChronology.java
similarity index 100%
rename from jdk/src/share/classes/java/time/chrono/HijrahChronology.java
rename to jdk/src/java.base/share/classes/java/time/chrono/HijrahChronology.java
diff --git a/jdk/src/share/classes/java/time/chrono/HijrahDate.java b/jdk/src/java.base/share/classes/java/time/chrono/HijrahDate.java
similarity index 100%
rename from jdk/src/share/classes/java/time/chrono/HijrahDate.java
rename to jdk/src/java.base/share/classes/java/time/chrono/HijrahDate.java
diff --git a/jdk/src/share/classes/java/time/chrono/HijrahEra.java b/jdk/src/java.base/share/classes/java/time/chrono/HijrahEra.java
similarity index 100%
rename from jdk/src/share/classes/java/time/chrono/HijrahEra.java
rename to jdk/src/java.base/share/classes/java/time/chrono/HijrahEra.java
diff --git a/jdk/src/share/classes/java/time/chrono/IsoChronology.java b/jdk/src/java.base/share/classes/java/time/chrono/IsoChronology.java
similarity index 100%
rename from jdk/src/share/classes/java/time/chrono/IsoChronology.java
rename to jdk/src/java.base/share/classes/java/time/chrono/IsoChronology.java
diff --git a/jdk/src/share/classes/java/time/chrono/IsoEra.java b/jdk/src/java.base/share/classes/java/time/chrono/IsoEra.java
similarity index 100%
rename from jdk/src/share/classes/java/time/chrono/IsoEra.java
rename to jdk/src/java.base/share/classes/java/time/chrono/IsoEra.java
diff --git a/jdk/src/share/classes/java/time/chrono/JapaneseChronology.java b/jdk/src/java.base/share/classes/java/time/chrono/JapaneseChronology.java
similarity index 100%
rename from jdk/src/share/classes/java/time/chrono/JapaneseChronology.java
rename to jdk/src/java.base/share/classes/java/time/chrono/JapaneseChronology.java
diff --git a/jdk/src/share/classes/java/time/chrono/JapaneseDate.java b/jdk/src/java.base/share/classes/java/time/chrono/JapaneseDate.java
similarity index 100%
rename from jdk/src/share/classes/java/time/chrono/JapaneseDate.java
rename to jdk/src/java.base/share/classes/java/time/chrono/JapaneseDate.java
diff --git a/jdk/src/share/classes/java/time/chrono/JapaneseEra.java b/jdk/src/java.base/share/classes/java/time/chrono/JapaneseEra.java
similarity index 100%
rename from jdk/src/share/classes/java/time/chrono/JapaneseEra.java
rename to jdk/src/java.base/share/classes/java/time/chrono/JapaneseEra.java
diff --git a/jdk/src/share/classes/java/time/chrono/MinguoChronology.java b/jdk/src/java.base/share/classes/java/time/chrono/MinguoChronology.java
similarity index 100%
rename from jdk/src/share/classes/java/time/chrono/MinguoChronology.java
rename to jdk/src/java.base/share/classes/java/time/chrono/MinguoChronology.java
diff --git a/jdk/src/share/classes/java/time/chrono/MinguoDate.java b/jdk/src/java.base/share/classes/java/time/chrono/MinguoDate.java
similarity index 100%
rename from jdk/src/share/classes/java/time/chrono/MinguoDate.java
rename to jdk/src/java.base/share/classes/java/time/chrono/MinguoDate.java
diff --git a/jdk/src/share/classes/java/time/chrono/MinguoEra.java b/jdk/src/java.base/share/classes/java/time/chrono/MinguoEra.java
similarity index 100%
rename from jdk/src/share/classes/java/time/chrono/MinguoEra.java
rename to jdk/src/java.base/share/classes/java/time/chrono/MinguoEra.java
diff --git a/jdk/src/share/classes/java/time/chrono/Ser.java b/jdk/src/java.base/share/classes/java/time/chrono/Ser.java
similarity index 100%
rename from jdk/src/share/classes/java/time/chrono/Ser.java
rename to jdk/src/java.base/share/classes/java/time/chrono/Ser.java
diff --git a/jdk/src/share/classes/java/time/chrono/ThaiBuddhistChronology.java b/jdk/src/java.base/share/classes/java/time/chrono/ThaiBuddhistChronology.java
similarity index 100%
rename from jdk/src/share/classes/java/time/chrono/ThaiBuddhistChronology.java
rename to jdk/src/java.base/share/classes/java/time/chrono/ThaiBuddhistChronology.java
diff --git a/jdk/src/share/classes/java/time/chrono/ThaiBuddhistDate.java b/jdk/src/java.base/share/classes/java/time/chrono/ThaiBuddhistDate.java
similarity index 100%
rename from jdk/src/share/classes/java/time/chrono/ThaiBuddhistDate.java
rename to jdk/src/java.base/share/classes/java/time/chrono/ThaiBuddhistDate.java
diff --git a/jdk/src/share/classes/java/time/chrono/ThaiBuddhistEra.java b/jdk/src/java.base/share/classes/java/time/chrono/ThaiBuddhistEra.java
similarity index 100%
rename from jdk/src/share/classes/java/time/chrono/ThaiBuddhistEra.java
rename to jdk/src/java.base/share/classes/java/time/chrono/ThaiBuddhistEra.java
diff --git a/jdk/src/share/classes/java/time/chrono/package-info.java b/jdk/src/java.base/share/classes/java/time/chrono/package-info.java
similarity index 100%
rename from jdk/src/share/classes/java/time/chrono/package-info.java
rename to jdk/src/java.base/share/classes/java/time/chrono/package-info.java
diff --git a/jdk/src/share/classes/java/time/format/DateTimeFormatter.java b/jdk/src/java.base/share/classes/java/time/format/DateTimeFormatter.java
similarity index 100%
rename from jdk/src/share/classes/java/time/format/DateTimeFormatter.java
rename to jdk/src/java.base/share/classes/java/time/format/DateTimeFormatter.java
diff --git a/jdk/src/share/classes/java/time/format/DateTimeFormatterBuilder.java b/jdk/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java
similarity index 100%
rename from jdk/src/share/classes/java/time/format/DateTimeFormatterBuilder.java
rename to jdk/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java
diff --git a/jdk/src/share/classes/java/time/format/DateTimeParseContext.java b/jdk/src/java.base/share/classes/java/time/format/DateTimeParseContext.java
similarity index 100%
rename from jdk/src/share/classes/java/time/format/DateTimeParseContext.java
rename to jdk/src/java.base/share/classes/java/time/format/DateTimeParseContext.java
diff --git a/jdk/src/share/classes/java/time/format/DateTimeParseException.java b/jdk/src/java.base/share/classes/java/time/format/DateTimeParseException.java
similarity index 100%
rename from jdk/src/share/classes/java/time/format/DateTimeParseException.java
rename to jdk/src/java.base/share/classes/java/time/format/DateTimeParseException.java
diff --git a/jdk/src/share/classes/java/time/format/DateTimePrintContext.java b/jdk/src/java.base/share/classes/java/time/format/DateTimePrintContext.java
similarity index 100%
rename from jdk/src/share/classes/java/time/format/DateTimePrintContext.java
rename to jdk/src/java.base/share/classes/java/time/format/DateTimePrintContext.java
diff --git a/jdk/src/share/classes/java/time/format/DateTimeTextProvider.java b/jdk/src/java.base/share/classes/java/time/format/DateTimeTextProvider.java
similarity index 100%
rename from jdk/src/share/classes/java/time/format/DateTimeTextProvider.java
rename to jdk/src/java.base/share/classes/java/time/format/DateTimeTextProvider.java
diff --git a/jdk/src/share/classes/java/time/format/DecimalStyle.java b/jdk/src/java.base/share/classes/java/time/format/DecimalStyle.java
similarity index 100%
rename from jdk/src/share/classes/java/time/format/DecimalStyle.java
rename to jdk/src/java.base/share/classes/java/time/format/DecimalStyle.java
diff --git a/jdk/src/share/classes/java/time/format/FormatStyle.java b/jdk/src/java.base/share/classes/java/time/format/FormatStyle.java
similarity index 100%
rename from jdk/src/share/classes/java/time/format/FormatStyle.java
rename to jdk/src/java.base/share/classes/java/time/format/FormatStyle.java
diff --git a/jdk/src/share/classes/java/time/format/Parsed.java b/jdk/src/java.base/share/classes/java/time/format/Parsed.java
similarity index 100%
rename from jdk/src/share/classes/java/time/format/Parsed.java
rename to jdk/src/java.base/share/classes/java/time/format/Parsed.java
diff --git a/jdk/src/share/classes/java/time/format/ResolverStyle.java b/jdk/src/java.base/share/classes/java/time/format/ResolverStyle.java
similarity index 100%
rename from jdk/src/share/classes/java/time/format/ResolverStyle.java
rename to jdk/src/java.base/share/classes/java/time/format/ResolverStyle.java
diff --git a/jdk/src/share/classes/java/time/format/SignStyle.java b/jdk/src/java.base/share/classes/java/time/format/SignStyle.java
similarity index 100%
rename from jdk/src/share/classes/java/time/format/SignStyle.java
rename to jdk/src/java.base/share/classes/java/time/format/SignStyle.java
diff --git a/jdk/src/share/classes/java/time/format/TextStyle.java b/jdk/src/java.base/share/classes/java/time/format/TextStyle.java
similarity index 100%
rename from jdk/src/share/classes/java/time/format/TextStyle.java
rename to jdk/src/java.base/share/classes/java/time/format/TextStyle.java
diff --git a/jdk/src/share/classes/java/time/format/ZoneName.java b/jdk/src/java.base/share/classes/java/time/format/ZoneName.java
similarity index 100%
rename from jdk/src/share/classes/java/time/format/ZoneName.java
rename to jdk/src/java.base/share/classes/java/time/format/ZoneName.java
diff --git a/jdk/src/share/classes/java/time/format/package-info.java b/jdk/src/java.base/share/classes/java/time/format/package-info.java
similarity index 100%
rename from jdk/src/share/classes/java/time/format/package-info.java
rename to jdk/src/java.base/share/classes/java/time/format/package-info.java
diff --git a/jdk/src/share/classes/java/time/overview.html b/jdk/src/java.base/share/classes/java/time/overview.html
similarity index 100%
rename from jdk/src/share/classes/java/time/overview.html
rename to jdk/src/java.base/share/classes/java/time/overview.html
diff --git a/jdk/src/share/classes/java/time/package-info.java b/jdk/src/java.base/share/classes/java/time/package-info.java
similarity index 100%
rename from jdk/src/share/classes/java/time/package-info.java
rename to jdk/src/java.base/share/classes/java/time/package-info.java
diff --git a/jdk/src/share/classes/java/time/temporal/ChronoField.java b/jdk/src/java.base/share/classes/java/time/temporal/ChronoField.java
similarity index 100%
rename from jdk/src/share/classes/java/time/temporal/ChronoField.java
rename to jdk/src/java.base/share/classes/java/time/temporal/ChronoField.java
diff --git a/jdk/src/share/classes/java/time/temporal/ChronoUnit.java b/jdk/src/java.base/share/classes/java/time/temporal/ChronoUnit.java
similarity index 100%
rename from jdk/src/share/classes/java/time/temporal/ChronoUnit.java
rename to jdk/src/java.base/share/classes/java/time/temporal/ChronoUnit.java
diff --git a/jdk/src/share/classes/java/time/temporal/IsoFields.java b/jdk/src/java.base/share/classes/java/time/temporal/IsoFields.java
similarity index 100%
rename from jdk/src/share/classes/java/time/temporal/IsoFields.java
rename to jdk/src/java.base/share/classes/java/time/temporal/IsoFields.java
diff --git a/jdk/src/share/classes/java/time/temporal/JulianFields.java b/jdk/src/java.base/share/classes/java/time/temporal/JulianFields.java
similarity index 100%
rename from jdk/src/share/classes/java/time/temporal/JulianFields.java
rename to jdk/src/java.base/share/classes/java/time/temporal/JulianFields.java
diff --git a/jdk/src/share/classes/java/time/temporal/Temporal.java b/jdk/src/java.base/share/classes/java/time/temporal/Temporal.java
similarity index 100%
rename from jdk/src/share/classes/java/time/temporal/Temporal.java
rename to jdk/src/java.base/share/classes/java/time/temporal/Temporal.java
diff --git a/jdk/src/share/classes/java/time/temporal/TemporalAccessor.java b/jdk/src/java.base/share/classes/java/time/temporal/TemporalAccessor.java
similarity index 100%
rename from jdk/src/share/classes/java/time/temporal/TemporalAccessor.java
rename to jdk/src/java.base/share/classes/java/time/temporal/TemporalAccessor.java
diff --git a/jdk/src/share/classes/java/time/temporal/TemporalAdjuster.java b/jdk/src/java.base/share/classes/java/time/temporal/TemporalAdjuster.java
similarity index 100%
rename from jdk/src/share/classes/java/time/temporal/TemporalAdjuster.java
rename to jdk/src/java.base/share/classes/java/time/temporal/TemporalAdjuster.java
diff --git a/jdk/src/share/classes/java/time/temporal/TemporalAdjusters.java b/jdk/src/java.base/share/classes/java/time/temporal/TemporalAdjusters.java
similarity index 100%
rename from jdk/src/share/classes/java/time/temporal/TemporalAdjusters.java
rename to jdk/src/java.base/share/classes/java/time/temporal/TemporalAdjusters.java
diff --git a/jdk/src/share/classes/java/time/temporal/TemporalAmount.java b/jdk/src/java.base/share/classes/java/time/temporal/TemporalAmount.java
similarity index 100%
rename from jdk/src/share/classes/java/time/temporal/TemporalAmount.java
rename to jdk/src/java.base/share/classes/java/time/temporal/TemporalAmount.java
diff --git a/jdk/src/share/classes/java/time/temporal/TemporalField.java b/jdk/src/java.base/share/classes/java/time/temporal/TemporalField.java
similarity index 100%
rename from jdk/src/share/classes/java/time/temporal/TemporalField.java
rename to jdk/src/java.base/share/classes/java/time/temporal/TemporalField.java
diff --git a/jdk/src/share/classes/java/time/temporal/TemporalQueries.java b/jdk/src/java.base/share/classes/java/time/temporal/TemporalQueries.java
similarity index 100%
rename from jdk/src/share/classes/java/time/temporal/TemporalQueries.java
rename to jdk/src/java.base/share/classes/java/time/temporal/TemporalQueries.java
diff --git a/jdk/src/share/classes/java/time/temporal/TemporalQuery.java b/jdk/src/java.base/share/classes/java/time/temporal/TemporalQuery.java
similarity index 100%
rename from jdk/src/share/classes/java/time/temporal/TemporalQuery.java
rename to jdk/src/java.base/share/classes/java/time/temporal/TemporalQuery.java
diff --git a/jdk/src/share/classes/java/time/temporal/TemporalUnit.java b/jdk/src/java.base/share/classes/java/time/temporal/TemporalUnit.java
similarity index 100%
rename from jdk/src/share/classes/java/time/temporal/TemporalUnit.java
rename to jdk/src/java.base/share/classes/java/time/temporal/TemporalUnit.java
diff --git a/jdk/src/share/classes/java/time/temporal/UnsupportedTemporalTypeException.java b/jdk/src/java.base/share/classes/java/time/temporal/UnsupportedTemporalTypeException.java
similarity index 100%
rename from jdk/src/share/classes/java/time/temporal/UnsupportedTemporalTypeException.java
rename to jdk/src/java.base/share/classes/java/time/temporal/UnsupportedTemporalTypeException.java
diff --git a/jdk/src/share/classes/java/time/temporal/ValueRange.java b/jdk/src/java.base/share/classes/java/time/temporal/ValueRange.java
similarity index 100%
rename from jdk/src/share/classes/java/time/temporal/ValueRange.java
rename to jdk/src/java.base/share/classes/java/time/temporal/ValueRange.java
diff --git a/jdk/src/share/classes/java/time/temporal/WeekFields.java b/jdk/src/java.base/share/classes/java/time/temporal/WeekFields.java
similarity index 100%
rename from jdk/src/share/classes/java/time/temporal/WeekFields.java
rename to jdk/src/java.base/share/classes/java/time/temporal/WeekFields.java
diff --git a/jdk/src/share/classes/java/time/temporal/package-info.java b/jdk/src/java.base/share/classes/java/time/temporal/package-info.java
similarity index 100%
rename from jdk/src/share/classes/java/time/temporal/package-info.java
rename to jdk/src/java.base/share/classes/java/time/temporal/package-info.java
diff --git a/jdk/src/share/classes/java/time/zone/Ser.java b/jdk/src/java.base/share/classes/java/time/zone/Ser.java
similarity index 100%
rename from jdk/src/share/classes/java/time/zone/Ser.java
rename to jdk/src/java.base/share/classes/java/time/zone/Ser.java
diff --git a/jdk/src/share/classes/java/time/zone/TzdbZoneRulesProvider.java b/jdk/src/java.base/share/classes/java/time/zone/TzdbZoneRulesProvider.java
similarity index 100%
rename from jdk/src/share/classes/java/time/zone/TzdbZoneRulesProvider.java
rename to jdk/src/java.base/share/classes/java/time/zone/TzdbZoneRulesProvider.java
diff --git a/jdk/src/share/classes/java/time/zone/ZoneOffsetTransition.java b/jdk/src/java.base/share/classes/java/time/zone/ZoneOffsetTransition.java
similarity index 100%
rename from jdk/src/share/classes/java/time/zone/ZoneOffsetTransition.java
rename to jdk/src/java.base/share/classes/java/time/zone/ZoneOffsetTransition.java
diff --git a/jdk/src/share/classes/java/time/zone/ZoneOffsetTransitionRule.java b/jdk/src/java.base/share/classes/java/time/zone/ZoneOffsetTransitionRule.java
similarity index 100%
rename from jdk/src/share/classes/java/time/zone/ZoneOffsetTransitionRule.java
rename to jdk/src/java.base/share/classes/java/time/zone/ZoneOffsetTransitionRule.java
diff --git a/jdk/src/share/classes/java/time/zone/ZoneRules.java b/jdk/src/java.base/share/classes/java/time/zone/ZoneRules.java
similarity index 100%
rename from jdk/src/share/classes/java/time/zone/ZoneRules.java
rename to jdk/src/java.base/share/classes/java/time/zone/ZoneRules.java
diff --git a/jdk/src/share/classes/java/time/zone/ZoneRulesException.java b/jdk/src/java.base/share/classes/java/time/zone/ZoneRulesException.java
similarity index 100%
rename from jdk/src/share/classes/java/time/zone/ZoneRulesException.java
rename to jdk/src/java.base/share/classes/java/time/zone/ZoneRulesException.java
diff --git a/jdk/src/share/classes/java/time/zone/ZoneRulesProvider.java b/jdk/src/java.base/share/classes/java/time/zone/ZoneRulesProvider.java
similarity index 100%
rename from jdk/src/share/classes/java/time/zone/ZoneRulesProvider.java
rename to jdk/src/java.base/share/classes/java/time/zone/ZoneRulesProvider.java
diff --git a/jdk/src/share/classes/java/time/zone/package-info.java b/jdk/src/java.base/share/classes/java/time/zone/package-info.java
similarity index 100%
rename from jdk/src/share/classes/java/time/zone/package-info.java
rename to jdk/src/java.base/share/classes/java/time/zone/package-info.java
diff --git a/jdk/src/share/classes/java/util/AbstractCollection.java b/jdk/src/java.base/share/classes/java/util/AbstractCollection.java
similarity index 100%
rename from jdk/src/share/classes/java/util/AbstractCollection.java
rename to jdk/src/java.base/share/classes/java/util/AbstractCollection.java
diff --git a/jdk/src/share/classes/java/util/AbstractList.java b/jdk/src/java.base/share/classes/java/util/AbstractList.java
similarity index 100%
rename from jdk/src/share/classes/java/util/AbstractList.java
rename to jdk/src/java.base/share/classes/java/util/AbstractList.java
diff --git a/jdk/src/share/classes/java/util/AbstractMap.java b/jdk/src/java.base/share/classes/java/util/AbstractMap.java
similarity index 100%
rename from jdk/src/share/classes/java/util/AbstractMap.java
rename to jdk/src/java.base/share/classes/java/util/AbstractMap.java
diff --git a/jdk/src/share/classes/java/util/AbstractQueue.java b/jdk/src/java.base/share/classes/java/util/AbstractQueue.java
similarity index 100%
rename from jdk/src/share/classes/java/util/AbstractQueue.java
rename to jdk/src/java.base/share/classes/java/util/AbstractQueue.java
diff --git a/jdk/src/share/classes/java/util/AbstractSequentialList.java b/jdk/src/java.base/share/classes/java/util/AbstractSequentialList.java
similarity index 100%
rename from jdk/src/share/classes/java/util/AbstractSequentialList.java
rename to jdk/src/java.base/share/classes/java/util/AbstractSequentialList.java
diff --git a/jdk/src/share/classes/java/util/AbstractSet.java b/jdk/src/java.base/share/classes/java/util/AbstractSet.java
similarity index 100%
rename from jdk/src/share/classes/java/util/AbstractSet.java
rename to jdk/src/java.base/share/classes/java/util/AbstractSet.java
diff --git a/jdk/src/share/classes/java/util/ArrayDeque.java b/jdk/src/java.base/share/classes/java/util/ArrayDeque.java
similarity index 100%
rename from jdk/src/share/classes/java/util/ArrayDeque.java
rename to jdk/src/java.base/share/classes/java/util/ArrayDeque.java
diff --git a/jdk/src/share/classes/java/util/ArrayList.java b/jdk/src/java.base/share/classes/java/util/ArrayList.java
similarity index 100%
rename from jdk/src/share/classes/java/util/ArrayList.java
rename to jdk/src/java.base/share/classes/java/util/ArrayList.java
diff --git a/jdk/src/share/classes/java/util/ArrayPrefixHelpers.java b/jdk/src/java.base/share/classes/java/util/ArrayPrefixHelpers.java
similarity index 100%
rename from jdk/src/share/classes/java/util/ArrayPrefixHelpers.java
rename to jdk/src/java.base/share/classes/java/util/ArrayPrefixHelpers.java
diff --git a/jdk/src/share/classes/java/util/Arrays.java b/jdk/src/java.base/share/classes/java/util/Arrays.java
similarity index 100%
rename from jdk/src/share/classes/java/util/Arrays.java
rename to jdk/src/java.base/share/classes/java/util/Arrays.java
diff --git a/jdk/src/share/classes/java/util/ArraysParallelSortHelpers.java b/jdk/src/java.base/share/classes/java/util/ArraysParallelSortHelpers.java
similarity index 100%
rename from jdk/src/share/classes/java/util/ArraysParallelSortHelpers.java
rename to jdk/src/java.base/share/classes/java/util/ArraysParallelSortHelpers.java
diff --git a/jdk/src/share/classes/java/util/Base64.java b/jdk/src/java.base/share/classes/java/util/Base64.java
similarity index 100%
rename from jdk/src/share/classes/java/util/Base64.java
rename to jdk/src/java.base/share/classes/java/util/Base64.java
diff --git a/jdk/src/share/classes/java/util/BitSet.java b/jdk/src/java.base/share/classes/java/util/BitSet.java
similarity index 100%
rename from jdk/src/share/classes/java/util/BitSet.java
rename to jdk/src/java.base/share/classes/java/util/BitSet.java
diff --git a/jdk/src/share/classes/java/util/Calendar.java b/jdk/src/java.base/share/classes/java/util/Calendar.java
similarity index 100%
rename from jdk/src/share/classes/java/util/Calendar.java
rename to jdk/src/java.base/share/classes/java/util/Calendar.java
diff --git a/jdk/src/share/classes/java/util/Collection.java b/jdk/src/java.base/share/classes/java/util/Collection.java
similarity index 100%
rename from jdk/src/share/classes/java/util/Collection.java
rename to jdk/src/java.base/share/classes/java/util/Collection.java
diff --git a/jdk/src/share/classes/java/util/Collections.java b/jdk/src/java.base/share/classes/java/util/Collections.java
similarity index 100%
rename from jdk/src/share/classes/java/util/Collections.java
rename to jdk/src/java.base/share/classes/java/util/Collections.java
diff --git a/jdk/src/share/classes/java/util/ComparableTimSort.java b/jdk/src/java.base/share/classes/java/util/ComparableTimSort.java
similarity index 100%
rename from jdk/src/share/classes/java/util/ComparableTimSort.java
rename to jdk/src/java.base/share/classes/java/util/ComparableTimSort.java
diff --git a/jdk/src/share/classes/java/util/Comparator.java b/jdk/src/java.base/share/classes/java/util/Comparator.java
similarity index 100%
rename from jdk/src/share/classes/java/util/Comparator.java
rename to jdk/src/java.base/share/classes/java/util/Comparator.java
diff --git a/jdk/src/share/classes/java/util/Comparators.java b/jdk/src/java.base/share/classes/java/util/Comparators.java
similarity index 100%
rename from jdk/src/share/classes/java/util/Comparators.java
rename to jdk/src/java.base/share/classes/java/util/Comparators.java
diff --git a/jdk/src/share/classes/java/util/ConcurrentModificationException.java b/jdk/src/java.base/share/classes/java/util/ConcurrentModificationException.java
similarity index 100%
rename from jdk/src/share/classes/java/util/ConcurrentModificationException.java
rename to jdk/src/java.base/share/classes/java/util/ConcurrentModificationException.java
diff --git a/jdk/src/share/classes/java/util/Currency.java b/jdk/src/java.base/share/classes/java/util/Currency.java
similarity index 100%
rename from jdk/src/share/classes/java/util/Currency.java
rename to jdk/src/java.base/share/classes/java/util/Currency.java
diff --git a/jdk/src/share/classes/java/util/Date.java b/jdk/src/java.base/share/classes/java/util/Date.java
similarity index 100%
rename from jdk/src/share/classes/java/util/Date.java
rename to jdk/src/java.base/share/classes/java/util/Date.java
diff --git a/jdk/src/share/classes/java/util/Deque.java b/jdk/src/java.base/share/classes/java/util/Deque.java
similarity index 100%
rename from jdk/src/share/classes/java/util/Deque.java
rename to jdk/src/java.base/share/classes/java/util/Deque.java
diff --git a/jdk/src/share/classes/java/util/Dictionary.java b/jdk/src/java.base/share/classes/java/util/Dictionary.java
similarity index 100%
rename from jdk/src/share/classes/java/util/Dictionary.java
rename to jdk/src/java.base/share/classes/java/util/Dictionary.java
diff --git a/jdk/src/share/classes/java/util/DoubleSummaryStatistics.java b/jdk/src/java.base/share/classes/java/util/DoubleSummaryStatistics.java
similarity index 100%
rename from jdk/src/share/classes/java/util/DoubleSummaryStatistics.java
rename to jdk/src/java.base/share/classes/java/util/DoubleSummaryStatistics.java
diff --git a/jdk/src/share/classes/java/util/DualPivotQuicksort.java b/jdk/src/java.base/share/classes/java/util/DualPivotQuicksort.java
similarity index 100%
rename from jdk/src/share/classes/java/util/DualPivotQuicksort.java
rename to jdk/src/java.base/share/classes/java/util/DualPivotQuicksort.java
diff --git a/jdk/src/share/classes/java/util/DuplicateFormatFlagsException.java b/jdk/src/java.base/share/classes/java/util/DuplicateFormatFlagsException.java
similarity index 100%
rename from jdk/src/share/classes/java/util/DuplicateFormatFlagsException.java
rename to jdk/src/java.base/share/classes/java/util/DuplicateFormatFlagsException.java
diff --git a/jdk/src/share/classes/java/util/EmptyStackException.java b/jdk/src/java.base/share/classes/java/util/EmptyStackException.java
similarity index 100%
rename from jdk/src/share/classes/java/util/EmptyStackException.java
rename to jdk/src/java.base/share/classes/java/util/EmptyStackException.java
diff --git a/jdk/src/share/classes/java/util/EnumMap.java b/jdk/src/java.base/share/classes/java/util/EnumMap.java
similarity index 100%
rename from jdk/src/share/classes/java/util/EnumMap.java
rename to jdk/src/java.base/share/classes/java/util/EnumMap.java
diff --git a/jdk/src/share/classes/java/util/EnumSet.java b/jdk/src/java.base/share/classes/java/util/EnumSet.java
similarity index 100%
rename from jdk/src/share/classes/java/util/EnumSet.java
rename to jdk/src/java.base/share/classes/java/util/EnumSet.java
diff --git a/jdk/src/share/classes/java/util/Enumeration.java b/jdk/src/java.base/share/classes/java/util/Enumeration.java
similarity index 100%
rename from jdk/src/share/classes/java/util/Enumeration.java
rename to jdk/src/java.base/share/classes/java/util/Enumeration.java
diff --git a/jdk/src/share/classes/java/util/EventListener.java b/jdk/src/java.base/share/classes/java/util/EventListener.java
similarity index 100%
rename from jdk/src/share/classes/java/util/EventListener.java
rename to jdk/src/java.base/share/classes/java/util/EventListener.java
diff --git a/jdk/src/share/classes/java/util/EventListenerProxy.java b/jdk/src/java.base/share/classes/java/util/EventListenerProxy.java
similarity index 100%
rename from jdk/src/share/classes/java/util/EventListenerProxy.java
rename to jdk/src/java.base/share/classes/java/util/EventListenerProxy.java
diff --git a/jdk/src/share/classes/java/util/EventObject.java b/jdk/src/java.base/share/classes/java/util/EventObject.java
similarity index 100%
rename from jdk/src/share/classes/java/util/EventObject.java
rename to jdk/src/java.base/share/classes/java/util/EventObject.java
diff --git a/jdk/src/share/classes/java/util/FormatFlagsConversionMismatchException.java b/jdk/src/java.base/share/classes/java/util/FormatFlagsConversionMismatchException.java
similarity index 100%
rename from jdk/src/share/classes/java/util/FormatFlagsConversionMismatchException.java
rename to jdk/src/java.base/share/classes/java/util/FormatFlagsConversionMismatchException.java
diff --git a/jdk/src/share/classes/java/util/Formattable.java b/jdk/src/java.base/share/classes/java/util/Formattable.java
similarity index 100%
rename from jdk/src/share/classes/java/util/Formattable.java
rename to jdk/src/java.base/share/classes/java/util/Formattable.java
diff --git a/jdk/src/share/classes/java/util/FormattableFlags.java b/jdk/src/java.base/share/classes/java/util/FormattableFlags.java
similarity index 100%
rename from jdk/src/share/classes/java/util/FormattableFlags.java
rename to jdk/src/java.base/share/classes/java/util/FormattableFlags.java
diff --git a/jdk/src/share/classes/java/util/Formatter.java b/jdk/src/java.base/share/classes/java/util/Formatter.java
similarity index 100%
rename from jdk/src/share/classes/java/util/Formatter.java
rename to jdk/src/java.base/share/classes/java/util/Formatter.java
diff --git a/jdk/src/share/classes/java/util/FormatterClosedException.java b/jdk/src/java.base/share/classes/java/util/FormatterClosedException.java
similarity index 100%
rename from jdk/src/share/classes/java/util/FormatterClosedException.java
rename to jdk/src/java.base/share/classes/java/util/FormatterClosedException.java
diff --git a/jdk/src/share/classes/java/util/GregorianCalendar.java b/jdk/src/java.base/share/classes/java/util/GregorianCalendar.java
similarity index 100%
rename from jdk/src/share/classes/java/util/GregorianCalendar.java
rename to jdk/src/java.base/share/classes/java/util/GregorianCalendar.java
diff --git a/jdk/src/share/classes/java/util/HashMap.java b/jdk/src/java.base/share/classes/java/util/HashMap.java
similarity index 100%
rename from jdk/src/share/classes/java/util/HashMap.java
rename to jdk/src/java.base/share/classes/java/util/HashMap.java
diff --git a/jdk/src/share/classes/java/util/HashSet.java b/jdk/src/java.base/share/classes/java/util/HashSet.java
similarity index 100%
rename from jdk/src/share/classes/java/util/HashSet.java
rename to jdk/src/java.base/share/classes/java/util/HashSet.java
diff --git a/jdk/src/share/classes/java/util/Hashtable.java b/jdk/src/java.base/share/classes/java/util/Hashtable.java
similarity index 100%
rename from jdk/src/share/classes/java/util/Hashtable.java
rename to jdk/src/java.base/share/classes/java/util/Hashtable.java
diff --git a/jdk/src/share/classes/java/util/IdentityHashMap.java b/jdk/src/java.base/share/classes/java/util/IdentityHashMap.java
similarity index 100%
rename from jdk/src/share/classes/java/util/IdentityHashMap.java
rename to jdk/src/java.base/share/classes/java/util/IdentityHashMap.java
diff --git a/jdk/src/share/classes/java/util/IllegalFormatCodePointException.java b/jdk/src/java.base/share/classes/java/util/IllegalFormatCodePointException.java
similarity index 100%
rename from jdk/src/share/classes/java/util/IllegalFormatCodePointException.java
rename to jdk/src/java.base/share/classes/java/util/IllegalFormatCodePointException.java
diff --git a/jdk/src/share/classes/java/util/IllegalFormatConversionException.java b/jdk/src/java.base/share/classes/java/util/IllegalFormatConversionException.java
similarity index 100%
rename from jdk/src/share/classes/java/util/IllegalFormatConversionException.java
rename to jdk/src/java.base/share/classes/java/util/IllegalFormatConversionException.java
diff --git a/jdk/src/share/classes/java/util/IllegalFormatException.java b/jdk/src/java.base/share/classes/java/util/IllegalFormatException.java
similarity index 100%
rename from jdk/src/share/classes/java/util/IllegalFormatException.java
rename to jdk/src/java.base/share/classes/java/util/IllegalFormatException.java
diff --git a/jdk/src/share/classes/java/util/IllegalFormatFlagsException.java b/jdk/src/java.base/share/classes/java/util/IllegalFormatFlagsException.java
similarity index 100%
rename from jdk/src/share/classes/java/util/IllegalFormatFlagsException.java
rename to jdk/src/java.base/share/classes/java/util/IllegalFormatFlagsException.java
diff --git a/jdk/src/share/classes/java/util/IllegalFormatPrecisionException.java b/jdk/src/java.base/share/classes/java/util/IllegalFormatPrecisionException.java
similarity index 100%
rename from jdk/src/share/classes/java/util/IllegalFormatPrecisionException.java
rename to jdk/src/java.base/share/classes/java/util/IllegalFormatPrecisionException.java
diff --git a/jdk/src/share/classes/java/util/IllegalFormatWidthException.java b/jdk/src/java.base/share/classes/java/util/IllegalFormatWidthException.java
similarity index 100%
rename from jdk/src/share/classes/java/util/IllegalFormatWidthException.java
rename to jdk/src/java.base/share/classes/java/util/IllegalFormatWidthException.java
diff --git a/jdk/src/share/classes/java/util/IllformedLocaleException.java b/jdk/src/java.base/share/classes/java/util/IllformedLocaleException.java
similarity index 100%
rename from jdk/src/share/classes/java/util/IllformedLocaleException.java
rename to jdk/src/java.base/share/classes/java/util/IllformedLocaleException.java
diff --git a/jdk/src/share/classes/java/util/InputMismatchException.java b/jdk/src/java.base/share/classes/java/util/InputMismatchException.java
similarity index 100%
rename from jdk/src/share/classes/java/util/InputMismatchException.java
rename to jdk/src/java.base/share/classes/java/util/InputMismatchException.java
diff --git a/jdk/src/share/classes/java/util/IntSummaryStatistics.java b/jdk/src/java.base/share/classes/java/util/IntSummaryStatistics.java
similarity index 100%
rename from jdk/src/share/classes/java/util/IntSummaryStatistics.java
rename to jdk/src/java.base/share/classes/java/util/IntSummaryStatistics.java
diff --git a/jdk/src/share/classes/java/util/InvalidPropertiesFormatException.java b/jdk/src/java.base/share/classes/java/util/InvalidPropertiesFormatException.java
similarity index 100%
rename from jdk/src/share/classes/java/util/InvalidPropertiesFormatException.java
rename to jdk/src/java.base/share/classes/java/util/InvalidPropertiesFormatException.java
diff --git a/jdk/src/share/classes/java/util/Iterator.java b/jdk/src/java.base/share/classes/java/util/Iterator.java
similarity index 100%
rename from jdk/src/share/classes/java/util/Iterator.java
rename to jdk/src/java.base/share/classes/java/util/Iterator.java
diff --git a/jdk/src/share/classes/java/util/JapaneseImperialCalendar.java b/jdk/src/java.base/share/classes/java/util/JapaneseImperialCalendar.java
similarity index 100%
rename from jdk/src/share/classes/java/util/JapaneseImperialCalendar.java
rename to jdk/src/java.base/share/classes/java/util/JapaneseImperialCalendar.java
diff --git a/jdk/src/share/classes/java/util/JumboEnumSet.java b/jdk/src/java.base/share/classes/java/util/JumboEnumSet.java
similarity index 100%
rename from jdk/src/share/classes/java/util/JumboEnumSet.java
rename to jdk/src/java.base/share/classes/java/util/JumboEnumSet.java
diff --git a/jdk/src/share/classes/java/util/LinkedHashMap.java b/jdk/src/java.base/share/classes/java/util/LinkedHashMap.java
similarity index 100%
rename from jdk/src/share/classes/java/util/LinkedHashMap.java
rename to jdk/src/java.base/share/classes/java/util/LinkedHashMap.java
diff --git a/jdk/src/share/classes/java/util/LinkedHashSet.java b/jdk/src/java.base/share/classes/java/util/LinkedHashSet.java
similarity index 100%
rename from jdk/src/share/classes/java/util/LinkedHashSet.java
rename to jdk/src/java.base/share/classes/java/util/LinkedHashSet.java
diff --git a/jdk/src/share/classes/java/util/LinkedList.java b/jdk/src/java.base/share/classes/java/util/LinkedList.java
similarity index 100%
rename from jdk/src/share/classes/java/util/LinkedList.java
rename to jdk/src/java.base/share/classes/java/util/LinkedList.java
diff --git a/jdk/src/share/classes/java/util/List.java b/jdk/src/java.base/share/classes/java/util/List.java
similarity index 100%
rename from jdk/src/share/classes/java/util/List.java
rename to jdk/src/java.base/share/classes/java/util/List.java
diff --git a/jdk/src/share/classes/java/util/ListIterator.java b/jdk/src/java.base/share/classes/java/util/ListIterator.java
similarity index 100%
rename from jdk/src/share/classes/java/util/ListIterator.java
rename to jdk/src/java.base/share/classes/java/util/ListIterator.java
diff --git a/jdk/src/share/classes/java/util/ListResourceBundle.java b/jdk/src/java.base/share/classes/java/util/ListResourceBundle.java
similarity index 100%
rename from jdk/src/share/classes/java/util/ListResourceBundle.java
rename to jdk/src/java.base/share/classes/java/util/ListResourceBundle.java
diff --git a/jdk/src/share/classes/java/util/Locale.java b/jdk/src/java.base/share/classes/java/util/Locale.java
similarity index 100%
rename from jdk/src/share/classes/java/util/Locale.java
rename to jdk/src/java.base/share/classes/java/util/Locale.java
diff --git a/jdk/src/share/classes/java/util/LocaleISOData.java b/jdk/src/java.base/share/classes/java/util/LocaleISOData.java
similarity index 100%
rename from jdk/src/share/classes/java/util/LocaleISOData.java
rename to jdk/src/java.base/share/classes/java/util/LocaleISOData.java
diff --git a/jdk/src/share/classes/java/util/LongSummaryStatistics.java b/jdk/src/java.base/share/classes/java/util/LongSummaryStatistics.java
similarity index 100%
rename from jdk/src/share/classes/java/util/LongSummaryStatistics.java
rename to jdk/src/java.base/share/classes/java/util/LongSummaryStatistics.java
diff --git a/jdk/src/share/classes/java/util/Map.java b/jdk/src/java.base/share/classes/java/util/Map.java
similarity index 100%
rename from jdk/src/share/classes/java/util/Map.java
rename to jdk/src/java.base/share/classes/java/util/Map.java
diff --git a/jdk/src/share/classes/java/util/MissingFormatArgumentException.java b/jdk/src/java.base/share/classes/java/util/MissingFormatArgumentException.java
similarity index 100%
rename from jdk/src/share/classes/java/util/MissingFormatArgumentException.java
rename to jdk/src/java.base/share/classes/java/util/MissingFormatArgumentException.java
diff --git a/jdk/src/share/classes/java/util/MissingFormatWidthException.java b/jdk/src/java.base/share/classes/java/util/MissingFormatWidthException.java
similarity index 100%
rename from jdk/src/share/classes/java/util/MissingFormatWidthException.java
rename to jdk/src/java.base/share/classes/java/util/MissingFormatWidthException.java
diff --git a/jdk/src/share/classes/java/util/MissingResourceException.java b/jdk/src/java.base/share/classes/java/util/MissingResourceException.java
similarity index 100%
rename from jdk/src/share/classes/java/util/MissingResourceException.java
rename to jdk/src/java.base/share/classes/java/util/MissingResourceException.java
diff --git a/jdk/src/share/classes/java/util/NavigableMap.java b/jdk/src/java.base/share/classes/java/util/NavigableMap.java
similarity index 100%
rename from jdk/src/share/classes/java/util/NavigableMap.java
rename to jdk/src/java.base/share/classes/java/util/NavigableMap.java
diff --git a/jdk/src/share/classes/java/util/NavigableSet.java b/jdk/src/java.base/share/classes/java/util/NavigableSet.java
similarity index 100%
rename from jdk/src/share/classes/java/util/NavigableSet.java
rename to jdk/src/java.base/share/classes/java/util/NavigableSet.java
diff --git a/jdk/src/share/classes/java/util/NoSuchElementException.java b/jdk/src/java.base/share/classes/java/util/NoSuchElementException.java
similarity index 100%
rename from jdk/src/share/classes/java/util/NoSuchElementException.java
rename to jdk/src/java.base/share/classes/java/util/NoSuchElementException.java
diff --git a/jdk/src/share/classes/java/util/Objects.java b/jdk/src/java.base/share/classes/java/util/Objects.java
similarity index 100%
rename from jdk/src/share/classes/java/util/Objects.java
rename to jdk/src/java.base/share/classes/java/util/Objects.java
diff --git a/jdk/src/share/classes/java/util/Observable.java b/jdk/src/java.base/share/classes/java/util/Observable.java
similarity index 100%
rename from jdk/src/share/classes/java/util/Observable.java
rename to jdk/src/java.base/share/classes/java/util/Observable.java
diff --git a/jdk/src/share/classes/java/util/Observer.java b/jdk/src/java.base/share/classes/java/util/Observer.java
similarity index 100%
rename from jdk/src/share/classes/java/util/Observer.java
rename to jdk/src/java.base/share/classes/java/util/Observer.java
diff --git a/jdk/src/share/classes/java/util/Optional.java b/jdk/src/java.base/share/classes/java/util/Optional.java
similarity index 100%
rename from jdk/src/share/classes/java/util/Optional.java
rename to jdk/src/java.base/share/classes/java/util/Optional.java
diff --git a/jdk/src/share/classes/java/util/OptionalDouble.java b/jdk/src/java.base/share/classes/java/util/OptionalDouble.java
similarity index 100%
rename from jdk/src/share/classes/java/util/OptionalDouble.java
rename to jdk/src/java.base/share/classes/java/util/OptionalDouble.java
diff --git a/jdk/src/share/classes/java/util/OptionalInt.java b/jdk/src/java.base/share/classes/java/util/OptionalInt.java
similarity index 100%
rename from jdk/src/share/classes/java/util/OptionalInt.java
rename to jdk/src/java.base/share/classes/java/util/OptionalInt.java
diff --git a/jdk/src/share/classes/java/util/OptionalLong.java b/jdk/src/java.base/share/classes/java/util/OptionalLong.java
similarity index 100%
rename from jdk/src/share/classes/java/util/OptionalLong.java
rename to jdk/src/java.base/share/classes/java/util/OptionalLong.java
diff --git a/jdk/src/share/classes/java/util/PrimitiveIterator.java b/jdk/src/java.base/share/classes/java/util/PrimitiveIterator.java
similarity index 100%
rename from jdk/src/share/classes/java/util/PrimitiveIterator.java
rename to jdk/src/java.base/share/classes/java/util/PrimitiveIterator.java
diff --git a/jdk/src/share/classes/java/util/PriorityQueue.java b/jdk/src/java.base/share/classes/java/util/PriorityQueue.java
similarity index 100%
rename from jdk/src/share/classes/java/util/PriorityQueue.java
rename to jdk/src/java.base/share/classes/java/util/PriorityQueue.java
diff --git a/jdk/src/share/classes/java/util/Properties.java b/jdk/src/java.base/share/classes/java/util/Properties.java
similarity index 100%
rename from jdk/src/share/classes/java/util/Properties.java
rename to jdk/src/java.base/share/classes/java/util/Properties.java
diff --git a/jdk/src/share/classes/java/util/PropertyPermission.java b/jdk/src/java.base/share/classes/java/util/PropertyPermission.java
similarity index 100%
rename from jdk/src/share/classes/java/util/PropertyPermission.java
rename to jdk/src/java.base/share/classes/java/util/PropertyPermission.java
diff --git a/jdk/src/share/classes/java/util/PropertyResourceBundle.java b/jdk/src/java.base/share/classes/java/util/PropertyResourceBundle.java
similarity index 100%
rename from jdk/src/share/classes/java/util/PropertyResourceBundle.java
rename to jdk/src/java.base/share/classes/java/util/PropertyResourceBundle.java
diff --git a/jdk/src/share/classes/java/util/Queue.java b/jdk/src/java.base/share/classes/java/util/Queue.java
similarity index 100%
rename from jdk/src/share/classes/java/util/Queue.java
rename to jdk/src/java.base/share/classes/java/util/Queue.java
diff --git a/jdk/src/share/classes/java/util/Random.java b/jdk/src/java.base/share/classes/java/util/Random.java
similarity index 100%
rename from jdk/src/share/classes/java/util/Random.java
rename to jdk/src/java.base/share/classes/java/util/Random.java
diff --git a/jdk/src/share/classes/java/util/RandomAccess.java b/jdk/src/java.base/share/classes/java/util/RandomAccess.java
similarity index 100%
rename from jdk/src/share/classes/java/util/RandomAccess.java
rename to jdk/src/java.base/share/classes/java/util/RandomAccess.java
diff --git a/jdk/src/share/classes/java/util/RegularEnumSet.java b/jdk/src/java.base/share/classes/java/util/RegularEnumSet.java
similarity index 100%
rename from jdk/src/share/classes/java/util/RegularEnumSet.java
rename to jdk/src/java.base/share/classes/java/util/RegularEnumSet.java
diff --git a/jdk/src/share/classes/java/util/ResourceBundle.java b/jdk/src/java.base/share/classes/java/util/ResourceBundle.java
similarity index 100%
rename from jdk/src/share/classes/java/util/ResourceBundle.java
rename to jdk/src/java.base/share/classes/java/util/ResourceBundle.java
diff --git a/jdk/src/share/classes/java/util/Scanner.java b/jdk/src/java.base/share/classes/java/util/Scanner.java
similarity index 100%
rename from jdk/src/share/classes/java/util/Scanner.java
rename to jdk/src/java.base/share/classes/java/util/Scanner.java
diff --git a/jdk/src/share/classes/java/util/ServiceConfigurationError.java b/jdk/src/java.base/share/classes/java/util/ServiceConfigurationError.java
similarity index 100%
rename from jdk/src/share/classes/java/util/ServiceConfigurationError.java
rename to jdk/src/java.base/share/classes/java/util/ServiceConfigurationError.java
diff --git a/jdk/src/share/classes/java/util/ServiceLoader.java b/jdk/src/java.base/share/classes/java/util/ServiceLoader.java
similarity index 100%
rename from jdk/src/share/classes/java/util/ServiceLoader.java
rename to jdk/src/java.base/share/classes/java/util/ServiceLoader.java
diff --git a/jdk/src/share/classes/java/util/Set.java b/jdk/src/java.base/share/classes/java/util/Set.java
similarity index 100%
rename from jdk/src/share/classes/java/util/Set.java
rename to jdk/src/java.base/share/classes/java/util/Set.java
diff --git a/jdk/src/share/classes/java/util/SimpleTimeZone.java b/jdk/src/java.base/share/classes/java/util/SimpleTimeZone.java
similarity index 100%
rename from jdk/src/share/classes/java/util/SimpleTimeZone.java
rename to jdk/src/java.base/share/classes/java/util/SimpleTimeZone.java
diff --git a/jdk/src/share/classes/java/util/SortedMap.java b/jdk/src/java.base/share/classes/java/util/SortedMap.java
similarity index 100%
rename from jdk/src/share/classes/java/util/SortedMap.java
rename to jdk/src/java.base/share/classes/java/util/SortedMap.java
diff --git a/jdk/src/share/classes/java/util/SortedSet.java b/jdk/src/java.base/share/classes/java/util/SortedSet.java
similarity index 100%
rename from jdk/src/share/classes/java/util/SortedSet.java
rename to jdk/src/java.base/share/classes/java/util/SortedSet.java
diff --git a/jdk/src/share/classes/java/util/Spliterator.java b/jdk/src/java.base/share/classes/java/util/Spliterator.java
similarity index 100%
rename from jdk/src/share/classes/java/util/Spliterator.java
rename to jdk/src/java.base/share/classes/java/util/Spliterator.java
diff --git a/jdk/src/share/classes/java/util/Spliterators.java b/jdk/src/java.base/share/classes/java/util/Spliterators.java
similarity index 100%
rename from jdk/src/share/classes/java/util/Spliterators.java
rename to jdk/src/java.base/share/classes/java/util/Spliterators.java
diff --git a/jdk/src/share/classes/java/util/SplittableRandom.java b/jdk/src/java.base/share/classes/java/util/SplittableRandom.java
similarity index 100%
rename from jdk/src/share/classes/java/util/SplittableRandom.java
rename to jdk/src/java.base/share/classes/java/util/SplittableRandom.java
diff --git a/jdk/src/share/classes/java/util/Stack.java b/jdk/src/java.base/share/classes/java/util/Stack.java
similarity index 100%
rename from jdk/src/share/classes/java/util/Stack.java
rename to jdk/src/java.base/share/classes/java/util/Stack.java
diff --git a/jdk/src/share/classes/java/util/StringJoiner.java b/jdk/src/java.base/share/classes/java/util/StringJoiner.java
similarity index 100%
rename from jdk/src/share/classes/java/util/StringJoiner.java
rename to jdk/src/java.base/share/classes/java/util/StringJoiner.java
diff --git a/jdk/src/share/classes/java/util/StringTokenizer.java b/jdk/src/java.base/share/classes/java/util/StringTokenizer.java
similarity index 100%
rename from jdk/src/share/classes/java/util/StringTokenizer.java
rename to jdk/src/java.base/share/classes/java/util/StringTokenizer.java
diff --git a/jdk/src/share/classes/java/util/TimSort.java b/jdk/src/java.base/share/classes/java/util/TimSort.java
similarity index 100%
rename from jdk/src/share/classes/java/util/TimSort.java
rename to jdk/src/java.base/share/classes/java/util/TimSort.java
diff --git a/jdk/src/share/classes/java/util/TimeZone.java b/jdk/src/java.base/share/classes/java/util/TimeZone.java
similarity index 100%
rename from jdk/src/share/classes/java/util/TimeZone.java
rename to jdk/src/java.base/share/classes/java/util/TimeZone.java
diff --git a/jdk/src/share/classes/java/util/Timer.java b/jdk/src/java.base/share/classes/java/util/Timer.java
similarity index 100%
rename from jdk/src/share/classes/java/util/Timer.java
rename to jdk/src/java.base/share/classes/java/util/Timer.java
diff --git a/jdk/src/share/classes/java/util/TimerTask.java b/jdk/src/java.base/share/classes/java/util/TimerTask.java
similarity index 100%
rename from jdk/src/share/classes/java/util/TimerTask.java
rename to jdk/src/java.base/share/classes/java/util/TimerTask.java
diff --git a/jdk/src/share/classes/java/util/TooManyListenersException.java b/jdk/src/java.base/share/classes/java/util/TooManyListenersException.java
similarity index 100%
rename from jdk/src/share/classes/java/util/TooManyListenersException.java
rename to jdk/src/java.base/share/classes/java/util/TooManyListenersException.java
diff --git a/jdk/src/share/classes/java/util/TreeMap.java b/jdk/src/java.base/share/classes/java/util/TreeMap.java
similarity index 100%
rename from jdk/src/share/classes/java/util/TreeMap.java
rename to jdk/src/java.base/share/classes/java/util/TreeMap.java
diff --git a/jdk/src/share/classes/java/util/TreeSet.java b/jdk/src/java.base/share/classes/java/util/TreeSet.java
similarity index 100%
rename from jdk/src/share/classes/java/util/TreeSet.java
rename to jdk/src/java.base/share/classes/java/util/TreeSet.java
diff --git a/jdk/src/share/classes/java/util/Tripwire.java b/jdk/src/java.base/share/classes/java/util/Tripwire.java
similarity index 100%
rename from jdk/src/share/classes/java/util/Tripwire.java
rename to jdk/src/java.base/share/classes/java/util/Tripwire.java
diff --git a/jdk/src/share/classes/java/util/UUID.java b/jdk/src/java.base/share/classes/java/util/UUID.java
similarity index 100%
rename from jdk/src/share/classes/java/util/UUID.java
rename to jdk/src/java.base/share/classes/java/util/UUID.java
diff --git a/jdk/src/share/classes/java/util/UnknownFormatConversionException.java b/jdk/src/java.base/share/classes/java/util/UnknownFormatConversionException.java
similarity index 100%
rename from jdk/src/share/classes/java/util/UnknownFormatConversionException.java
rename to jdk/src/java.base/share/classes/java/util/UnknownFormatConversionException.java
diff --git a/jdk/src/share/classes/java/util/UnknownFormatFlagsException.java b/jdk/src/java.base/share/classes/java/util/UnknownFormatFlagsException.java
similarity index 100%
rename from jdk/src/share/classes/java/util/UnknownFormatFlagsException.java
rename to jdk/src/java.base/share/classes/java/util/UnknownFormatFlagsException.java
diff --git a/jdk/src/share/classes/java/util/Vector.java b/jdk/src/java.base/share/classes/java/util/Vector.java
similarity index 100%
rename from jdk/src/share/classes/java/util/Vector.java
rename to jdk/src/java.base/share/classes/java/util/Vector.java
diff --git a/jdk/src/share/classes/java/util/WeakHashMap.java b/jdk/src/java.base/share/classes/java/util/WeakHashMap.java
similarity index 100%
rename from jdk/src/share/classes/java/util/WeakHashMap.java
rename to jdk/src/java.base/share/classes/java/util/WeakHashMap.java
diff --git a/jdk/src/share/classes/java/util/concurrent/AbstractExecutorService.java b/jdk/src/java.base/share/classes/java/util/concurrent/AbstractExecutorService.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/AbstractExecutorService.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/AbstractExecutorService.java
diff --git a/jdk/src/share/classes/java/util/concurrent/ArrayBlockingQueue.java b/jdk/src/java.base/share/classes/java/util/concurrent/ArrayBlockingQueue.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/ArrayBlockingQueue.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/ArrayBlockingQueue.java
diff --git a/jdk/src/share/classes/java/util/concurrent/BlockingDeque.java b/jdk/src/java.base/share/classes/java/util/concurrent/BlockingDeque.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/BlockingDeque.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/BlockingDeque.java
diff --git a/jdk/src/share/classes/java/util/concurrent/BlockingQueue.java b/jdk/src/java.base/share/classes/java/util/concurrent/BlockingQueue.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/BlockingQueue.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/BlockingQueue.java
diff --git a/jdk/src/share/classes/java/util/concurrent/BrokenBarrierException.java b/jdk/src/java.base/share/classes/java/util/concurrent/BrokenBarrierException.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/BrokenBarrierException.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/BrokenBarrierException.java
diff --git a/jdk/src/share/classes/java/util/concurrent/Callable.java b/jdk/src/java.base/share/classes/java/util/concurrent/Callable.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/Callable.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/Callable.java
diff --git a/jdk/src/share/classes/java/util/concurrent/CancellationException.java b/jdk/src/java.base/share/classes/java/util/concurrent/CancellationException.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/CancellationException.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/CancellationException.java
diff --git a/jdk/src/share/classes/java/util/concurrent/CompletableFuture.java b/jdk/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/CompletableFuture.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java
diff --git a/jdk/src/share/classes/java/util/concurrent/CompletionException.java b/jdk/src/java.base/share/classes/java/util/concurrent/CompletionException.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/CompletionException.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/CompletionException.java
diff --git a/jdk/src/share/classes/java/util/concurrent/CompletionService.java b/jdk/src/java.base/share/classes/java/util/concurrent/CompletionService.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/CompletionService.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/CompletionService.java
diff --git a/jdk/src/share/classes/java/util/concurrent/CompletionStage.java b/jdk/src/java.base/share/classes/java/util/concurrent/CompletionStage.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/CompletionStage.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/CompletionStage.java
diff --git a/jdk/src/share/classes/java/util/concurrent/ConcurrentHashMap.java b/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/ConcurrentHashMap.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java
diff --git a/jdk/src/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java b/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java
diff --git a/jdk/src/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java b/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java
diff --git a/jdk/src/share/classes/java/util/concurrent/ConcurrentMap.java b/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentMap.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/ConcurrentMap.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentMap.java
diff --git a/jdk/src/share/classes/java/util/concurrent/ConcurrentNavigableMap.java b/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentNavigableMap.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/ConcurrentNavigableMap.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentNavigableMap.java
diff --git a/jdk/src/share/classes/java/util/concurrent/ConcurrentSkipListMap.java b/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListMap.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/ConcurrentSkipListMap.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListMap.java
diff --git a/jdk/src/share/classes/java/util/concurrent/ConcurrentSkipListSet.java b/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListSet.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/ConcurrentSkipListSet.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListSet.java
diff --git a/jdk/src/share/classes/java/util/concurrent/CopyOnWriteArrayList.java b/jdk/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArrayList.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/CopyOnWriteArrayList.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArrayList.java
diff --git a/jdk/src/share/classes/java/util/concurrent/CopyOnWriteArraySet.java b/jdk/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArraySet.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/CopyOnWriteArraySet.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArraySet.java
diff --git a/jdk/src/share/classes/java/util/concurrent/CountDownLatch.java b/jdk/src/java.base/share/classes/java/util/concurrent/CountDownLatch.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/CountDownLatch.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/CountDownLatch.java
diff --git a/jdk/src/share/classes/java/util/concurrent/CountedCompleter.java b/jdk/src/java.base/share/classes/java/util/concurrent/CountedCompleter.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/CountedCompleter.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/CountedCompleter.java
diff --git a/jdk/src/share/classes/java/util/concurrent/CyclicBarrier.java b/jdk/src/java.base/share/classes/java/util/concurrent/CyclicBarrier.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/CyclicBarrier.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/CyclicBarrier.java
diff --git a/jdk/src/share/classes/java/util/concurrent/DelayQueue.java b/jdk/src/java.base/share/classes/java/util/concurrent/DelayQueue.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/DelayQueue.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/DelayQueue.java
diff --git a/jdk/src/share/classes/java/util/concurrent/Delayed.java b/jdk/src/java.base/share/classes/java/util/concurrent/Delayed.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/Delayed.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/Delayed.java
diff --git a/jdk/src/share/classes/java/util/concurrent/Exchanger.java b/jdk/src/java.base/share/classes/java/util/concurrent/Exchanger.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/Exchanger.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/Exchanger.java
diff --git a/jdk/src/share/classes/java/util/concurrent/ExecutionException.java b/jdk/src/java.base/share/classes/java/util/concurrent/ExecutionException.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/ExecutionException.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/ExecutionException.java
diff --git a/jdk/src/share/classes/java/util/concurrent/Executor.java b/jdk/src/java.base/share/classes/java/util/concurrent/Executor.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/Executor.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/Executor.java
diff --git a/jdk/src/share/classes/java/util/concurrent/ExecutorCompletionService.java b/jdk/src/java.base/share/classes/java/util/concurrent/ExecutorCompletionService.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/ExecutorCompletionService.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/ExecutorCompletionService.java
diff --git a/jdk/src/share/classes/java/util/concurrent/ExecutorService.java b/jdk/src/java.base/share/classes/java/util/concurrent/ExecutorService.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/ExecutorService.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/ExecutorService.java
diff --git a/jdk/src/share/classes/java/util/concurrent/Executors.java b/jdk/src/java.base/share/classes/java/util/concurrent/Executors.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/Executors.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/Executors.java
diff --git a/jdk/src/share/classes/java/util/concurrent/ForkJoinPool.java b/jdk/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/ForkJoinPool.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java
diff --git a/jdk/src/share/classes/java/util/concurrent/ForkJoinTask.java b/jdk/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/ForkJoinTask.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java
diff --git a/jdk/src/share/classes/java/util/concurrent/ForkJoinWorkerThread.java b/jdk/src/java.base/share/classes/java/util/concurrent/ForkJoinWorkerThread.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/ForkJoinWorkerThread.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/ForkJoinWorkerThread.java
diff --git a/jdk/src/share/classes/java/util/concurrent/Future.java b/jdk/src/java.base/share/classes/java/util/concurrent/Future.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/Future.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/Future.java
diff --git a/jdk/src/share/classes/java/util/concurrent/FutureTask.java b/jdk/src/java.base/share/classes/java/util/concurrent/FutureTask.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/FutureTask.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/FutureTask.java
diff --git a/jdk/src/share/classes/java/util/concurrent/LinkedBlockingDeque.java b/jdk/src/java.base/share/classes/java/util/concurrent/LinkedBlockingDeque.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/LinkedBlockingDeque.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/LinkedBlockingDeque.java
diff --git a/jdk/src/share/classes/java/util/concurrent/LinkedBlockingQueue.java b/jdk/src/java.base/share/classes/java/util/concurrent/LinkedBlockingQueue.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/LinkedBlockingQueue.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/LinkedBlockingQueue.java
diff --git a/jdk/src/share/classes/java/util/concurrent/LinkedTransferQueue.java b/jdk/src/java.base/share/classes/java/util/concurrent/LinkedTransferQueue.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/LinkedTransferQueue.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/LinkedTransferQueue.java
diff --git a/jdk/src/share/classes/java/util/concurrent/Phaser.java b/jdk/src/java.base/share/classes/java/util/concurrent/Phaser.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/Phaser.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/Phaser.java
diff --git a/jdk/src/share/classes/java/util/concurrent/PriorityBlockingQueue.java b/jdk/src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/PriorityBlockingQueue.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java
diff --git a/jdk/src/share/classes/java/util/concurrent/RecursiveAction.java b/jdk/src/java.base/share/classes/java/util/concurrent/RecursiveAction.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/RecursiveAction.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/RecursiveAction.java
diff --git a/jdk/src/share/classes/java/util/concurrent/RecursiveTask.java b/jdk/src/java.base/share/classes/java/util/concurrent/RecursiveTask.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/RecursiveTask.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/RecursiveTask.java
diff --git a/jdk/src/share/classes/java/util/concurrent/RejectedExecutionException.java b/jdk/src/java.base/share/classes/java/util/concurrent/RejectedExecutionException.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/RejectedExecutionException.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/RejectedExecutionException.java
diff --git a/jdk/src/share/classes/java/util/concurrent/RejectedExecutionHandler.java b/jdk/src/java.base/share/classes/java/util/concurrent/RejectedExecutionHandler.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/RejectedExecutionHandler.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/RejectedExecutionHandler.java
diff --git a/jdk/src/share/classes/java/util/concurrent/RunnableFuture.java b/jdk/src/java.base/share/classes/java/util/concurrent/RunnableFuture.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/RunnableFuture.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/RunnableFuture.java
diff --git a/jdk/src/share/classes/java/util/concurrent/RunnableScheduledFuture.java b/jdk/src/java.base/share/classes/java/util/concurrent/RunnableScheduledFuture.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/RunnableScheduledFuture.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/RunnableScheduledFuture.java
diff --git a/jdk/src/share/classes/java/util/concurrent/ScheduledExecutorService.java b/jdk/src/java.base/share/classes/java/util/concurrent/ScheduledExecutorService.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/ScheduledExecutorService.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/ScheduledExecutorService.java
diff --git a/jdk/src/share/classes/java/util/concurrent/ScheduledFuture.java b/jdk/src/java.base/share/classes/java/util/concurrent/ScheduledFuture.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/ScheduledFuture.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/ScheduledFuture.java
diff --git a/jdk/src/share/classes/java/util/concurrent/ScheduledThreadPoolExecutor.java b/jdk/src/java.base/share/classes/java/util/concurrent/ScheduledThreadPoolExecutor.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/ScheduledThreadPoolExecutor.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/ScheduledThreadPoolExecutor.java
diff --git a/jdk/src/share/classes/java/util/concurrent/Semaphore.java b/jdk/src/java.base/share/classes/java/util/concurrent/Semaphore.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/Semaphore.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/Semaphore.java
diff --git a/jdk/src/share/classes/java/util/concurrent/SynchronousQueue.java b/jdk/src/java.base/share/classes/java/util/concurrent/SynchronousQueue.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/SynchronousQueue.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/SynchronousQueue.java
diff --git a/jdk/src/share/classes/java/util/concurrent/ThreadFactory.java b/jdk/src/java.base/share/classes/java/util/concurrent/ThreadFactory.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/ThreadFactory.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/ThreadFactory.java
diff --git a/jdk/src/share/classes/java/util/concurrent/ThreadLocalRandom.java b/jdk/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/ThreadLocalRandom.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java
diff --git a/jdk/src/share/classes/java/util/concurrent/ThreadPoolExecutor.java b/jdk/src/java.base/share/classes/java/util/concurrent/ThreadPoolExecutor.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/ThreadPoolExecutor.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/ThreadPoolExecutor.java
diff --git a/jdk/src/share/classes/java/util/concurrent/TimeUnit.java b/jdk/src/java.base/share/classes/java/util/concurrent/TimeUnit.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/TimeUnit.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/TimeUnit.java
diff --git a/jdk/src/share/classes/java/util/concurrent/TimeoutException.java b/jdk/src/java.base/share/classes/java/util/concurrent/TimeoutException.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/TimeoutException.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/TimeoutException.java
diff --git a/jdk/src/share/classes/java/util/concurrent/TransferQueue.java b/jdk/src/java.base/share/classes/java/util/concurrent/TransferQueue.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/TransferQueue.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/TransferQueue.java
diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicBoolean.java b/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicBoolean.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/atomic/AtomicBoolean.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicBoolean.java
diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicInteger.java b/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicInteger.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/atomic/AtomicInteger.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicInteger.java
diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicIntegerArray.java b/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicIntegerArray.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/atomic/AtomicIntegerArray.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicIntegerArray.java
diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java b/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java
diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLong.java b/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicLong.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/atomic/AtomicLong.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicLong.java
diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLongArray.java b/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicLongArray.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/atomic/AtomicLongArray.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicLongArray.java
diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java b/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java
diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicMarkableReference.java b/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicMarkableReference.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/atomic/AtomicMarkableReference.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicMarkableReference.java
diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReference.java b/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReference.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/atomic/AtomicReference.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReference.java
diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java b/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java
diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java b/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java
diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicStampedReference.java b/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicStampedReference.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/atomic/AtomicStampedReference.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicStampedReference.java
diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/DoubleAccumulator.java b/jdk/src/java.base/share/classes/java/util/concurrent/atomic/DoubleAccumulator.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/atomic/DoubleAccumulator.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/atomic/DoubleAccumulator.java
diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/DoubleAdder.java b/jdk/src/java.base/share/classes/java/util/concurrent/atomic/DoubleAdder.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/atomic/DoubleAdder.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/atomic/DoubleAdder.java
diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/LongAccumulator.java b/jdk/src/java.base/share/classes/java/util/concurrent/atomic/LongAccumulator.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/atomic/LongAccumulator.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/atomic/LongAccumulator.java
diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/LongAdder.java b/jdk/src/java.base/share/classes/java/util/concurrent/atomic/LongAdder.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/atomic/LongAdder.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/atomic/LongAdder.java
diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/Striped64.java b/jdk/src/java.base/share/classes/java/util/concurrent/atomic/Striped64.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/atomic/Striped64.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/atomic/Striped64.java
diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/package-info.java b/jdk/src/java.base/share/classes/java/util/concurrent/atomic/package-info.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/atomic/package-info.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/atomic/package-info.java
diff --git a/jdk/src/share/classes/java/util/concurrent/locks/AbstractOwnableSynchronizer.java b/jdk/src/java.base/share/classes/java/util/concurrent/locks/AbstractOwnableSynchronizer.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/locks/AbstractOwnableSynchronizer.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/locks/AbstractOwnableSynchronizer.java
diff --git a/jdk/src/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java b/jdk/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
diff --git a/jdk/src/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java b/jdk/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
diff --git a/jdk/src/share/classes/java/util/concurrent/locks/Condition.java b/jdk/src/java.base/share/classes/java/util/concurrent/locks/Condition.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/locks/Condition.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/locks/Condition.java
diff --git a/jdk/src/share/classes/java/util/concurrent/locks/Lock.java b/jdk/src/java.base/share/classes/java/util/concurrent/locks/Lock.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/locks/Lock.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/locks/Lock.java
diff --git a/jdk/src/share/classes/java/util/concurrent/locks/LockSupport.java b/jdk/src/java.base/share/classes/java/util/concurrent/locks/LockSupport.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/locks/LockSupport.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/locks/LockSupport.java
diff --git a/jdk/src/share/classes/java/util/concurrent/locks/ReadWriteLock.java b/jdk/src/java.base/share/classes/java/util/concurrent/locks/ReadWriteLock.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/locks/ReadWriteLock.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/locks/ReadWriteLock.java
diff --git a/jdk/src/share/classes/java/util/concurrent/locks/ReentrantLock.java b/jdk/src/java.base/share/classes/java/util/concurrent/locks/ReentrantLock.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/locks/ReentrantLock.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/locks/ReentrantLock.java
diff --git a/jdk/src/share/classes/java/util/concurrent/locks/ReentrantReadWriteLock.java b/jdk/src/java.base/share/classes/java/util/concurrent/locks/ReentrantReadWriteLock.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/locks/ReentrantReadWriteLock.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/locks/ReentrantReadWriteLock.java
diff --git a/jdk/src/share/classes/java/util/concurrent/locks/StampedLock.java b/jdk/src/java.base/share/classes/java/util/concurrent/locks/StampedLock.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/locks/StampedLock.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/locks/StampedLock.java
diff --git a/jdk/src/share/classes/java/util/concurrent/locks/package-info.java b/jdk/src/java.base/share/classes/java/util/concurrent/locks/package-info.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/locks/package-info.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/locks/package-info.java
diff --git a/jdk/src/share/classes/java/util/concurrent/package-info.java b/jdk/src/java.base/share/classes/java/util/concurrent/package-info.java
similarity index 100%
rename from jdk/src/share/classes/java/util/concurrent/package-info.java
rename to jdk/src/java.base/share/classes/java/util/concurrent/package-info.java
diff --git a/jdk/src/share/classes/java/util/function/BiConsumer.java b/jdk/src/java.base/share/classes/java/util/function/BiConsumer.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/BiConsumer.java
rename to jdk/src/java.base/share/classes/java/util/function/BiConsumer.java
diff --git a/jdk/src/share/classes/java/util/function/BiFunction.java b/jdk/src/java.base/share/classes/java/util/function/BiFunction.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/BiFunction.java
rename to jdk/src/java.base/share/classes/java/util/function/BiFunction.java
diff --git a/jdk/src/share/classes/java/util/function/BiPredicate.java b/jdk/src/java.base/share/classes/java/util/function/BiPredicate.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/BiPredicate.java
rename to jdk/src/java.base/share/classes/java/util/function/BiPredicate.java
diff --git a/jdk/src/share/classes/java/util/function/BinaryOperator.java b/jdk/src/java.base/share/classes/java/util/function/BinaryOperator.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/BinaryOperator.java
rename to jdk/src/java.base/share/classes/java/util/function/BinaryOperator.java
diff --git a/jdk/src/share/classes/java/util/function/BooleanSupplier.java b/jdk/src/java.base/share/classes/java/util/function/BooleanSupplier.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/BooleanSupplier.java
rename to jdk/src/java.base/share/classes/java/util/function/BooleanSupplier.java
diff --git a/jdk/src/share/classes/java/util/function/Consumer.java b/jdk/src/java.base/share/classes/java/util/function/Consumer.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/Consumer.java
rename to jdk/src/java.base/share/classes/java/util/function/Consumer.java
diff --git a/jdk/src/share/classes/java/util/function/DoubleBinaryOperator.java b/jdk/src/java.base/share/classes/java/util/function/DoubleBinaryOperator.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/DoubleBinaryOperator.java
rename to jdk/src/java.base/share/classes/java/util/function/DoubleBinaryOperator.java
diff --git a/jdk/src/share/classes/java/util/function/DoubleConsumer.java b/jdk/src/java.base/share/classes/java/util/function/DoubleConsumer.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/DoubleConsumer.java
rename to jdk/src/java.base/share/classes/java/util/function/DoubleConsumer.java
diff --git a/jdk/src/share/classes/java/util/function/DoubleFunction.java b/jdk/src/java.base/share/classes/java/util/function/DoubleFunction.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/DoubleFunction.java
rename to jdk/src/java.base/share/classes/java/util/function/DoubleFunction.java
diff --git a/jdk/src/share/classes/java/util/function/DoublePredicate.java b/jdk/src/java.base/share/classes/java/util/function/DoublePredicate.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/DoublePredicate.java
rename to jdk/src/java.base/share/classes/java/util/function/DoublePredicate.java
diff --git a/jdk/src/share/classes/java/util/function/DoubleSupplier.java b/jdk/src/java.base/share/classes/java/util/function/DoubleSupplier.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/DoubleSupplier.java
rename to jdk/src/java.base/share/classes/java/util/function/DoubleSupplier.java
diff --git a/jdk/src/share/classes/java/util/function/DoubleToIntFunction.java b/jdk/src/java.base/share/classes/java/util/function/DoubleToIntFunction.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/DoubleToIntFunction.java
rename to jdk/src/java.base/share/classes/java/util/function/DoubleToIntFunction.java
diff --git a/jdk/src/share/classes/java/util/function/DoubleToLongFunction.java b/jdk/src/java.base/share/classes/java/util/function/DoubleToLongFunction.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/DoubleToLongFunction.java
rename to jdk/src/java.base/share/classes/java/util/function/DoubleToLongFunction.java
diff --git a/jdk/src/share/classes/java/util/function/DoubleUnaryOperator.java b/jdk/src/java.base/share/classes/java/util/function/DoubleUnaryOperator.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/DoubleUnaryOperator.java
rename to jdk/src/java.base/share/classes/java/util/function/DoubleUnaryOperator.java
diff --git a/jdk/src/share/classes/java/util/function/Function.java b/jdk/src/java.base/share/classes/java/util/function/Function.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/Function.java
rename to jdk/src/java.base/share/classes/java/util/function/Function.java
diff --git a/jdk/src/share/classes/java/util/function/IntBinaryOperator.java b/jdk/src/java.base/share/classes/java/util/function/IntBinaryOperator.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/IntBinaryOperator.java
rename to jdk/src/java.base/share/classes/java/util/function/IntBinaryOperator.java
diff --git a/jdk/src/share/classes/java/util/function/IntConsumer.java b/jdk/src/java.base/share/classes/java/util/function/IntConsumer.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/IntConsumer.java
rename to jdk/src/java.base/share/classes/java/util/function/IntConsumer.java
diff --git a/jdk/src/share/classes/java/util/function/IntFunction.java b/jdk/src/java.base/share/classes/java/util/function/IntFunction.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/IntFunction.java
rename to jdk/src/java.base/share/classes/java/util/function/IntFunction.java
diff --git a/jdk/src/share/classes/java/util/function/IntPredicate.java b/jdk/src/java.base/share/classes/java/util/function/IntPredicate.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/IntPredicate.java
rename to jdk/src/java.base/share/classes/java/util/function/IntPredicate.java
diff --git a/jdk/src/share/classes/java/util/function/IntSupplier.java b/jdk/src/java.base/share/classes/java/util/function/IntSupplier.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/IntSupplier.java
rename to jdk/src/java.base/share/classes/java/util/function/IntSupplier.java
diff --git a/jdk/src/share/classes/java/util/function/IntToDoubleFunction.java b/jdk/src/java.base/share/classes/java/util/function/IntToDoubleFunction.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/IntToDoubleFunction.java
rename to jdk/src/java.base/share/classes/java/util/function/IntToDoubleFunction.java
diff --git a/jdk/src/share/classes/java/util/function/IntToLongFunction.java b/jdk/src/java.base/share/classes/java/util/function/IntToLongFunction.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/IntToLongFunction.java
rename to jdk/src/java.base/share/classes/java/util/function/IntToLongFunction.java
diff --git a/jdk/src/share/classes/java/util/function/IntUnaryOperator.java b/jdk/src/java.base/share/classes/java/util/function/IntUnaryOperator.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/IntUnaryOperator.java
rename to jdk/src/java.base/share/classes/java/util/function/IntUnaryOperator.java
diff --git a/jdk/src/share/classes/java/util/function/LongBinaryOperator.java b/jdk/src/java.base/share/classes/java/util/function/LongBinaryOperator.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/LongBinaryOperator.java
rename to jdk/src/java.base/share/classes/java/util/function/LongBinaryOperator.java
diff --git a/jdk/src/share/classes/java/util/function/LongConsumer.java b/jdk/src/java.base/share/classes/java/util/function/LongConsumer.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/LongConsumer.java
rename to jdk/src/java.base/share/classes/java/util/function/LongConsumer.java
diff --git a/jdk/src/share/classes/java/util/function/LongFunction.java b/jdk/src/java.base/share/classes/java/util/function/LongFunction.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/LongFunction.java
rename to jdk/src/java.base/share/classes/java/util/function/LongFunction.java
diff --git a/jdk/src/share/classes/java/util/function/LongPredicate.java b/jdk/src/java.base/share/classes/java/util/function/LongPredicate.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/LongPredicate.java
rename to jdk/src/java.base/share/classes/java/util/function/LongPredicate.java
diff --git a/jdk/src/share/classes/java/util/function/LongSupplier.java b/jdk/src/java.base/share/classes/java/util/function/LongSupplier.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/LongSupplier.java
rename to jdk/src/java.base/share/classes/java/util/function/LongSupplier.java
diff --git a/jdk/src/share/classes/java/util/function/LongToDoubleFunction.java b/jdk/src/java.base/share/classes/java/util/function/LongToDoubleFunction.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/LongToDoubleFunction.java
rename to jdk/src/java.base/share/classes/java/util/function/LongToDoubleFunction.java
diff --git a/jdk/src/share/classes/java/util/function/LongToIntFunction.java b/jdk/src/java.base/share/classes/java/util/function/LongToIntFunction.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/LongToIntFunction.java
rename to jdk/src/java.base/share/classes/java/util/function/LongToIntFunction.java
diff --git a/jdk/src/share/classes/java/util/function/LongUnaryOperator.java b/jdk/src/java.base/share/classes/java/util/function/LongUnaryOperator.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/LongUnaryOperator.java
rename to jdk/src/java.base/share/classes/java/util/function/LongUnaryOperator.java
diff --git a/jdk/src/share/classes/java/util/function/ObjDoubleConsumer.java b/jdk/src/java.base/share/classes/java/util/function/ObjDoubleConsumer.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/ObjDoubleConsumer.java
rename to jdk/src/java.base/share/classes/java/util/function/ObjDoubleConsumer.java
diff --git a/jdk/src/share/classes/java/util/function/ObjIntConsumer.java b/jdk/src/java.base/share/classes/java/util/function/ObjIntConsumer.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/ObjIntConsumer.java
rename to jdk/src/java.base/share/classes/java/util/function/ObjIntConsumer.java
diff --git a/jdk/src/share/classes/java/util/function/ObjLongConsumer.java b/jdk/src/java.base/share/classes/java/util/function/ObjLongConsumer.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/ObjLongConsumer.java
rename to jdk/src/java.base/share/classes/java/util/function/ObjLongConsumer.java
diff --git a/jdk/src/share/classes/java/util/function/Predicate.java b/jdk/src/java.base/share/classes/java/util/function/Predicate.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/Predicate.java
rename to jdk/src/java.base/share/classes/java/util/function/Predicate.java
diff --git a/jdk/src/share/classes/java/util/function/Supplier.java b/jdk/src/java.base/share/classes/java/util/function/Supplier.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/Supplier.java
rename to jdk/src/java.base/share/classes/java/util/function/Supplier.java
diff --git a/jdk/src/share/classes/java/util/function/ToDoubleBiFunction.java b/jdk/src/java.base/share/classes/java/util/function/ToDoubleBiFunction.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/ToDoubleBiFunction.java
rename to jdk/src/java.base/share/classes/java/util/function/ToDoubleBiFunction.java
diff --git a/jdk/src/share/classes/java/util/function/ToDoubleFunction.java b/jdk/src/java.base/share/classes/java/util/function/ToDoubleFunction.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/ToDoubleFunction.java
rename to jdk/src/java.base/share/classes/java/util/function/ToDoubleFunction.java
diff --git a/jdk/src/share/classes/java/util/function/ToIntBiFunction.java b/jdk/src/java.base/share/classes/java/util/function/ToIntBiFunction.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/ToIntBiFunction.java
rename to jdk/src/java.base/share/classes/java/util/function/ToIntBiFunction.java
diff --git a/jdk/src/share/classes/java/util/function/ToIntFunction.java b/jdk/src/java.base/share/classes/java/util/function/ToIntFunction.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/ToIntFunction.java
rename to jdk/src/java.base/share/classes/java/util/function/ToIntFunction.java
diff --git a/jdk/src/share/classes/java/util/function/ToLongBiFunction.java b/jdk/src/java.base/share/classes/java/util/function/ToLongBiFunction.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/ToLongBiFunction.java
rename to jdk/src/java.base/share/classes/java/util/function/ToLongBiFunction.java
diff --git a/jdk/src/share/classes/java/util/function/ToLongFunction.java b/jdk/src/java.base/share/classes/java/util/function/ToLongFunction.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/ToLongFunction.java
rename to jdk/src/java.base/share/classes/java/util/function/ToLongFunction.java
diff --git a/jdk/src/share/classes/java/util/function/UnaryOperator.java b/jdk/src/java.base/share/classes/java/util/function/UnaryOperator.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/UnaryOperator.java
rename to jdk/src/java.base/share/classes/java/util/function/UnaryOperator.java
diff --git a/jdk/src/share/classes/java/util/function/package-info.java b/jdk/src/java.base/share/classes/java/util/function/package-info.java
similarity index 100%
rename from jdk/src/share/classes/java/util/function/package-info.java
rename to jdk/src/java.base/share/classes/java/util/function/package-info.java
diff --git a/jdk/src/share/classes/java/util/jar/Attributes.java b/jdk/src/java.base/share/classes/java/util/jar/Attributes.java
similarity index 100%
rename from jdk/src/share/classes/java/util/jar/Attributes.java
rename to jdk/src/java.base/share/classes/java/util/jar/Attributes.java
diff --git a/jdk/src/share/classes/java/util/jar/JarEntry.java b/jdk/src/java.base/share/classes/java/util/jar/JarEntry.java
similarity index 100%
rename from jdk/src/share/classes/java/util/jar/JarEntry.java
rename to jdk/src/java.base/share/classes/java/util/jar/JarEntry.java
diff --git a/jdk/src/share/classes/java/util/jar/JarException.java b/jdk/src/java.base/share/classes/java/util/jar/JarException.java
similarity index 100%
rename from jdk/src/share/classes/java/util/jar/JarException.java
rename to jdk/src/java.base/share/classes/java/util/jar/JarException.java
diff --git a/jdk/src/share/classes/java/util/jar/JarFile.java b/jdk/src/java.base/share/classes/java/util/jar/JarFile.java
similarity index 100%
rename from jdk/src/share/classes/java/util/jar/JarFile.java
rename to jdk/src/java.base/share/classes/java/util/jar/JarFile.java
diff --git a/jdk/src/share/classes/java/util/jar/JarInputStream.java b/jdk/src/java.base/share/classes/java/util/jar/JarInputStream.java
similarity index 100%
rename from jdk/src/share/classes/java/util/jar/JarInputStream.java
rename to jdk/src/java.base/share/classes/java/util/jar/JarInputStream.java
diff --git a/jdk/src/share/classes/java/util/jar/JarOutputStream.java b/jdk/src/java.base/share/classes/java/util/jar/JarOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/java/util/jar/JarOutputStream.java
rename to jdk/src/java.base/share/classes/java/util/jar/JarOutputStream.java
diff --git a/jdk/src/share/classes/java/util/jar/JarVerifier.java b/jdk/src/java.base/share/classes/java/util/jar/JarVerifier.java
similarity index 100%
rename from jdk/src/share/classes/java/util/jar/JarVerifier.java
rename to jdk/src/java.base/share/classes/java/util/jar/JarVerifier.java
diff --git a/jdk/src/share/classes/java/util/jar/JavaUtilJarAccessImpl.java b/jdk/src/java.base/share/classes/java/util/jar/JavaUtilJarAccessImpl.java
similarity index 100%
rename from jdk/src/share/classes/java/util/jar/JavaUtilJarAccessImpl.java
rename to jdk/src/java.base/share/classes/java/util/jar/JavaUtilJarAccessImpl.java
diff --git a/jdk/src/share/classes/java/util/jar/Manifest.java b/jdk/src/java.base/share/classes/java/util/jar/Manifest.java
similarity index 100%
rename from jdk/src/share/classes/java/util/jar/Manifest.java
rename to jdk/src/java.base/share/classes/java/util/jar/Manifest.java
diff --git a/jdk/src/share/classes/java/util/jar/Pack200.java b/jdk/src/java.base/share/classes/java/util/jar/Pack200.java
similarity index 100%
rename from jdk/src/share/classes/java/util/jar/Pack200.java
rename to jdk/src/java.base/share/classes/java/util/jar/Pack200.java
diff --git a/jdk/src/share/classes/java/util/jar/package.html b/jdk/src/java.base/share/classes/java/util/jar/package.html
similarity index 100%
rename from jdk/src/share/classes/java/util/jar/package.html
rename to jdk/src/java.base/share/classes/java/util/jar/package.html
diff --git a/jdk/src/share/classes/java/util/package.html b/jdk/src/java.base/share/classes/java/util/package.html
similarity index 100%
rename from jdk/src/share/classes/java/util/package.html
rename to jdk/src/java.base/share/classes/java/util/package.html
diff --git a/jdk/src/share/classes/java/util/regex/ASCII.java b/jdk/src/java.base/share/classes/java/util/regex/ASCII.java
similarity index 100%
rename from jdk/src/share/classes/java/util/regex/ASCII.java
rename to jdk/src/java.base/share/classes/java/util/regex/ASCII.java
diff --git a/jdk/src/share/classes/java/util/regex/MatchResult.java b/jdk/src/java.base/share/classes/java/util/regex/MatchResult.java
similarity index 100%
rename from jdk/src/share/classes/java/util/regex/MatchResult.java
rename to jdk/src/java.base/share/classes/java/util/regex/MatchResult.java
diff --git a/jdk/src/share/classes/java/util/regex/Matcher.java b/jdk/src/java.base/share/classes/java/util/regex/Matcher.java
similarity index 100%
rename from jdk/src/share/classes/java/util/regex/Matcher.java
rename to jdk/src/java.base/share/classes/java/util/regex/Matcher.java
diff --git a/jdk/src/share/classes/java/util/regex/Pattern.java b/jdk/src/java.base/share/classes/java/util/regex/Pattern.java
similarity index 100%
rename from jdk/src/share/classes/java/util/regex/Pattern.java
rename to jdk/src/java.base/share/classes/java/util/regex/Pattern.java
diff --git a/jdk/src/share/classes/java/util/regex/PatternSyntaxException.java b/jdk/src/java.base/share/classes/java/util/regex/PatternSyntaxException.java
similarity index 100%
rename from jdk/src/share/classes/java/util/regex/PatternSyntaxException.java
rename to jdk/src/java.base/share/classes/java/util/regex/PatternSyntaxException.java
diff --git a/jdk/src/share/classes/java/util/regex/UnicodeProp.java b/jdk/src/java.base/share/classes/java/util/regex/UnicodeProp.java
similarity index 100%
rename from jdk/src/share/classes/java/util/regex/UnicodeProp.java
rename to jdk/src/java.base/share/classes/java/util/regex/UnicodeProp.java
diff --git a/jdk/src/share/classes/java/util/regex/package.html b/jdk/src/java.base/share/classes/java/util/regex/package.html
similarity index 100%
rename from jdk/src/share/classes/java/util/regex/package.html
rename to jdk/src/java.base/share/classes/java/util/regex/package.html
diff --git a/jdk/src/share/classes/java/util/spi/CalendarDataProvider.java b/jdk/src/java.base/share/classes/java/util/spi/CalendarDataProvider.java
similarity index 100%
rename from jdk/src/share/classes/java/util/spi/CalendarDataProvider.java
rename to jdk/src/java.base/share/classes/java/util/spi/CalendarDataProvider.java
diff --git a/jdk/src/share/classes/java/util/spi/CalendarNameProvider.java b/jdk/src/java.base/share/classes/java/util/spi/CalendarNameProvider.java
similarity index 100%
rename from jdk/src/share/classes/java/util/spi/CalendarNameProvider.java
rename to jdk/src/java.base/share/classes/java/util/spi/CalendarNameProvider.java
diff --git a/jdk/src/share/classes/java/util/spi/CurrencyNameProvider.java b/jdk/src/java.base/share/classes/java/util/spi/CurrencyNameProvider.java
similarity index 100%
rename from jdk/src/share/classes/java/util/spi/CurrencyNameProvider.java
rename to jdk/src/java.base/share/classes/java/util/spi/CurrencyNameProvider.java
diff --git a/jdk/src/share/classes/java/util/spi/LocaleNameProvider.java b/jdk/src/java.base/share/classes/java/util/spi/LocaleNameProvider.java
similarity index 100%
rename from jdk/src/share/classes/java/util/spi/LocaleNameProvider.java
rename to jdk/src/java.base/share/classes/java/util/spi/LocaleNameProvider.java
diff --git a/jdk/src/share/classes/java/util/spi/LocaleServiceProvider.java b/jdk/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java
similarity index 100%
rename from jdk/src/share/classes/java/util/spi/LocaleServiceProvider.java
rename to jdk/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java
diff --git a/jdk/src/share/classes/java/util/spi/ResourceBundleControlProvider.java b/jdk/src/java.base/share/classes/java/util/spi/ResourceBundleControlProvider.java
similarity index 100%
rename from jdk/src/share/classes/java/util/spi/ResourceBundleControlProvider.java
rename to jdk/src/java.base/share/classes/java/util/spi/ResourceBundleControlProvider.java
diff --git a/jdk/src/share/classes/java/util/spi/TimeZoneNameProvider.java b/jdk/src/java.base/share/classes/java/util/spi/TimeZoneNameProvider.java
similarity index 100%
rename from jdk/src/share/classes/java/util/spi/TimeZoneNameProvider.java
rename to jdk/src/java.base/share/classes/java/util/spi/TimeZoneNameProvider.java
diff --git a/jdk/src/share/classes/java/util/spi/package.html b/jdk/src/java.base/share/classes/java/util/spi/package.html
similarity index 100%
rename from jdk/src/share/classes/java/util/spi/package.html
rename to jdk/src/java.base/share/classes/java/util/spi/package.html
diff --git a/jdk/src/share/classes/java/util/stream/AbstractPipeline.java b/jdk/src/java.base/share/classes/java/util/stream/AbstractPipeline.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/AbstractPipeline.java
rename to jdk/src/java.base/share/classes/java/util/stream/AbstractPipeline.java
diff --git a/jdk/src/share/classes/java/util/stream/AbstractShortCircuitTask.java b/jdk/src/java.base/share/classes/java/util/stream/AbstractShortCircuitTask.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/AbstractShortCircuitTask.java
rename to jdk/src/java.base/share/classes/java/util/stream/AbstractShortCircuitTask.java
diff --git a/jdk/src/share/classes/java/util/stream/AbstractSpinedBuffer.java b/jdk/src/java.base/share/classes/java/util/stream/AbstractSpinedBuffer.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/AbstractSpinedBuffer.java
rename to jdk/src/java.base/share/classes/java/util/stream/AbstractSpinedBuffer.java
diff --git a/jdk/src/share/classes/java/util/stream/AbstractTask.java b/jdk/src/java.base/share/classes/java/util/stream/AbstractTask.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/AbstractTask.java
rename to jdk/src/java.base/share/classes/java/util/stream/AbstractTask.java
diff --git a/jdk/src/share/classes/java/util/stream/BaseStream.java b/jdk/src/java.base/share/classes/java/util/stream/BaseStream.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/BaseStream.java
rename to jdk/src/java.base/share/classes/java/util/stream/BaseStream.java
diff --git a/jdk/src/share/classes/java/util/stream/Collector.java b/jdk/src/java.base/share/classes/java/util/stream/Collector.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/Collector.java
rename to jdk/src/java.base/share/classes/java/util/stream/Collector.java
diff --git a/jdk/src/share/classes/java/util/stream/Collectors.java b/jdk/src/java.base/share/classes/java/util/stream/Collectors.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/Collectors.java
rename to jdk/src/java.base/share/classes/java/util/stream/Collectors.java
diff --git a/jdk/src/share/classes/java/util/stream/DistinctOps.java b/jdk/src/java.base/share/classes/java/util/stream/DistinctOps.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/DistinctOps.java
rename to jdk/src/java.base/share/classes/java/util/stream/DistinctOps.java
diff --git a/jdk/src/share/classes/java/util/stream/DoublePipeline.java b/jdk/src/java.base/share/classes/java/util/stream/DoublePipeline.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/DoublePipeline.java
rename to jdk/src/java.base/share/classes/java/util/stream/DoublePipeline.java
diff --git a/jdk/src/share/classes/java/util/stream/DoubleStream.java b/jdk/src/java.base/share/classes/java/util/stream/DoubleStream.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/DoubleStream.java
rename to jdk/src/java.base/share/classes/java/util/stream/DoubleStream.java
diff --git a/jdk/src/share/classes/java/util/stream/FindOps.java b/jdk/src/java.base/share/classes/java/util/stream/FindOps.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/FindOps.java
rename to jdk/src/java.base/share/classes/java/util/stream/FindOps.java
diff --git a/jdk/src/share/classes/java/util/stream/ForEachOps.java b/jdk/src/java.base/share/classes/java/util/stream/ForEachOps.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/ForEachOps.java
rename to jdk/src/java.base/share/classes/java/util/stream/ForEachOps.java
diff --git a/jdk/src/share/classes/java/util/stream/IntPipeline.java b/jdk/src/java.base/share/classes/java/util/stream/IntPipeline.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/IntPipeline.java
rename to jdk/src/java.base/share/classes/java/util/stream/IntPipeline.java
diff --git a/jdk/src/share/classes/java/util/stream/IntStream.java b/jdk/src/java.base/share/classes/java/util/stream/IntStream.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/IntStream.java
rename to jdk/src/java.base/share/classes/java/util/stream/IntStream.java
diff --git a/jdk/src/share/classes/java/util/stream/LongPipeline.java b/jdk/src/java.base/share/classes/java/util/stream/LongPipeline.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/LongPipeline.java
rename to jdk/src/java.base/share/classes/java/util/stream/LongPipeline.java
diff --git a/jdk/src/share/classes/java/util/stream/LongStream.java b/jdk/src/java.base/share/classes/java/util/stream/LongStream.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/LongStream.java
rename to jdk/src/java.base/share/classes/java/util/stream/LongStream.java
diff --git a/jdk/src/share/classes/java/util/stream/MatchOps.java b/jdk/src/java.base/share/classes/java/util/stream/MatchOps.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/MatchOps.java
rename to jdk/src/java.base/share/classes/java/util/stream/MatchOps.java
diff --git a/jdk/src/share/classes/java/util/stream/Node.java b/jdk/src/java.base/share/classes/java/util/stream/Node.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/Node.java
rename to jdk/src/java.base/share/classes/java/util/stream/Node.java
diff --git a/jdk/src/share/classes/java/util/stream/Nodes.java b/jdk/src/java.base/share/classes/java/util/stream/Nodes.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/Nodes.java
rename to jdk/src/java.base/share/classes/java/util/stream/Nodes.java
diff --git a/jdk/src/share/classes/java/util/stream/PipelineHelper.java b/jdk/src/java.base/share/classes/java/util/stream/PipelineHelper.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/PipelineHelper.java
rename to jdk/src/java.base/share/classes/java/util/stream/PipelineHelper.java
diff --git a/jdk/src/share/classes/java/util/stream/ReduceOps.java b/jdk/src/java.base/share/classes/java/util/stream/ReduceOps.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/ReduceOps.java
rename to jdk/src/java.base/share/classes/java/util/stream/ReduceOps.java
diff --git a/jdk/src/share/classes/java/util/stream/ReferencePipeline.java b/jdk/src/java.base/share/classes/java/util/stream/ReferencePipeline.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/ReferencePipeline.java
rename to jdk/src/java.base/share/classes/java/util/stream/ReferencePipeline.java
diff --git a/jdk/src/share/classes/java/util/stream/Sink.java b/jdk/src/java.base/share/classes/java/util/stream/Sink.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/Sink.java
rename to jdk/src/java.base/share/classes/java/util/stream/Sink.java
diff --git a/jdk/src/share/classes/java/util/stream/SliceOps.java b/jdk/src/java.base/share/classes/java/util/stream/SliceOps.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/SliceOps.java
rename to jdk/src/java.base/share/classes/java/util/stream/SliceOps.java
diff --git a/jdk/src/share/classes/java/util/stream/SortedOps.java b/jdk/src/java.base/share/classes/java/util/stream/SortedOps.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/SortedOps.java
rename to jdk/src/java.base/share/classes/java/util/stream/SortedOps.java
diff --git a/jdk/src/share/classes/java/util/stream/SpinedBuffer.java b/jdk/src/java.base/share/classes/java/util/stream/SpinedBuffer.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/SpinedBuffer.java
rename to jdk/src/java.base/share/classes/java/util/stream/SpinedBuffer.java
diff --git a/jdk/src/share/classes/java/util/stream/Stream.java b/jdk/src/java.base/share/classes/java/util/stream/Stream.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/Stream.java
rename to jdk/src/java.base/share/classes/java/util/stream/Stream.java
diff --git a/jdk/src/share/classes/java/util/stream/StreamOpFlag.java b/jdk/src/java.base/share/classes/java/util/stream/StreamOpFlag.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/StreamOpFlag.java
rename to jdk/src/java.base/share/classes/java/util/stream/StreamOpFlag.java
diff --git a/jdk/src/share/classes/java/util/stream/StreamShape.java b/jdk/src/java.base/share/classes/java/util/stream/StreamShape.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/StreamShape.java
rename to jdk/src/java.base/share/classes/java/util/stream/StreamShape.java
diff --git a/jdk/src/share/classes/java/util/stream/StreamSpliterators.java b/jdk/src/java.base/share/classes/java/util/stream/StreamSpliterators.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/StreamSpliterators.java
rename to jdk/src/java.base/share/classes/java/util/stream/StreamSpliterators.java
diff --git a/jdk/src/share/classes/java/util/stream/StreamSupport.java b/jdk/src/java.base/share/classes/java/util/stream/StreamSupport.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/StreamSupport.java
rename to jdk/src/java.base/share/classes/java/util/stream/StreamSupport.java
diff --git a/jdk/src/share/classes/java/util/stream/Streams.java b/jdk/src/java.base/share/classes/java/util/stream/Streams.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/Streams.java
rename to jdk/src/java.base/share/classes/java/util/stream/Streams.java
diff --git a/jdk/src/share/classes/java/util/stream/TerminalOp.java b/jdk/src/java.base/share/classes/java/util/stream/TerminalOp.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/TerminalOp.java
rename to jdk/src/java.base/share/classes/java/util/stream/TerminalOp.java
diff --git a/jdk/src/share/classes/java/util/stream/TerminalSink.java b/jdk/src/java.base/share/classes/java/util/stream/TerminalSink.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/TerminalSink.java
rename to jdk/src/java.base/share/classes/java/util/stream/TerminalSink.java
diff --git a/jdk/src/share/classes/java/util/stream/Tripwire.java b/jdk/src/java.base/share/classes/java/util/stream/Tripwire.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/Tripwire.java
rename to jdk/src/java.base/share/classes/java/util/stream/Tripwire.java
diff --git a/jdk/src/share/classes/java/util/stream/package-info.java b/jdk/src/java.base/share/classes/java/util/stream/package-info.java
similarity index 100%
rename from jdk/src/share/classes/java/util/stream/package-info.java
rename to jdk/src/java.base/share/classes/java/util/stream/package-info.java
diff --git a/jdk/src/share/classes/java/util/zip/Adler32.java b/jdk/src/java.base/share/classes/java/util/zip/Adler32.java
similarity index 100%
rename from jdk/src/share/classes/java/util/zip/Adler32.java
rename to jdk/src/java.base/share/classes/java/util/zip/Adler32.java
diff --git a/jdk/src/share/classes/java/util/zip/CRC32.java b/jdk/src/java.base/share/classes/java/util/zip/CRC32.java
similarity index 100%
rename from jdk/src/share/classes/java/util/zip/CRC32.java
rename to jdk/src/java.base/share/classes/java/util/zip/CRC32.java
diff --git a/jdk/src/share/classes/java/util/zip/CheckedInputStream.java b/jdk/src/java.base/share/classes/java/util/zip/CheckedInputStream.java
similarity index 100%
rename from jdk/src/share/classes/java/util/zip/CheckedInputStream.java
rename to jdk/src/java.base/share/classes/java/util/zip/CheckedInputStream.java
diff --git a/jdk/src/share/classes/java/util/zip/CheckedOutputStream.java b/jdk/src/java.base/share/classes/java/util/zip/CheckedOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/java/util/zip/CheckedOutputStream.java
rename to jdk/src/java.base/share/classes/java/util/zip/CheckedOutputStream.java
diff --git a/jdk/src/share/classes/java/util/zip/Checksum.java b/jdk/src/java.base/share/classes/java/util/zip/Checksum.java
similarity index 100%
rename from jdk/src/share/classes/java/util/zip/Checksum.java
rename to jdk/src/java.base/share/classes/java/util/zip/Checksum.java
diff --git a/jdk/src/share/classes/java/util/zip/DataFormatException.java b/jdk/src/java.base/share/classes/java/util/zip/DataFormatException.java
similarity index 100%
rename from jdk/src/share/classes/java/util/zip/DataFormatException.java
rename to jdk/src/java.base/share/classes/java/util/zip/DataFormatException.java
diff --git a/jdk/src/share/classes/java/util/zip/Deflater.java b/jdk/src/java.base/share/classes/java/util/zip/Deflater.java
similarity index 100%
rename from jdk/src/share/classes/java/util/zip/Deflater.java
rename to jdk/src/java.base/share/classes/java/util/zip/Deflater.java
diff --git a/jdk/src/share/classes/java/util/zip/DeflaterInputStream.java b/jdk/src/java.base/share/classes/java/util/zip/DeflaterInputStream.java
similarity index 100%
rename from jdk/src/share/classes/java/util/zip/DeflaterInputStream.java
rename to jdk/src/java.base/share/classes/java/util/zip/DeflaterInputStream.java
diff --git a/jdk/src/share/classes/java/util/zip/DeflaterOutputStream.java b/jdk/src/java.base/share/classes/java/util/zip/DeflaterOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/java/util/zip/DeflaterOutputStream.java
rename to jdk/src/java.base/share/classes/java/util/zip/DeflaterOutputStream.java
diff --git a/jdk/src/share/classes/java/util/zip/GZIPInputStream.java b/jdk/src/java.base/share/classes/java/util/zip/GZIPInputStream.java
similarity index 100%
rename from jdk/src/share/classes/java/util/zip/GZIPInputStream.java
rename to jdk/src/java.base/share/classes/java/util/zip/GZIPInputStream.java
diff --git a/jdk/src/share/classes/java/util/zip/GZIPOutputStream.java b/jdk/src/java.base/share/classes/java/util/zip/GZIPOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/java/util/zip/GZIPOutputStream.java
rename to jdk/src/java.base/share/classes/java/util/zip/GZIPOutputStream.java
diff --git a/jdk/src/share/classes/java/util/zip/Inflater.java b/jdk/src/java.base/share/classes/java/util/zip/Inflater.java
similarity index 100%
rename from jdk/src/share/classes/java/util/zip/Inflater.java
rename to jdk/src/java.base/share/classes/java/util/zip/Inflater.java
diff --git a/jdk/src/share/classes/java/util/zip/InflaterInputStream.java b/jdk/src/java.base/share/classes/java/util/zip/InflaterInputStream.java
similarity index 100%
rename from jdk/src/share/classes/java/util/zip/InflaterInputStream.java
rename to jdk/src/java.base/share/classes/java/util/zip/InflaterInputStream.java
diff --git a/jdk/src/share/classes/java/util/zip/InflaterOutputStream.java b/jdk/src/java.base/share/classes/java/util/zip/InflaterOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/java/util/zip/InflaterOutputStream.java
rename to jdk/src/java.base/share/classes/java/util/zip/InflaterOutputStream.java
diff --git a/jdk/src/share/classes/java/util/zip/ZStreamRef.java b/jdk/src/java.base/share/classes/java/util/zip/ZStreamRef.java
similarity index 100%
rename from jdk/src/share/classes/java/util/zip/ZStreamRef.java
rename to jdk/src/java.base/share/classes/java/util/zip/ZStreamRef.java
diff --git a/jdk/src/share/classes/java/util/zip/ZipCoder.java b/jdk/src/java.base/share/classes/java/util/zip/ZipCoder.java
similarity index 100%
rename from jdk/src/share/classes/java/util/zip/ZipCoder.java
rename to jdk/src/java.base/share/classes/java/util/zip/ZipCoder.java
diff --git a/jdk/src/share/classes/java/util/zip/ZipConstants.java b/jdk/src/java.base/share/classes/java/util/zip/ZipConstants.java
similarity index 100%
rename from jdk/src/share/classes/java/util/zip/ZipConstants.java
rename to jdk/src/java.base/share/classes/java/util/zip/ZipConstants.java
diff --git a/jdk/src/share/classes/java/util/zip/ZipConstants64.java b/jdk/src/java.base/share/classes/java/util/zip/ZipConstants64.java
similarity index 100%
rename from jdk/src/share/classes/java/util/zip/ZipConstants64.java
rename to jdk/src/java.base/share/classes/java/util/zip/ZipConstants64.java
diff --git a/jdk/src/share/classes/java/util/zip/ZipEntry.java b/jdk/src/java.base/share/classes/java/util/zip/ZipEntry.java
similarity index 100%
rename from jdk/src/share/classes/java/util/zip/ZipEntry.java
rename to jdk/src/java.base/share/classes/java/util/zip/ZipEntry.java
diff --git a/jdk/src/share/classes/java/util/zip/ZipError.java b/jdk/src/java.base/share/classes/java/util/zip/ZipError.java
similarity index 100%
rename from jdk/src/share/classes/java/util/zip/ZipError.java
rename to jdk/src/java.base/share/classes/java/util/zip/ZipError.java
diff --git a/jdk/src/share/classes/java/util/zip/ZipException.java b/jdk/src/java.base/share/classes/java/util/zip/ZipException.java
similarity index 100%
rename from jdk/src/share/classes/java/util/zip/ZipException.java
rename to jdk/src/java.base/share/classes/java/util/zip/ZipException.java
diff --git a/jdk/src/share/classes/java/util/zip/ZipFile.java b/jdk/src/java.base/share/classes/java/util/zip/ZipFile.java
similarity index 100%
rename from jdk/src/share/classes/java/util/zip/ZipFile.java
rename to jdk/src/java.base/share/classes/java/util/zip/ZipFile.java
diff --git a/jdk/src/share/classes/java/util/zip/ZipInputStream.java b/jdk/src/java.base/share/classes/java/util/zip/ZipInputStream.java
similarity index 100%
rename from jdk/src/share/classes/java/util/zip/ZipInputStream.java
rename to jdk/src/java.base/share/classes/java/util/zip/ZipInputStream.java
diff --git a/jdk/src/share/classes/java/util/zip/ZipOutputStream.java b/jdk/src/java.base/share/classes/java/util/zip/ZipOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/java/util/zip/ZipOutputStream.java
rename to jdk/src/java.base/share/classes/java/util/zip/ZipOutputStream.java
diff --git a/jdk/src/share/classes/java/util/zip/ZipUtils.java b/jdk/src/java.base/share/classes/java/util/zip/ZipUtils.java
similarity index 100%
rename from jdk/src/share/classes/java/util/zip/ZipUtils.java
rename to jdk/src/java.base/share/classes/java/util/zip/ZipUtils.java
diff --git a/jdk/src/share/classes/java/util/zip/package.html b/jdk/src/java.base/share/classes/java/util/zip/package.html
similarity index 100%
rename from jdk/src/share/classes/java/util/zip/package.html
rename to jdk/src/java.base/share/classes/java/util/zip/package.html
diff --git a/jdk/src/share/classes/javax/crypto/AEADBadTagException.java b/jdk/src/java.base/share/classes/javax/crypto/AEADBadTagException.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/AEADBadTagException.java
rename to jdk/src/java.base/share/classes/javax/crypto/AEADBadTagException.java
diff --git a/jdk/src/share/classes/javax/crypto/BadPaddingException.java b/jdk/src/java.base/share/classes/javax/crypto/BadPaddingException.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/BadPaddingException.java
rename to jdk/src/java.base/share/classes/javax/crypto/BadPaddingException.java
diff --git a/jdk/src/share/classes/javax/crypto/Cipher.java b/jdk/src/java.base/share/classes/javax/crypto/Cipher.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/Cipher.java
rename to jdk/src/java.base/share/classes/javax/crypto/Cipher.java
diff --git a/jdk/src/share/classes/javax/crypto/CipherInputStream.java b/jdk/src/java.base/share/classes/javax/crypto/CipherInputStream.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/CipherInputStream.java
rename to jdk/src/java.base/share/classes/javax/crypto/CipherInputStream.java
diff --git a/jdk/src/share/classes/javax/crypto/CipherOutputStream.java b/jdk/src/java.base/share/classes/javax/crypto/CipherOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/CipherOutputStream.java
rename to jdk/src/java.base/share/classes/javax/crypto/CipherOutputStream.java
diff --git a/jdk/src/share/classes/javax/crypto/CipherSpi.java b/jdk/src/java.base/share/classes/javax/crypto/CipherSpi.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/CipherSpi.java
rename to jdk/src/java.base/share/classes/javax/crypto/CipherSpi.java
diff --git a/jdk/src/share/classes/javax/crypto/CryptoAllPermission.java b/jdk/src/java.base/share/classes/javax/crypto/CryptoAllPermission.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/CryptoAllPermission.java
rename to jdk/src/java.base/share/classes/javax/crypto/CryptoAllPermission.java
diff --git a/jdk/src/share/classes/javax/crypto/CryptoPermission.java b/jdk/src/java.base/share/classes/javax/crypto/CryptoPermission.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/CryptoPermission.java
rename to jdk/src/java.base/share/classes/javax/crypto/CryptoPermission.java
diff --git a/jdk/src/share/classes/javax/crypto/CryptoPermissions.java b/jdk/src/java.base/share/classes/javax/crypto/CryptoPermissions.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/CryptoPermissions.java
rename to jdk/src/java.base/share/classes/javax/crypto/CryptoPermissions.java
diff --git a/jdk/src/share/classes/javax/crypto/CryptoPolicyParser.java b/jdk/src/java.base/share/classes/javax/crypto/CryptoPolicyParser.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/CryptoPolicyParser.java
rename to jdk/src/java.base/share/classes/javax/crypto/CryptoPolicyParser.java
diff --git a/jdk/src/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java b/jdk/src/java.base/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java
rename to jdk/src/java.base/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java
diff --git a/jdk/src/share/classes/javax/crypto/ExemptionMechanism.java b/jdk/src/java.base/share/classes/javax/crypto/ExemptionMechanism.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/ExemptionMechanism.java
rename to jdk/src/java.base/share/classes/javax/crypto/ExemptionMechanism.java
diff --git a/jdk/src/share/classes/javax/crypto/ExemptionMechanismException.java b/jdk/src/java.base/share/classes/javax/crypto/ExemptionMechanismException.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/ExemptionMechanismException.java
rename to jdk/src/java.base/share/classes/javax/crypto/ExemptionMechanismException.java
diff --git a/jdk/src/share/classes/javax/crypto/ExemptionMechanismSpi.java b/jdk/src/java.base/share/classes/javax/crypto/ExemptionMechanismSpi.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/ExemptionMechanismSpi.java
rename to jdk/src/java.base/share/classes/javax/crypto/ExemptionMechanismSpi.java
diff --git a/jdk/src/share/classes/javax/crypto/IllegalBlockSizeException.java b/jdk/src/java.base/share/classes/javax/crypto/IllegalBlockSizeException.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/IllegalBlockSizeException.java
rename to jdk/src/java.base/share/classes/javax/crypto/IllegalBlockSizeException.java
diff --git a/jdk/src/share/classes/javax/crypto/JarVerifier.java b/jdk/src/java.base/share/classes/javax/crypto/JarVerifier.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/JarVerifier.java
rename to jdk/src/java.base/share/classes/javax/crypto/JarVerifier.java
diff --git a/jdk/src/share/classes/javax/crypto/JceSecurity.java b/jdk/src/java.base/share/classes/javax/crypto/JceSecurity.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/JceSecurity.java
rename to jdk/src/java.base/share/classes/javax/crypto/JceSecurity.java
diff --git a/jdk/src/share/classes/javax/crypto/JceSecurityManager.java b/jdk/src/java.base/share/classes/javax/crypto/JceSecurityManager.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/JceSecurityManager.java
rename to jdk/src/java.base/share/classes/javax/crypto/JceSecurityManager.java
diff --git a/jdk/src/share/classes/javax/crypto/KeyAgreement.java b/jdk/src/java.base/share/classes/javax/crypto/KeyAgreement.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/KeyAgreement.java
rename to jdk/src/java.base/share/classes/javax/crypto/KeyAgreement.java
diff --git a/jdk/src/share/classes/javax/crypto/KeyAgreementSpi.java b/jdk/src/java.base/share/classes/javax/crypto/KeyAgreementSpi.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/KeyAgreementSpi.java
rename to jdk/src/java.base/share/classes/javax/crypto/KeyAgreementSpi.java
diff --git a/jdk/src/share/classes/javax/crypto/KeyGenerator.java b/jdk/src/java.base/share/classes/javax/crypto/KeyGenerator.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/KeyGenerator.java
rename to jdk/src/java.base/share/classes/javax/crypto/KeyGenerator.java
diff --git a/jdk/src/share/classes/javax/crypto/KeyGeneratorSpi.java b/jdk/src/java.base/share/classes/javax/crypto/KeyGeneratorSpi.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/KeyGeneratorSpi.java
rename to jdk/src/java.base/share/classes/javax/crypto/KeyGeneratorSpi.java
diff --git a/jdk/src/share/classes/javax/crypto/Mac.java b/jdk/src/java.base/share/classes/javax/crypto/Mac.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/Mac.java
rename to jdk/src/java.base/share/classes/javax/crypto/Mac.java
diff --git a/jdk/src/share/classes/javax/crypto/MacSpi.java b/jdk/src/java.base/share/classes/javax/crypto/MacSpi.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/MacSpi.java
rename to jdk/src/java.base/share/classes/javax/crypto/MacSpi.java
diff --git a/jdk/src/share/classes/javax/crypto/NoSuchPaddingException.java b/jdk/src/java.base/share/classes/javax/crypto/NoSuchPaddingException.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/NoSuchPaddingException.java
rename to jdk/src/java.base/share/classes/javax/crypto/NoSuchPaddingException.java
diff --git a/jdk/src/share/classes/javax/crypto/NullCipher.java b/jdk/src/java.base/share/classes/javax/crypto/NullCipher.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/NullCipher.java
rename to jdk/src/java.base/share/classes/javax/crypto/NullCipher.java
diff --git a/jdk/src/share/classes/javax/crypto/NullCipherSpi.java b/jdk/src/java.base/share/classes/javax/crypto/NullCipherSpi.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/NullCipherSpi.java
rename to jdk/src/java.base/share/classes/javax/crypto/NullCipherSpi.java
diff --git a/jdk/src/share/classes/javax/crypto/SealedObject.java b/jdk/src/java.base/share/classes/javax/crypto/SealedObject.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/SealedObject.java
rename to jdk/src/java.base/share/classes/javax/crypto/SealedObject.java
diff --git a/jdk/src/share/classes/javax/crypto/SecretKey.java b/jdk/src/java.base/share/classes/javax/crypto/SecretKey.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/SecretKey.java
rename to jdk/src/java.base/share/classes/javax/crypto/SecretKey.java
diff --git a/jdk/src/share/classes/javax/crypto/SecretKeyFactory.java b/jdk/src/java.base/share/classes/javax/crypto/SecretKeyFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/SecretKeyFactory.java
rename to jdk/src/java.base/share/classes/javax/crypto/SecretKeyFactory.java
diff --git a/jdk/src/share/classes/javax/crypto/SecretKeyFactorySpi.java b/jdk/src/java.base/share/classes/javax/crypto/SecretKeyFactorySpi.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/SecretKeyFactorySpi.java
rename to jdk/src/java.base/share/classes/javax/crypto/SecretKeyFactorySpi.java
diff --git a/jdk/src/share/classes/javax/crypto/ShortBufferException.java b/jdk/src/java.base/share/classes/javax/crypto/ShortBufferException.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/ShortBufferException.java
rename to jdk/src/java.base/share/classes/javax/crypto/ShortBufferException.java
diff --git a/jdk/src/share/classes/javax/crypto/interfaces/DHKey.java b/jdk/src/java.base/share/classes/javax/crypto/interfaces/DHKey.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/interfaces/DHKey.java
rename to jdk/src/java.base/share/classes/javax/crypto/interfaces/DHKey.java
diff --git a/jdk/src/share/classes/javax/crypto/interfaces/DHPrivateKey.java b/jdk/src/java.base/share/classes/javax/crypto/interfaces/DHPrivateKey.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/interfaces/DHPrivateKey.java
rename to jdk/src/java.base/share/classes/javax/crypto/interfaces/DHPrivateKey.java
diff --git a/jdk/src/share/classes/javax/crypto/interfaces/DHPublicKey.java b/jdk/src/java.base/share/classes/javax/crypto/interfaces/DHPublicKey.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/interfaces/DHPublicKey.java
rename to jdk/src/java.base/share/classes/javax/crypto/interfaces/DHPublicKey.java
diff --git a/jdk/src/share/classes/javax/crypto/interfaces/PBEKey.java b/jdk/src/java.base/share/classes/javax/crypto/interfaces/PBEKey.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/interfaces/PBEKey.java
rename to jdk/src/java.base/share/classes/javax/crypto/interfaces/PBEKey.java
diff --git a/jdk/src/share/classes/javax/crypto/interfaces/package.html b/jdk/src/java.base/share/classes/javax/crypto/interfaces/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/interfaces/package.html
rename to jdk/src/java.base/share/classes/javax/crypto/interfaces/package.html
diff --git a/jdk/src/share/classes/javax/crypto/package.html b/jdk/src/java.base/share/classes/javax/crypto/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/package.html
rename to jdk/src/java.base/share/classes/javax/crypto/package.html
diff --git a/jdk/src/share/classes/javax/crypto/spec/DESKeySpec.java b/jdk/src/java.base/share/classes/javax/crypto/spec/DESKeySpec.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/spec/DESKeySpec.java
rename to jdk/src/java.base/share/classes/javax/crypto/spec/DESKeySpec.java
diff --git a/jdk/src/share/classes/javax/crypto/spec/DESedeKeySpec.java b/jdk/src/java.base/share/classes/javax/crypto/spec/DESedeKeySpec.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/spec/DESedeKeySpec.java
rename to jdk/src/java.base/share/classes/javax/crypto/spec/DESedeKeySpec.java
diff --git a/jdk/src/share/classes/javax/crypto/spec/DHGenParameterSpec.java b/jdk/src/java.base/share/classes/javax/crypto/spec/DHGenParameterSpec.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/spec/DHGenParameterSpec.java
rename to jdk/src/java.base/share/classes/javax/crypto/spec/DHGenParameterSpec.java
diff --git a/jdk/src/share/classes/javax/crypto/spec/DHParameterSpec.java b/jdk/src/java.base/share/classes/javax/crypto/spec/DHParameterSpec.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/spec/DHParameterSpec.java
rename to jdk/src/java.base/share/classes/javax/crypto/spec/DHParameterSpec.java
diff --git a/jdk/src/share/classes/javax/crypto/spec/DHPrivateKeySpec.java b/jdk/src/java.base/share/classes/javax/crypto/spec/DHPrivateKeySpec.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/spec/DHPrivateKeySpec.java
rename to jdk/src/java.base/share/classes/javax/crypto/spec/DHPrivateKeySpec.java
diff --git a/jdk/src/share/classes/javax/crypto/spec/DHPublicKeySpec.java b/jdk/src/java.base/share/classes/javax/crypto/spec/DHPublicKeySpec.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/spec/DHPublicKeySpec.java
rename to jdk/src/java.base/share/classes/javax/crypto/spec/DHPublicKeySpec.java
diff --git a/jdk/src/share/classes/javax/crypto/spec/GCMParameterSpec.java b/jdk/src/java.base/share/classes/javax/crypto/spec/GCMParameterSpec.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/spec/GCMParameterSpec.java
rename to jdk/src/java.base/share/classes/javax/crypto/spec/GCMParameterSpec.java
diff --git a/jdk/src/share/classes/javax/crypto/spec/IvParameterSpec.java b/jdk/src/java.base/share/classes/javax/crypto/spec/IvParameterSpec.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/spec/IvParameterSpec.java
rename to jdk/src/java.base/share/classes/javax/crypto/spec/IvParameterSpec.java
diff --git a/jdk/src/share/classes/javax/crypto/spec/OAEPParameterSpec.java b/jdk/src/java.base/share/classes/javax/crypto/spec/OAEPParameterSpec.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/spec/OAEPParameterSpec.java
rename to jdk/src/java.base/share/classes/javax/crypto/spec/OAEPParameterSpec.java
diff --git a/jdk/src/share/classes/javax/crypto/spec/PBEKeySpec.java b/jdk/src/java.base/share/classes/javax/crypto/spec/PBEKeySpec.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/spec/PBEKeySpec.java
rename to jdk/src/java.base/share/classes/javax/crypto/spec/PBEKeySpec.java
diff --git a/jdk/src/share/classes/javax/crypto/spec/PBEParameterSpec.java b/jdk/src/java.base/share/classes/javax/crypto/spec/PBEParameterSpec.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/spec/PBEParameterSpec.java
rename to jdk/src/java.base/share/classes/javax/crypto/spec/PBEParameterSpec.java
diff --git a/jdk/src/share/classes/javax/crypto/spec/PSource.java b/jdk/src/java.base/share/classes/javax/crypto/spec/PSource.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/spec/PSource.java
rename to jdk/src/java.base/share/classes/javax/crypto/spec/PSource.java
diff --git a/jdk/src/share/classes/javax/crypto/spec/RC2ParameterSpec.java b/jdk/src/java.base/share/classes/javax/crypto/spec/RC2ParameterSpec.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/spec/RC2ParameterSpec.java
rename to jdk/src/java.base/share/classes/javax/crypto/spec/RC2ParameterSpec.java
diff --git a/jdk/src/share/classes/javax/crypto/spec/RC5ParameterSpec.java b/jdk/src/java.base/share/classes/javax/crypto/spec/RC5ParameterSpec.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/spec/RC5ParameterSpec.java
rename to jdk/src/java.base/share/classes/javax/crypto/spec/RC5ParameterSpec.java
diff --git a/jdk/src/share/classes/javax/crypto/spec/SecretKeySpec.java b/jdk/src/java.base/share/classes/javax/crypto/spec/SecretKeySpec.java
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/spec/SecretKeySpec.java
rename to jdk/src/java.base/share/classes/javax/crypto/spec/SecretKeySpec.java
diff --git a/jdk/src/share/classes/javax/crypto/spec/package.html b/jdk/src/java.base/share/classes/javax/crypto/spec/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/crypto/spec/package.html
rename to jdk/src/java.base/share/classes/javax/crypto/spec/package.html
diff --git a/jdk/src/share/classes/javax/net/ServerSocketFactory.java b/jdk/src/java.base/share/classes/javax/net/ServerSocketFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ServerSocketFactory.java
rename to jdk/src/java.base/share/classes/javax/net/ServerSocketFactory.java
diff --git a/jdk/src/share/classes/javax/net/SocketFactory.java b/jdk/src/java.base/share/classes/javax/net/SocketFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/SocketFactory.java
rename to jdk/src/java.base/share/classes/javax/net/SocketFactory.java
diff --git a/jdk/src/share/classes/javax/net/package.html b/jdk/src/java.base/share/classes/javax/net/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/net/package.html
rename to jdk/src/java.base/share/classes/javax/net/package.html
diff --git a/jdk/src/share/classes/javax/net/ssl/CertPathTrustManagerParameters.java b/jdk/src/java.base/share/classes/javax/net/ssl/CertPathTrustManagerParameters.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/CertPathTrustManagerParameters.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/CertPathTrustManagerParameters.java
diff --git a/jdk/src/share/classes/javax/net/ssl/ExtendedSSLSession.java b/jdk/src/java.base/share/classes/javax/net/ssl/ExtendedSSLSession.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/ExtendedSSLSession.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/ExtendedSSLSession.java
diff --git a/jdk/src/share/classes/javax/net/ssl/HandshakeCompletedEvent.java b/jdk/src/java.base/share/classes/javax/net/ssl/HandshakeCompletedEvent.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/HandshakeCompletedEvent.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/HandshakeCompletedEvent.java
diff --git a/jdk/src/share/classes/javax/net/ssl/HandshakeCompletedListener.java b/jdk/src/java.base/share/classes/javax/net/ssl/HandshakeCompletedListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/HandshakeCompletedListener.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/HandshakeCompletedListener.java
diff --git a/jdk/src/share/classes/javax/net/ssl/HostnameVerifier.java b/jdk/src/java.base/share/classes/javax/net/ssl/HostnameVerifier.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/HostnameVerifier.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/HostnameVerifier.java
diff --git a/jdk/src/share/classes/javax/net/ssl/HttpsURLConnection.java b/jdk/src/java.base/share/classes/javax/net/ssl/HttpsURLConnection.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/HttpsURLConnection.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/HttpsURLConnection.java
diff --git a/jdk/src/share/classes/javax/net/ssl/KeyManager.java b/jdk/src/java.base/share/classes/javax/net/ssl/KeyManager.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/KeyManager.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/KeyManager.java
diff --git a/jdk/src/share/classes/javax/net/ssl/KeyManagerFactory.java b/jdk/src/java.base/share/classes/javax/net/ssl/KeyManagerFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/KeyManagerFactory.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/KeyManagerFactory.java
diff --git a/jdk/src/share/classes/javax/net/ssl/KeyManagerFactorySpi.java b/jdk/src/java.base/share/classes/javax/net/ssl/KeyManagerFactorySpi.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/KeyManagerFactorySpi.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/KeyManagerFactorySpi.java
diff --git a/jdk/src/share/classes/javax/net/ssl/KeyStoreBuilderParameters.java b/jdk/src/java.base/share/classes/javax/net/ssl/KeyStoreBuilderParameters.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/KeyStoreBuilderParameters.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/KeyStoreBuilderParameters.java
diff --git a/jdk/src/share/classes/javax/net/ssl/ManagerFactoryParameters.java b/jdk/src/java.base/share/classes/javax/net/ssl/ManagerFactoryParameters.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/ManagerFactoryParameters.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/ManagerFactoryParameters.java
diff --git a/jdk/src/share/classes/javax/net/ssl/SNIHostName.java b/jdk/src/java.base/share/classes/javax/net/ssl/SNIHostName.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/SNIHostName.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/SNIHostName.java
diff --git a/jdk/src/share/classes/javax/net/ssl/SNIMatcher.java b/jdk/src/java.base/share/classes/javax/net/ssl/SNIMatcher.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/SNIMatcher.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/SNIMatcher.java
diff --git a/jdk/src/share/classes/javax/net/ssl/SNIServerName.java b/jdk/src/java.base/share/classes/javax/net/ssl/SNIServerName.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/SNIServerName.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/SNIServerName.java
diff --git a/jdk/src/share/classes/javax/net/ssl/SSLContext.java b/jdk/src/java.base/share/classes/javax/net/ssl/SSLContext.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/SSLContext.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/SSLContext.java
diff --git a/jdk/src/share/classes/javax/net/ssl/SSLContextSpi.java b/jdk/src/java.base/share/classes/javax/net/ssl/SSLContextSpi.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/SSLContextSpi.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/SSLContextSpi.java
diff --git a/jdk/src/share/classes/javax/net/ssl/SSLEngine.java b/jdk/src/java.base/share/classes/javax/net/ssl/SSLEngine.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/SSLEngine.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/SSLEngine.java
diff --git a/jdk/src/share/classes/javax/net/ssl/SSLEngineResult.java b/jdk/src/java.base/share/classes/javax/net/ssl/SSLEngineResult.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/SSLEngineResult.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/SSLEngineResult.java
diff --git a/jdk/src/share/classes/javax/net/ssl/SSLException.java b/jdk/src/java.base/share/classes/javax/net/ssl/SSLException.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/SSLException.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/SSLException.java
diff --git a/jdk/src/share/classes/javax/net/ssl/SSLHandshakeException.java b/jdk/src/java.base/share/classes/javax/net/ssl/SSLHandshakeException.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/SSLHandshakeException.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/SSLHandshakeException.java
diff --git a/jdk/src/share/classes/javax/net/ssl/SSLKeyException.java b/jdk/src/java.base/share/classes/javax/net/ssl/SSLKeyException.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/SSLKeyException.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/SSLKeyException.java
diff --git a/jdk/src/share/classes/javax/net/ssl/SSLParameters.java b/jdk/src/java.base/share/classes/javax/net/ssl/SSLParameters.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/SSLParameters.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/SSLParameters.java
diff --git a/jdk/src/share/classes/javax/net/ssl/SSLPeerUnverifiedException.java b/jdk/src/java.base/share/classes/javax/net/ssl/SSLPeerUnverifiedException.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/SSLPeerUnverifiedException.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/SSLPeerUnverifiedException.java
diff --git a/jdk/src/share/classes/javax/net/ssl/SSLPermission.java b/jdk/src/java.base/share/classes/javax/net/ssl/SSLPermission.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/SSLPermission.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/SSLPermission.java
diff --git a/jdk/src/share/classes/javax/net/ssl/SSLProtocolException.java b/jdk/src/java.base/share/classes/javax/net/ssl/SSLProtocolException.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/SSLProtocolException.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/SSLProtocolException.java
diff --git a/jdk/src/share/classes/javax/net/ssl/SSLServerSocket.java b/jdk/src/java.base/share/classes/javax/net/ssl/SSLServerSocket.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/SSLServerSocket.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/SSLServerSocket.java
diff --git a/jdk/src/share/classes/javax/net/ssl/SSLServerSocketFactory.java b/jdk/src/java.base/share/classes/javax/net/ssl/SSLServerSocketFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/SSLServerSocketFactory.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/SSLServerSocketFactory.java
diff --git a/jdk/src/share/classes/javax/net/ssl/SSLSession.java b/jdk/src/java.base/share/classes/javax/net/ssl/SSLSession.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/SSLSession.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/SSLSession.java
diff --git a/jdk/src/share/classes/javax/net/ssl/SSLSessionBindingEvent.java b/jdk/src/java.base/share/classes/javax/net/ssl/SSLSessionBindingEvent.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/SSLSessionBindingEvent.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/SSLSessionBindingEvent.java
diff --git a/jdk/src/share/classes/javax/net/ssl/SSLSessionBindingListener.java b/jdk/src/java.base/share/classes/javax/net/ssl/SSLSessionBindingListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/SSLSessionBindingListener.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/SSLSessionBindingListener.java
diff --git a/jdk/src/share/classes/javax/net/ssl/SSLSessionContext.java b/jdk/src/java.base/share/classes/javax/net/ssl/SSLSessionContext.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/SSLSessionContext.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/SSLSessionContext.java
diff --git a/jdk/src/share/classes/javax/net/ssl/SSLSocket.java b/jdk/src/java.base/share/classes/javax/net/ssl/SSLSocket.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/SSLSocket.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/SSLSocket.java
diff --git a/jdk/src/share/classes/javax/net/ssl/SSLSocketFactory.java b/jdk/src/java.base/share/classes/javax/net/ssl/SSLSocketFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/SSLSocketFactory.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/SSLSocketFactory.java
diff --git a/jdk/src/share/classes/javax/net/ssl/StandardConstants.java b/jdk/src/java.base/share/classes/javax/net/ssl/StandardConstants.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/StandardConstants.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/StandardConstants.java
diff --git a/jdk/src/share/classes/javax/net/ssl/TrustManager.java b/jdk/src/java.base/share/classes/javax/net/ssl/TrustManager.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/TrustManager.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/TrustManager.java
diff --git a/jdk/src/share/classes/javax/net/ssl/TrustManagerFactory.java b/jdk/src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/TrustManagerFactory.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java
diff --git a/jdk/src/share/classes/javax/net/ssl/TrustManagerFactorySpi.java b/jdk/src/java.base/share/classes/javax/net/ssl/TrustManagerFactorySpi.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/TrustManagerFactorySpi.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/TrustManagerFactorySpi.java
diff --git a/jdk/src/share/classes/javax/net/ssl/X509ExtendedKeyManager.java b/jdk/src/java.base/share/classes/javax/net/ssl/X509ExtendedKeyManager.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/X509ExtendedKeyManager.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/X509ExtendedKeyManager.java
diff --git a/jdk/src/share/classes/javax/net/ssl/X509ExtendedTrustManager.java b/jdk/src/java.base/share/classes/javax/net/ssl/X509ExtendedTrustManager.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/X509ExtendedTrustManager.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/X509ExtendedTrustManager.java
diff --git a/jdk/src/share/classes/javax/net/ssl/X509KeyManager.java b/jdk/src/java.base/share/classes/javax/net/ssl/X509KeyManager.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/X509KeyManager.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/X509KeyManager.java
diff --git a/jdk/src/share/classes/javax/net/ssl/X509TrustManager.java b/jdk/src/java.base/share/classes/javax/net/ssl/X509TrustManager.java
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/X509TrustManager.java
rename to jdk/src/java.base/share/classes/javax/net/ssl/X509TrustManager.java
diff --git a/jdk/src/share/classes/javax/net/ssl/package.html b/jdk/src/java.base/share/classes/javax/net/ssl/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/net/ssl/package.html
rename to jdk/src/java.base/share/classes/javax/net/ssl/package.html
diff --git a/jdk/src/share/classes/javax/security/auth/AuthPermission.java b/jdk/src/java.base/share/classes/javax/security/auth/AuthPermission.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/AuthPermission.java
rename to jdk/src/java.base/share/classes/javax/security/auth/AuthPermission.java
diff --git a/jdk/src/share/classes/javax/security/auth/DestroyFailedException.java b/jdk/src/java.base/share/classes/javax/security/auth/DestroyFailedException.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/DestroyFailedException.java
rename to jdk/src/java.base/share/classes/javax/security/auth/DestroyFailedException.java
diff --git a/jdk/src/share/classes/javax/security/auth/Destroyable.java b/jdk/src/java.base/share/classes/javax/security/auth/Destroyable.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/Destroyable.java
rename to jdk/src/java.base/share/classes/javax/security/auth/Destroyable.java
diff --git a/jdk/src/share/classes/javax/security/auth/Policy.java b/jdk/src/java.base/share/classes/javax/security/auth/Policy.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/Policy.java
rename to jdk/src/java.base/share/classes/javax/security/auth/Policy.java
diff --git a/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java b/jdk/src/java.base/share/classes/javax/security/auth/PrivateCredentialPermission.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java
rename to jdk/src/java.base/share/classes/javax/security/auth/PrivateCredentialPermission.java
diff --git a/jdk/src/share/classes/javax/security/auth/RefreshFailedException.java b/jdk/src/java.base/share/classes/javax/security/auth/RefreshFailedException.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/RefreshFailedException.java
rename to jdk/src/java.base/share/classes/javax/security/auth/RefreshFailedException.java
diff --git a/jdk/src/share/classes/javax/security/auth/Refreshable.java b/jdk/src/java.base/share/classes/javax/security/auth/Refreshable.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/Refreshable.java
rename to jdk/src/java.base/share/classes/javax/security/auth/Refreshable.java
diff --git a/jdk/src/share/classes/javax/security/auth/Subject.java b/jdk/src/java.base/share/classes/javax/security/auth/Subject.java
similarity index 91%
rename from jdk/src/share/classes/javax/security/auth/Subject.java
rename to jdk/src/java.base/share/classes/javax/security/auth/Subject.java
index e8ce12c9eee..0eee83c6083 100644
--- a/jdk/src/share/classes/javax/security/auth/Subject.java
+++ b/jdk/src/java.base/share/classes/javax/security/auth/Subject.java
@@ -182,21 +182,20 @@ public final class Subject implements java.io.Serializable {
      * {@code AuthPermission("modifyPublicCredentials")}.
      * To modify the private credential Set, the caller must have
      * {@code AuthPermission("modifyPrivateCredentials")}.
-     * 

      *
      * @param readOnly true if the {@code Subject} is to be read-only,
-     *          and false otherwise. 

+     *          and false otherwise.
      *
      * @param principals the {@code Set} of Principals
-     *          to be associated with this {@code Subject}. 

+     *          to be associated with this {@code Subject}.
      *
      * @param pubCredentials the {@code Set} of public credentials
-     *          to be associated with this {@code Subject}. 

+     *          to be associated with this {@code Subject}.
      *
      * @param privCredentials the {@code Set} of private credentials
      *          to be associated with this {@code Subject}.
      *
-     * @exception NullPointerException if the specified
+     * @throws NullPointerException if the specified
      *          {@code principals}, {@code pubCredentials},
      *          or {@code privCredentials} are {@code null},
      *          or a null value exists within any of these three
@@ -233,10 +232,11 @@ public final class Subject implements java.io.Serializable {
      * Also, once a {@code Subject} is read-only,
      * it can not be reset to being writable again.
      *
-     * 

-     *
-     * @exception SecurityException if the caller does not have permission
-     *          to set this {@code Subject} to be read-only.
+     * @throws SecurityException if a security manager is installed and the
+     *         caller does not have an
+     *         {@link AuthPermission#AuthPermission(String)
+     *         AuthPermission("setReadOnly")} permission to set this
+     *         {@code Subject} to be read-only.
      */
     public void setReadOnly() {
         java.lang.SecurityManager sm = System.getSecurityManager();
@@ -250,8 +250,6 @@ public final class Subject implements java.io.Serializable {
     /**
      * Query whether this {@code Subject} is read-only.
      *
-     * 

-     *
      * @return true if this {@code Subject} is read-only, false otherwise.
      */
     public boolean isReadOnly() {
@@ -267,8 +265,6 @@ public final class Subject implements java.io.Serializable {
      * In this situation, the most recent {@code Subject} associated
      * with the {@code AccessControlContext} is returned.
      *
-     * 

-     *
      * @param  acc the {@code AccessControlContext} from which to retrieve
      *          the {@code Subject}.
      *
@@ -277,10 +273,13 @@ public final class Subject implements java.io.Serializable {
      *          if no {@code Subject} is associated
      *          with the provided {@code AccessControlContext}.
      *
-     * @exception SecurityException if the caller does not have permission
-     *          to get the {@code Subject}. 

+     * @throws SecurityException if a security manager is installed and the
+     *          caller does not have an
+     *          {@link AuthPermission#AuthPermission(String)
+     *          AuthPermission("getSubject")} permission to get the
+     *          {@code Subject}.
      *
-     * @exception NullPointerException if the provided
+     * @throws NullPointerException if the provided
      *          {@code AccessControlContext} is {@code null}.
      */
     public static Subject getSubject(final AccessControlContext acc) {
@@ -321,26 +320,27 @@ public final class Subject implements java.io.Serializable {
      * passing it the provided {@code PrivilegedAction},
      * as well as the newly constructed {@code AccessControlContext}.
      *
-     * 

-     *
      * @param subject the {@code Subject} that the specified
      *                  {@code action} will run as.  This parameter
-     *                  may be {@code null}. 

+     *                  may be {@code null}.
      *
      * @param  the type of the value returned by the PrivilegedAction's
      *                  {@code run} method.
      *
      * @param action the code to be run as the specified
-     *                  {@code Subject}. 

+     *                  {@code Subject}.
      *
      * @return the value returned by the PrivilegedAction's
      *                  {@code run} method.
      *
-     * @exception NullPointerException if the {@code PrivilegedAction}
-     *                  is {@code null}. 

+     * @throws NullPointerException if the {@code PrivilegedAction}
+     *                  is {@code null}.
      *
-     * @exception SecurityException if the caller does not have permission
-     *                  to invoke this method.
+     * @throws SecurityException if a security manager is installed and the
+     *                  caller does not have an
+     *                  {@link AuthPermission#AuthPermission(String)
+     *                  AuthPermission("doAs")} permission to invoke this
+     *                  method.
      */
     public static  T doAs(final Subject subject,
                         final java.security.PrivilegedAction action) {
@@ -377,31 +377,32 @@ public final class Subject implements java.io.Serializable {
      * passing it the provided {@code PrivilegedExceptionAction},
      * as well as the newly constructed {@code AccessControlContext}.
      *
-     * 

-     *
      * @param subject the {@code Subject} that the specified
      *                  {@code action} will run as.  This parameter
-     *                  may be {@code null}. 

+     *                  may be {@code null}.
      *
      * @param  the type of the value returned by the
      *                  PrivilegedExceptionAction's {@code run} method.
      *
      * @param action the code to be run as the specified
-     *                  {@code Subject}. 

+     *                  {@code Subject}.
      *
      * @return the value returned by the
      *                  PrivilegedExceptionAction's {@code run} method.
      *
-     * @exception PrivilegedActionException if the
+     * @throws PrivilegedActionException if the
      *                  {@code PrivilegedExceptionAction.run}
-     *                  method throws a checked exception. 

+     *                  method throws a checked exception.
      *
-     * @exception NullPointerException if the specified
+     * @throws NullPointerException if the specified
      *                  {@code PrivilegedExceptionAction} is
-     *                  {@code null}. 

+     *                  {@code null}.
      *
-     * @exception SecurityException if the caller does not have permission
-     *                  to invoke this method.
+     * @throws SecurityException if a security manager is installed and the
+     *                  caller does not have an
+     *                  {@link AuthPermission#AuthPermission(String)
+     *                  AuthPermission("doAs")} permission to invoke this
+     *                  method.
      */
     public static  T doAs(final Subject subject,
                         final java.security.PrivilegedExceptionAction action)
@@ -435,29 +436,30 @@ public final class Subject implements java.io.Serializable {
      * this method instantiates a new {@code AccessControlContext}
      * with an empty collection of ProtectionDomains.
      *
-     * 

-     *
      * @param subject the {@code Subject} that the specified
      *                  {@code action} will run as.  This parameter
-     *                  may be {@code null}. 

+     *                  may be {@code null}.
      *
      * @param  the type of the value returned by the PrivilegedAction's
      *                  {@code run} method.
      *
      * @param action the code to be run as the specified
-     *                  {@code Subject}. 

+     *                  {@code Subject}.
      *
      * @param acc the {@code AccessControlContext} to be tied to the
-     *                  specified subject and action. 

+     *                  specified subject and action.
      *
      * @return the value returned by the PrivilegedAction's
      *                  {@code run} method.
      *
-     * @exception NullPointerException if the {@code PrivilegedAction}
-     *                  is {@code null}. 

+     * @throws NullPointerException if the {@code PrivilegedAction}
+     *                  is {@code null}.
      *
-     * @exception SecurityException if the caller does not have permission
-     *                  to invoke this method.
+     * @throws SecurityException if a security manager is installed and the
+     *                  caller does not have a
+     *                  {@link AuthPermission#AuthPermission(String)
+     *                  AuthPermission("doAsPrivileged")} permission to invoke
+     *                  this method.
      */
     public static  T doAsPrivileged(final Subject subject,
                         final java.security.PrivilegedAction action,
@@ -495,34 +497,35 @@ public final class Subject implements java.io.Serializable {
      * this method instantiates a new {@code AccessControlContext}
      * with an empty collection of ProtectionDomains.
      *
-     * 

-     *
      * @param subject the {@code Subject} that the specified
      *                  {@code action} will run as.  This parameter
-     *                  may be {@code null}. 

+     *                  may be {@code null}.
      *
      * @param  the type of the value returned by the
      *                  PrivilegedExceptionAction's {@code run} method.
      *
      * @param action the code to be run as the specified
-     *                  {@code Subject}. 

+     *                  {@code Subject}.
      *
      * @param acc the {@code AccessControlContext} to be tied to the
-     *                  specified subject and action. 

+     *                  specified subject and action.
      *
      * @return the value returned by the
      *                  PrivilegedExceptionAction's {@code run} method.
      *
-     * @exception PrivilegedActionException if the
+     * @throws PrivilegedActionException if the
      *                  {@code PrivilegedExceptionAction.run}
-     *                  method throws a checked exception. 

+     *                  method throws a checked exception.
      *
-     * @exception NullPointerException if the specified
+     * @throws NullPointerException if the specified
      *                  {@code PrivilegedExceptionAction} is
-     *                  {@code null}. 

+     *                  {@code null}.
      *
-     * @exception SecurityException if the caller does not have permission
-     *                  to invoke this method.
+     * @throws SecurityException if a security manager is installed and the
+     *                  caller does not have a
+     *                  {@link AuthPermission#AuthPermission(String)
+     *                  AuthPermission("doAsPrivileged")} permission to invoke
+     *                  this method.
      */
     public static  T doAsPrivileged(final Subject subject,
                         final java.security.PrivilegedExceptionAction action,
@@ -577,9 +580,12 @@ public final class Subject implements java.io.Serializable {
      * to the returned {@code Set} affects the internal
      * {@code Principal} {@code Set} as well.
      *
-     * 

+     * 
 If a security manager is installed, the caller must have a
+     * {@link AuthPermission#AuthPermission(String)
+     * AuthPermission("modifyPrincipals")} permission to modify
+     * the returned set, or a {@code SecurityException} will be thrown.
      *
-     * @return  The {@code Set} of Principals associated with this
+     * @return  the {@code Set} of Principals associated with this
      *          {@code Subject}.
      */
     public Set getPrincipals() {
@@ -600,8 +606,6 @@ public final class Subject implements java.io.Serializable {
      * Modifications to the returned {@code Set}
      * will not affect the internal {@code Principal} {@code Set}.
      *
-     * 

-     *
      * @param  the type of the class modeled by {@code c}
      *
      * @param c the returned {@code Set} of Principals will all be
@@ -610,8 +614,8 @@ public final class Subject implements java.io.Serializable {
      * @return a {@code Set} of Principals that are instances of the
      *          specified {@code Class}.
      *
-     * @exception NullPointerException if the specified {@code Class}
-     *                  is {@code null}.
+     * @throws NullPointerException if the specified {@code Class}
+     *          is {@code null}.
      */
     public  Set getPrincipals(Class c) {
 
@@ -632,9 +636,12 @@ public final class Subject implements java.io.Serializable {
      * to the returned {@code Set} affects the internal public
      * Credential {@code Set} as well.
      *
-     * 

+     * 
 If a security manager is installed, the caller must have a
+     * {@link AuthPermission#AuthPermission(String)
+     * AuthPermission("modifyPublicCredentials")} permission to modify
+     * the returned set, or a {@code SecurityException} will be thrown.
      *
-     * @return  A {@code Set} of public credentials held by this
+     * @return  a {@code Set} of public credentials held by this
      *          {@code Subject}.
      */
     public Set getPublicCredentials() {
@@ -653,20 +660,18 @@ public final class Subject implements java.io.Serializable {
      * to the returned {@code Set} affects the internal private
      * Credential {@code Set} as well.
      *
-     * 
 A caller requires permissions to access the Credentials
-     * in the returned {@code Set}, or to modify the
-     * {@code Set} itself.  A {@code SecurityException}
-     * is thrown if the caller does not have the proper permissions.
+     * 
 If a security manager is installed, the caller must have a
+     * {@link AuthPermission#AuthPermission(String)
+     * AuthPermission("modifyPrivateCredentials")} permission to modify
+     * the returned set, or a {@code SecurityException} will be thrown.
      *
      * 
 While iterating through the {@code Set},
-     * a {@code SecurityException} is thrown
-     * if the caller does not have permission to access a
-     * particular Credential.  The {@code Iterator}
-     * is nevertheless advanced to next element in the {@code Set}.
+     * a {@code SecurityException} is thrown if a security manager is installed
+     * and the caller does not have a {@link PrivateCredentialPermission}
+     * to access a particular Credential.  The {@code Iterator}
+     * is nevertheless advanced to the next element in the {@code Set}.
      *
-     * 

-     *
-     * @return  A {@code Set} of private credentials held by this
+     * @return  a {@code Set} of private credentials held by this
      *          {@code Subject}.
      */
     public Set getPrivateCredentials() {
@@ -695,8 +700,6 @@ public final class Subject implements java.io.Serializable {
      * Modifications to the returned {@code Set}
      * will not affect the internal public Credential {@code Set}.
      *
-     * 

-     *
      * @param  the type of the class modeled by {@code c}
      *
      * @param c the returned {@code Set} of public credentials will all be
@@ -705,7 +708,7 @@ public final class Subject implements java.io.Serializable {
      * @return a {@code Set} of public credentials that are instances
      *          of the  specified {@code Class}.
      *
-     * @exception NullPointerException if the specified {@code Class}
+     * @throws NullPointerException if the specified {@code Class}
      *          is {@code null}.
      */
     public  Set getPublicCredentials(Class c) {
@@ -723,9 +726,9 @@ public final class Subject implements java.io.Serializable {
      * {@code Subject} that are instances or subclasses of the specified
      * {@code Class}.
      *
-     * 
 The caller must have permission to access all of the
-     * requested Credentials, or a {@code SecurityException}
-     * will be thrown.
+     * 
 If a security manager is installed, the caller must have a
+     * {@link PrivateCredentialPermission} to access all of the requested
+     * Credentials, or a {@code SecurityException} will be thrown.
      *
      * 
 The returned {@code Set} is not backed by this Subject's
      * internal private Credential {@code Set}.  A new
@@ -733,8 +736,6 @@ public final class Subject implements java.io.Serializable {
      * Modifications to the returned {@code Set}
      * will not affect the internal private Credential {@code Set}.
      *
-     * 

-     *
      * @param  the type of the class modeled by {@code c}
      *
      * @param c the returned {@code Set} of private credentials will all be
@@ -743,7 +744,7 @@ public final class Subject implements java.io.Serializable {
      * @return a {@code Set} of private credentials that are instances
      *          of the  specified {@code Class}.
      *
-     * @exception NullPointerException if the specified {@code Class}
+     * @throws NullPointerException if the specified {@code Class}
      *          is {@code null}.
      */
     public  Set getPrivateCredentials(Class c) {
@@ -772,19 +773,18 @@ public final class Subject implements java.io.Serializable {
      * equal if their {@code Principal} and {@code Credential}
      * Sets are equal.
      *
-     * 

-     *
      * @param o Object to be compared for equality with this
      *          {@code Subject}.
      *
      * @return true if the specified Object is equal to this
      *          {@code Subject}.
      *
-     * @exception SecurityException if the caller does not have permission
-     *          to access the private credentials for this {@code Subject},
-     *          or if the caller does not have permission to access the
-     *          private credentials for the provided {@code Subject}.
+     * @throws SecurityException if a security manager is installed and the
+     *         caller does not have a {@link PrivateCredentialPermission}
+     *         permission to access the private credentials for this
+     *         {@code Subject} or the provided {@code Subject}.
      */
+    @Override
     public boolean equals(Object o) {
 
         if (o == null) {
@@ -834,10 +834,9 @@ public final class Subject implements java.io.Serializable {
     /**
      * Return the String representation of this {@code Subject}.
      *
-     * 

-     *
      * @return the String representation of this {@code Subject}.
      */
+    @Override
     public String toString() {
         return toString(true);
     }
@@ -895,13 +894,13 @@ public final class Subject implements java.io.Serializable {
     /**
      * Returns a hashcode for this {@code Subject}.
      *
-     * 

-     *
      * @return a hashcode for this {@code Subject}.
      *
-     * @exception SecurityException if the caller does not have permission
-     *          to access this Subject's private credentials.
+     * @throws SecurityException if a security manager is installed and the
+     *         caller does not have a {@link PrivateCredentialPermission}
+     *         permission to access this Subject's private credentials.
      */
+    @Override
     public int hashCode() {
 
         /**
@@ -996,7 +995,7 @@ public final class Subject implements java.io.Serializable {
      *
      * @param coll A {@code Collection} to be tested for null references
      *
-     * @exception NullPointerException if the specified collection is either
+     * @throws NullPointerException if the specified collection is either
      *            {@code null} or contains a {@code null} element
      */
     private static void collectionNullClean(Collection coll) {
@@ -1546,7 +1545,7 @@ public final class Subject implements java.io.Serializable {
         }
     }
 
-    static class AuthPermissionHolder {
+    static final class AuthPermissionHolder {
         static final AuthPermission DO_AS_PERMISSION =
             new AuthPermission("doAs");
 
diff --git a/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java b/jdk/src/java.base/share/classes/javax/security/auth/SubjectDomainCombiner.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java
rename to jdk/src/java.base/share/classes/javax/security/auth/SubjectDomainCombiner.java
diff --git a/jdk/src/share/classes/javax/security/auth/callback/Callback.java b/jdk/src/java.base/share/classes/javax/security/auth/callback/Callback.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/callback/Callback.java
rename to jdk/src/java.base/share/classes/javax/security/auth/callback/Callback.java
diff --git a/jdk/src/share/classes/javax/security/auth/callback/CallbackHandler.java b/jdk/src/java.base/share/classes/javax/security/auth/callback/CallbackHandler.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/callback/CallbackHandler.java
rename to jdk/src/java.base/share/classes/javax/security/auth/callback/CallbackHandler.java
diff --git a/jdk/src/share/classes/javax/security/auth/callback/ChoiceCallback.java b/jdk/src/java.base/share/classes/javax/security/auth/callback/ChoiceCallback.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/callback/ChoiceCallback.java
rename to jdk/src/java.base/share/classes/javax/security/auth/callback/ChoiceCallback.java
diff --git a/jdk/src/share/classes/javax/security/auth/callback/ConfirmationCallback.java b/jdk/src/java.base/share/classes/javax/security/auth/callback/ConfirmationCallback.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/callback/ConfirmationCallback.java
rename to jdk/src/java.base/share/classes/javax/security/auth/callback/ConfirmationCallback.java
diff --git a/jdk/src/share/classes/javax/security/auth/callback/LanguageCallback.java b/jdk/src/java.base/share/classes/javax/security/auth/callback/LanguageCallback.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/callback/LanguageCallback.java
rename to jdk/src/java.base/share/classes/javax/security/auth/callback/LanguageCallback.java
diff --git a/jdk/src/share/classes/javax/security/auth/callback/NameCallback.java b/jdk/src/java.base/share/classes/javax/security/auth/callback/NameCallback.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/callback/NameCallback.java
rename to jdk/src/java.base/share/classes/javax/security/auth/callback/NameCallback.java
diff --git a/jdk/src/share/classes/javax/security/auth/callback/PasswordCallback.java b/jdk/src/java.base/share/classes/javax/security/auth/callback/PasswordCallback.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/callback/PasswordCallback.java
rename to jdk/src/java.base/share/classes/javax/security/auth/callback/PasswordCallback.java
diff --git a/jdk/src/share/classes/javax/security/auth/callback/TextInputCallback.java b/jdk/src/java.base/share/classes/javax/security/auth/callback/TextInputCallback.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/callback/TextInputCallback.java
rename to jdk/src/java.base/share/classes/javax/security/auth/callback/TextInputCallback.java
diff --git a/jdk/src/share/classes/javax/security/auth/callback/TextOutputCallback.java b/jdk/src/java.base/share/classes/javax/security/auth/callback/TextOutputCallback.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/callback/TextOutputCallback.java
rename to jdk/src/java.base/share/classes/javax/security/auth/callback/TextOutputCallback.java
diff --git a/jdk/src/share/classes/javax/security/auth/callback/UnsupportedCallbackException.java b/jdk/src/java.base/share/classes/javax/security/auth/callback/UnsupportedCallbackException.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/callback/UnsupportedCallbackException.java
rename to jdk/src/java.base/share/classes/javax/security/auth/callback/UnsupportedCallbackException.java
diff --git a/jdk/src/share/classes/javax/security/auth/callback/package-info.java b/jdk/src/java.base/share/classes/javax/security/auth/callback/package-info.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/callback/package-info.java
rename to jdk/src/java.base/share/classes/javax/security/auth/callback/package-info.java
diff --git a/jdk/src/share/classes/javax/security/auth/login/AccountException.java b/jdk/src/java.base/share/classes/javax/security/auth/login/AccountException.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/login/AccountException.java
rename to jdk/src/java.base/share/classes/javax/security/auth/login/AccountException.java
diff --git a/jdk/src/share/classes/javax/security/auth/login/AccountExpiredException.java b/jdk/src/java.base/share/classes/javax/security/auth/login/AccountExpiredException.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/login/AccountExpiredException.java
rename to jdk/src/java.base/share/classes/javax/security/auth/login/AccountExpiredException.java
diff --git a/jdk/src/share/classes/javax/security/auth/login/AccountLockedException.java b/jdk/src/java.base/share/classes/javax/security/auth/login/AccountLockedException.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/login/AccountLockedException.java
rename to jdk/src/java.base/share/classes/javax/security/auth/login/AccountLockedException.java
diff --git a/jdk/src/share/classes/javax/security/auth/login/AccountNotFoundException.java b/jdk/src/java.base/share/classes/javax/security/auth/login/AccountNotFoundException.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/login/AccountNotFoundException.java
rename to jdk/src/java.base/share/classes/javax/security/auth/login/AccountNotFoundException.java
diff --git a/jdk/src/share/classes/javax/security/auth/login/AppConfigurationEntry.java b/jdk/src/java.base/share/classes/javax/security/auth/login/AppConfigurationEntry.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/login/AppConfigurationEntry.java
rename to jdk/src/java.base/share/classes/javax/security/auth/login/AppConfigurationEntry.java
diff --git a/jdk/src/share/classes/javax/security/auth/login/Configuration.java b/jdk/src/java.base/share/classes/javax/security/auth/login/Configuration.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/login/Configuration.java
rename to jdk/src/java.base/share/classes/javax/security/auth/login/Configuration.java
diff --git a/jdk/src/share/classes/javax/security/auth/login/ConfigurationSpi.java b/jdk/src/java.base/share/classes/javax/security/auth/login/ConfigurationSpi.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/login/ConfigurationSpi.java
rename to jdk/src/java.base/share/classes/javax/security/auth/login/ConfigurationSpi.java
diff --git a/jdk/src/share/classes/javax/security/auth/login/CredentialException.java b/jdk/src/java.base/share/classes/javax/security/auth/login/CredentialException.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/login/CredentialException.java
rename to jdk/src/java.base/share/classes/javax/security/auth/login/CredentialException.java
diff --git a/jdk/src/share/classes/javax/security/auth/login/CredentialExpiredException.java b/jdk/src/java.base/share/classes/javax/security/auth/login/CredentialExpiredException.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/login/CredentialExpiredException.java
rename to jdk/src/java.base/share/classes/javax/security/auth/login/CredentialExpiredException.java
diff --git a/jdk/src/share/classes/javax/security/auth/login/CredentialNotFoundException.java b/jdk/src/java.base/share/classes/javax/security/auth/login/CredentialNotFoundException.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/login/CredentialNotFoundException.java
rename to jdk/src/java.base/share/classes/javax/security/auth/login/CredentialNotFoundException.java
diff --git a/jdk/src/share/classes/javax/security/auth/login/FailedLoginException.java b/jdk/src/java.base/share/classes/javax/security/auth/login/FailedLoginException.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/login/FailedLoginException.java
rename to jdk/src/java.base/share/classes/javax/security/auth/login/FailedLoginException.java
diff --git a/jdk/src/share/classes/javax/security/auth/login/LoginContext.java b/jdk/src/java.base/share/classes/javax/security/auth/login/LoginContext.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/login/LoginContext.java
rename to jdk/src/java.base/share/classes/javax/security/auth/login/LoginContext.java
diff --git a/jdk/src/share/classes/javax/security/auth/login/LoginException.java b/jdk/src/java.base/share/classes/javax/security/auth/login/LoginException.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/login/LoginException.java
rename to jdk/src/java.base/share/classes/javax/security/auth/login/LoginException.java
diff --git a/jdk/src/share/classes/javax/security/auth/login/package-info.java b/jdk/src/java.base/share/classes/javax/security/auth/login/package-info.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/login/package-info.java
rename to jdk/src/java.base/share/classes/javax/security/auth/login/package-info.java
diff --git a/jdk/src/share/classes/javax/security/auth/package-info.java b/jdk/src/java.base/share/classes/javax/security/auth/package-info.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/package-info.java
rename to jdk/src/java.base/share/classes/javax/security/auth/package-info.java
diff --git a/jdk/src/share/classes/javax/security/auth/spi/LoginModule.java b/jdk/src/java.base/share/classes/javax/security/auth/spi/LoginModule.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/spi/LoginModule.java
rename to jdk/src/java.base/share/classes/javax/security/auth/spi/LoginModule.java
diff --git a/jdk/src/share/classes/javax/security/auth/spi/package-info.java b/jdk/src/java.base/share/classes/javax/security/auth/spi/package-info.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/spi/package-info.java
rename to jdk/src/java.base/share/classes/javax/security/auth/spi/package-info.java
diff --git a/jdk/src/share/classes/javax/security/auth/x500/X500Principal.java b/jdk/src/java.base/share/classes/javax/security/auth/x500/X500Principal.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/x500/X500Principal.java
rename to jdk/src/java.base/share/classes/javax/security/auth/x500/X500Principal.java
diff --git a/jdk/src/share/classes/javax/security/auth/x500/X500PrivateCredential.java b/jdk/src/java.base/share/classes/javax/security/auth/x500/X500PrivateCredential.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/x500/X500PrivateCredential.java
rename to jdk/src/java.base/share/classes/javax/security/auth/x500/X500PrivateCredential.java
diff --git a/jdk/src/share/classes/javax/security/auth/x500/package-info.java b/jdk/src/java.base/share/classes/javax/security/auth/x500/package-info.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/x500/package-info.java
rename to jdk/src/java.base/share/classes/javax/security/auth/x500/package-info.java
diff --git a/jdk/src/share/classes/javax/security/cert/Certificate.java b/jdk/src/java.base/share/classes/javax/security/cert/Certificate.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/cert/Certificate.java
rename to jdk/src/java.base/share/classes/javax/security/cert/Certificate.java
diff --git a/jdk/src/share/classes/javax/security/cert/CertificateEncodingException.java b/jdk/src/java.base/share/classes/javax/security/cert/CertificateEncodingException.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/cert/CertificateEncodingException.java
rename to jdk/src/java.base/share/classes/javax/security/cert/CertificateEncodingException.java
diff --git a/jdk/src/share/classes/javax/security/cert/CertificateException.java b/jdk/src/java.base/share/classes/javax/security/cert/CertificateException.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/cert/CertificateException.java
rename to jdk/src/java.base/share/classes/javax/security/cert/CertificateException.java
diff --git a/jdk/src/share/classes/javax/security/cert/CertificateExpiredException.java b/jdk/src/java.base/share/classes/javax/security/cert/CertificateExpiredException.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/cert/CertificateExpiredException.java
rename to jdk/src/java.base/share/classes/javax/security/cert/CertificateExpiredException.java
diff --git a/jdk/src/share/classes/javax/security/cert/CertificateNotYetValidException.java b/jdk/src/java.base/share/classes/javax/security/cert/CertificateNotYetValidException.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/cert/CertificateNotYetValidException.java
rename to jdk/src/java.base/share/classes/javax/security/cert/CertificateNotYetValidException.java
diff --git a/jdk/src/share/classes/javax/security/cert/CertificateParsingException.java b/jdk/src/java.base/share/classes/javax/security/cert/CertificateParsingException.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/cert/CertificateParsingException.java
rename to jdk/src/java.base/share/classes/javax/security/cert/CertificateParsingException.java
diff --git a/jdk/src/share/classes/javax/security/cert/X509Certificate.java b/jdk/src/java.base/share/classes/javax/security/cert/X509Certificate.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/cert/X509Certificate.java
rename to jdk/src/java.base/share/classes/javax/security/cert/X509Certificate.java
diff --git a/jdk/src/share/classes/javax/security/cert/package-info.java b/jdk/src/java.base/share/classes/javax/security/cert/package-info.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/cert/package-info.java
rename to jdk/src/java.base/share/classes/javax/security/cert/package-info.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/AnnotationVisitor.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/AnnotationVisitor.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/AnnotationVisitor.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/AnnotationVisitor.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/AnnotationWriter.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/AnnotationWriter.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/AnnotationWriter.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/AnnotationWriter.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Attribute.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Attribute.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/Attribute.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Attribute.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/ByteVector.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ByteVector.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/ByteVector.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ByteVector.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/ClassVisitor.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassVisitor.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/ClassVisitor.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassVisitor.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/ClassWriter.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassWriter.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/ClassWriter.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassWriter.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Context.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Context.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/Context.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Context.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Edge.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Edge.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/Edge.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Edge.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/FieldVisitor.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/FieldVisitor.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/FieldVisitor.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/FieldVisitor.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/FieldWriter.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/FieldWriter.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/FieldWriter.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/FieldWriter.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Frame.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Frame.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/Frame.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Frame.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Handle.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Handle.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/Handle.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Handle.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Handler.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Handler.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/Handler.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Handler.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Item.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Item.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/Item.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Item.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Label.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Label.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/Label.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Label.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/MethodVisitor.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/MethodVisitor.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/MethodVisitor.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/MethodVisitor.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/MethodWriter.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/MethodWriter.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/MethodWriter.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/MethodWriter.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Type.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Type.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/Type.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Type.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/TypePath.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypePath.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/TypePath.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypePath.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/TypeReference.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypeReference.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/TypeReference.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypeReference.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/AdviceAdapter.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AdviceAdapter.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/AdviceAdapter.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AdviceAdapter.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/AnalyzerAdapter.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AnalyzerAdapter.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/AnalyzerAdapter.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AnalyzerAdapter.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/CodeSizeEvaluator.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/CodeSizeEvaluator.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/CodeSizeEvaluator.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/CodeSizeEvaluator.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/GeneratorAdapter.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/GeneratorAdapter.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/GeneratorAdapter.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/GeneratorAdapter.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/JSRInlinerAdapter.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/JSRInlinerAdapter.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/JSRInlinerAdapter.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/JSRInlinerAdapter.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/LocalVariablesSorter.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/LocalVariablesSorter.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/LocalVariablesSorter.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/LocalVariablesSorter.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/Method.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/Method.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/Method.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/Method.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/Remapper.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/Remapper.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/Remapper.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/Remapper.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingAnnotationAdapter.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingAnnotationAdapter.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingAnnotationAdapter.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingAnnotationAdapter.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingClassAdapter.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingClassAdapter.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingClassAdapter.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingClassAdapter.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingFieldAdapter.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingFieldAdapter.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingFieldAdapter.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingFieldAdapter.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingMethodAdapter.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingMethodAdapter.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingMethodAdapter.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingMethodAdapter.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingSignatureAdapter.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingSignatureAdapter.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingSignatureAdapter.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingSignatureAdapter.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/SerialVersionUIDAdder.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SerialVersionUIDAdder.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/SerialVersionUIDAdder.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SerialVersionUIDAdder.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/SimpleRemapper.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SimpleRemapper.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/SimpleRemapper.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SimpleRemapper.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/StaticInitMerger.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/StaticInitMerger.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/StaticInitMerger.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/StaticInitMerger.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/TableSwitchGenerator.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/TableSwitchGenerator.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/TableSwitchGenerator.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/TableSwitchGenerator.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/TryCatchBlockSorter.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/TryCatchBlockSorter.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/TryCatchBlockSorter.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/TryCatchBlockSorter.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureReader.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureReader.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureReader.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureReader.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureVisitor.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureVisitor.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureVisitor.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureVisitor.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureWriter.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureWriter.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureWriter.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureWriter.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/AbstractInsnNode.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/AbstractInsnNode.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/AbstractInsnNode.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/AbstractInsnNode.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/AnnotationNode.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/AnnotationNode.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/AnnotationNode.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/AnnotationNode.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/ClassNode.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ClassNode.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/ClassNode.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ClassNode.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/FieldInsnNode.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FieldInsnNode.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/FieldInsnNode.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FieldInsnNode.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/FieldNode.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FieldNode.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/FieldNode.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FieldNode.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/FrameNode.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FrameNode.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/FrameNode.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FrameNode.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/IincInsnNode.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/IincInsnNode.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/IincInsnNode.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/IincInsnNode.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/InnerClassNode.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InnerClassNode.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/InnerClassNode.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InnerClassNode.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/InsnList.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InsnList.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/InsnList.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InsnList.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/InsnNode.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InsnNode.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/InsnNode.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InsnNode.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/IntInsnNode.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/IntInsnNode.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/IntInsnNode.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/IntInsnNode.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/InvokeDynamicInsnNode.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InvokeDynamicInsnNode.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/InvokeDynamicInsnNode.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InvokeDynamicInsnNode.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/JumpInsnNode.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/JumpInsnNode.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/JumpInsnNode.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/JumpInsnNode.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/LabelNode.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LabelNode.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/LabelNode.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LabelNode.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/LdcInsnNode.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LdcInsnNode.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/LdcInsnNode.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LdcInsnNode.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/LineNumberNode.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LineNumberNode.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/LineNumberNode.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LineNumberNode.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableAnnotationNode.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableAnnotationNode.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableAnnotationNode.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableAnnotationNode.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableNode.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableNode.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableNode.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableNode.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/LookupSwitchInsnNode.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LookupSwitchInsnNode.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/LookupSwitchInsnNode.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LookupSwitchInsnNode.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/MethodInsnNode.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MethodInsnNode.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/MethodInsnNode.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MethodInsnNode.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/MethodNode.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MethodNode.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/MethodNode.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MethodNode.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/MultiANewArrayInsnNode.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MultiANewArrayInsnNode.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/MultiANewArrayInsnNode.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MultiANewArrayInsnNode.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/ParameterNode.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ParameterNode.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/ParameterNode.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ParameterNode.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/TableSwitchInsnNode.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TableSwitchInsnNode.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/TableSwitchInsnNode.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TableSwitchInsnNode.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/TryCatchBlockNode.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TryCatchBlockNode.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/TryCatchBlockNode.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TryCatchBlockNode.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/TypeAnnotationNode.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TypeAnnotationNode.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/TypeAnnotationNode.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TypeAnnotationNode.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/TypeInsnNode.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TypeInsnNode.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/TypeInsnNode.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TypeInsnNode.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/VarInsnNode.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/VarInsnNode.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/VarInsnNode.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/VarInsnNode.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Analyzer.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Analyzer.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Analyzer.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Analyzer.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/AnalyzerException.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/AnalyzerException.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/AnalyzerException.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/AnalyzerException.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicInterpreter.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicInterpreter.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicInterpreter.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicInterpreter.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicValue.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicValue.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicValue.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicValue.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicVerifier.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicVerifier.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicVerifier.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicVerifier.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Frame.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Frame.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Frame.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Frame.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Interpreter.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Interpreter.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Interpreter.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Interpreter.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SimpleVerifier.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SimpleVerifier.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SimpleVerifier.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SimpleVerifier.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SmallSet.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SmallSet.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SmallSet.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SmallSet.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceInterpreter.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceInterpreter.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceInterpreter.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceInterpreter.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceValue.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceValue.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceValue.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceValue.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Subroutine.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Subroutine.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Subroutine.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Subroutine.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Value.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Value.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Value.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Value.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/ASMifiable.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/ASMifiable.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/ASMifiable.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/ASMifiable.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/ASMifier.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/ASMifier.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/ASMifier.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/ASMifier.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckAnnotationAdapter.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckAnnotationAdapter.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckAnnotationAdapter.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckAnnotationAdapter.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckClassAdapter.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckClassAdapter.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckClassAdapter.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckClassAdapter.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckFieldAdapter.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckFieldAdapter.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckFieldAdapter.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckFieldAdapter.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckMethodAdapter.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckMethodAdapter.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckMethodAdapter.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckMethodAdapter.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckSignatureAdapter.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckSignatureAdapter.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckSignatureAdapter.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckSignatureAdapter.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/Printer.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Printer.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/Printer.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Printer.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/Textifiable.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Textifiable.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/Textifiable.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Textifiable.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/Textifier.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Textifier.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/Textifier.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Textifier.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/TraceAnnotationVisitor.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceAnnotationVisitor.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/TraceAnnotationVisitor.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceAnnotationVisitor.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/TraceClassVisitor.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceClassVisitor.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/TraceClassVisitor.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceClassVisitor.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/TraceFieldVisitor.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceFieldVisitor.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/TraceFieldVisitor.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceFieldVisitor.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/TraceMethodVisitor.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceMethodVisitor.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/TraceMethodVisitor.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceMethodVisitor.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/TraceSignatureVisitor.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceSignatureVisitor.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/TraceSignatureVisitor.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceSignatureVisitor.java
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/version.txt b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/version.txt
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/objectweb/asm/version.txt
rename to jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/version.txt
diff --git a/jdk/src/share/classes/jdk/internal/org/xml/sax/Attributes.java b/jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/Attributes.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/xml/sax/Attributes.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/Attributes.java
diff --git a/jdk/src/share/classes/jdk/internal/org/xml/sax/ContentHandler.java b/jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/ContentHandler.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/xml/sax/ContentHandler.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/ContentHandler.java
diff --git a/jdk/src/share/classes/jdk/internal/org/xml/sax/DTDHandler.java b/jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/DTDHandler.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/xml/sax/DTDHandler.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/DTDHandler.java
diff --git a/jdk/src/share/classes/jdk/internal/org/xml/sax/EntityResolver.java b/jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/EntityResolver.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/xml/sax/EntityResolver.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/EntityResolver.java
diff --git a/jdk/src/share/classes/jdk/internal/org/xml/sax/ErrorHandler.java b/jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/ErrorHandler.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/xml/sax/ErrorHandler.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/ErrorHandler.java
diff --git a/jdk/src/share/classes/jdk/internal/org/xml/sax/InputSource.java b/jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/InputSource.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/xml/sax/InputSource.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/InputSource.java
diff --git a/jdk/src/share/classes/jdk/internal/org/xml/sax/Locator.java b/jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/Locator.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/xml/sax/Locator.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/Locator.java
diff --git a/jdk/src/share/classes/jdk/internal/org/xml/sax/SAXException.java b/jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/SAXException.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/xml/sax/SAXException.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/SAXException.java
diff --git a/jdk/src/share/classes/jdk/internal/org/xml/sax/SAXNotRecognizedException.java b/jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/SAXNotRecognizedException.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/xml/sax/SAXNotRecognizedException.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/SAXNotRecognizedException.java
diff --git a/jdk/src/share/classes/jdk/internal/org/xml/sax/SAXNotSupportedException.java b/jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/SAXNotSupportedException.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/xml/sax/SAXNotSupportedException.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/SAXNotSupportedException.java
diff --git a/jdk/src/share/classes/jdk/internal/org/xml/sax/SAXParseException.java b/jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/SAXParseException.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/xml/sax/SAXParseException.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/SAXParseException.java
diff --git a/jdk/src/share/classes/jdk/internal/org/xml/sax/XMLReader.java b/jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/XMLReader.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/xml/sax/XMLReader.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/XMLReader.java
diff --git a/jdk/src/share/classes/jdk/internal/org/xml/sax/helpers/DefaultHandler.java b/jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/helpers/DefaultHandler.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/org/xml/sax/helpers/DefaultHandler.java
rename to jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/helpers/DefaultHandler.java
diff --git a/jdk/src/share/classes/jdk/internal/util/xml/PropertiesDefaultHandler.java b/jdk/src/java.base/share/classes/jdk/internal/util/xml/PropertiesDefaultHandler.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/util/xml/PropertiesDefaultHandler.java
rename to jdk/src/java.base/share/classes/jdk/internal/util/xml/PropertiesDefaultHandler.java
diff --git a/jdk/src/share/classes/jdk/internal/util/xml/SAXParser.java b/jdk/src/java.base/share/classes/jdk/internal/util/xml/SAXParser.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/util/xml/SAXParser.java
rename to jdk/src/java.base/share/classes/jdk/internal/util/xml/SAXParser.java
diff --git a/jdk/src/share/classes/jdk/internal/util/xml/XMLStreamException.java b/jdk/src/java.base/share/classes/jdk/internal/util/xml/XMLStreamException.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/util/xml/XMLStreamException.java
rename to jdk/src/java.base/share/classes/jdk/internal/util/xml/XMLStreamException.java
diff --git a/jdk/src/share/classes/jdk/internal/util/xml/XMLStreamWriter.java b/jdk/src/java.base/share/classes/jdk/internal/util/xml/XMLStreamWriter.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/util/xml/XMLStreamWriter.java
rename to jdk/src/java.base/share/classes/jdk/internal/util/xml/XMLStreamWriter.java
diff --git a/jdk/src/share/classes/jdk/internal/util/xml/impl/Attrs.java b/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/Attrs.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/util/xml/impl/Attrs.java
rename to jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/Attrs.java
diff --git a/jdk/src/share/classes/jdk/internal/util/xml/impl/Input.java b/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/Input.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/util/xml/impl/Input.java
rename to jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/Input.java
diff --git a/jdk/src/share/classes/jdk/internal/util/xml/impl/Pair.java b/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/Pair.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/util/xml/impl/Pair.java
rename to jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/Pair.java
diff --git a/jdk/src/share/classes/jdk/internal/util/xml/impl/Parser.java b/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/util/xml/impl/Parser.java
rename to jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java
diff --git a/jdk/src/share/classes/jdk/internal/util/xml/impl/ParserSAX.java b/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/ParserSAX.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/util/xml/impl/ParserSAX.java
rename to jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/ParserSAX.java
diff --git a/jdk/src/share/classes/jdk/internal/util/xml/impl/ReaderUTF16.java b/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/ReaderUTF16.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/util/xml/impl/ReaderUTF16.java
rename to jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/ReaderUTF16.java
diff --git a/jdk/src/share/classes/jdk/internal/util/xml/impl/ReaderUTF8.java b/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/ReaderUTF8.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/util/xml/impl/ReaderUTF8.java
rename to jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/ReaderUTF8.java
diff --git a/jdk/src/share/classes/jdk/internal/util/xml/impl/SAXParserImpl.java b/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/SAXParserImpl.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/util/xml/impl/SAXParserImpl.java
rename to jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/SAXParserImpl.java
diff --git a/jdk/src/share/classes/jdk/internal/util/xml/impl/XMLStreamWriterImpl.java b/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/XMLStreamWriterImpl.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/util/xml/impl/XMLStreamWriterImpl.java
rename to jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/XMLStreamWriterImpl.java
diff --git a/jdk/src/share/classes/jdk/internal/util/xml/impl/XMLWriter.java b/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/XMLWriter.java
similarity index 100%
rename from jdk/src/share/classes/jdk/internal/util/xml/impl/XMLWriter.java
rename to jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/XMLWriter.java
diff --git a/jdk/src/share/classes/jdk/net/ExtendedSocketOptions.java b/jdk/src/java.base/share/classes/jdk/net/ExtendedSocketOptions.java
similarity index 100%
rename from jdk/src/share/classes/jdk/net/ExtendedSocketOptions.java
rename to jdk/src/java.base/share/classes/jdk/net/ExtendedSocketOptions.java
diff --git a/jdk/src/share/classes/jdk/net/NetworkPermission.java b/jdk/src/java.base/share/classes/jdk/net/NetworkPermission.java
similarity index 100%
rename from jdk/src/share/classes/jdk/net/NetworkPermission.java
rename to jdk/src/java.base/share/classes/jdk/net/NetworkPermission.java
diff --git a/jdk/src/share/classes/jdk/net/SocketFlow.java b/jdk/src/java.base/share/classes/jdk/net/SocketFlow.java
similarity index 100%
rename from jdk/src/share/classes/jdk/net/SocketFlow.java
rename to jdk/src/java.base/share/classes/jdk/net/SocketFlow.java
diff --git a/jdk/src/share/classes/jdk/net/Sockets.java b/jdk/src/java.base/share/classes/jdk/net/Sockets.java
similarity index 100%
rename from jdk/src/share/classes/jdk/net/Sockets.java
rename to jdk/src/java.base/share/classes/jdk/net/Sockets.java
diff --git a/jdk/src/share/classes/jdk/net/package-info.java b/jdk/src/java.base/share/classes/jdk/net/package-info.java
similarity index 100%
rename from jdk/src/share/classes/jdk/net/package-info.java
rename to jdk/src/java.base/share/classes/jdk/net/package-info.java
diff --git a/jdk/src/share/classes/overview-core.html b/jdk/src/java.base/share/classes/overview-core.html
similarity index 100%
rename from jdk/src/share/classes/overview-core.html
rename to jdk/src/java.base/share/classes/overview-core.html
diff --git a/jdk/src/share/classes/sun/invoke/WrapperInstance.java b/jdk/src/java.base/share/classes/sun/invoke/WrapperInstance.java
similarity index 100%
rename from jdk/src/share/classes/sun/invoke/WrapperInstance.java
rename to jdk/src/java.base/share/classes/sun/invoke/WrapperInstance.java
diff --git a/jdk/src/share/classes/sun/invoke/anon/AnonymousClassLoader.java b/jdk/src/java.base/share/classes/sun/invoke/anon/AnonymousClassLoader.java
similarity index 100%
rename from jdk/src/share/classes/sun/invoke/anon/AnonymousClassLoader.java
rename to jdk/src/java.base/share/classes/sun/invoke/anon/AnonymousClassLoader.java
diff --git a/jdk/src/share/classes/sun/invoke/anon/ConstantPoolParser.java b/jdk/src/java.base/share/classes/sun/invoke/anon/ConstantPoolParser.java
similarity index 100%
rename from jdk/src/share/classes/sun/invoke/anon/ConstantPoolParser.java
rename to jdk/src/java.base/share/classes/sun/invoke/anon/ConstantPoolParser.java
diff --git a/jdk/src/share/classes/sun/invoke/anon/ConstantPoolPatch.java b/jdk/src/java.base/share/classes/sun/invoke/anon/ConstantPoolPatch.java
similarity index 100%
rename from jdk/src/share/classes/sun/invoke/anon/ConstantPoolPatch.java
rename to jdk/src/java.base/share/classes/sun/invoke/anon/ConstantPoolPatch.java
diff --git a/jdk/src/share/classes/sun/invoke/anon/ConstantPoolVisitor.java b/jdk/src/java.base/share/classes/sun/invoke/anon/ConstantPoolVisitor.java
similarity index 100%
rename from jdk/src/share/classes/sun/invoke/anon/ConstantPoolVisitor.java
rename to jdk/src/java.base/share/classes/sun/invoke/anon/ConstantPoolVisitor.java
diff --git a/jdk/src/share/classes/sun/invoke/anon/InvalidConstantPoolFormatException.java b/jdk/src/java.base/share/classes/sun/invoke/anon/InvalidConstantPoolFormatException.java
similarity index 100%
rename from jdk/src/share/classes/sun/invoke/anon/InvalidConstantPoolFormatException.java
rename to jdk/src/java.base/share/classes/sun/invoke/anon/InvalidConstantPoolFormatException.java
diff --git a/jdk/src/share/classes/sun/invoke/empty/Empty.java b/jdk/src/java.base/share/classes/sun/invoke/empty/Empty.java
similarity index 100%
rename from jdk/src/share/classes/sun/invoke/empty/Empty.java
rename to jdk/src/java.base/share/classes/sun/invoke/empty/Empty.java
diff --git a/jdk/src/share/classes/sun/invoke/package-info.java b/jdk/src/java.base/share/classes/sun/invoke/package-info.java
similarity index 100%
rename from jdk/src/share/classes/sun/invoke/package-info.java
rename to jdk/src/java.base/share/classes/sun/invoke/package-info.java
diff --git a/jdk/src/share/classes/sun/invoke/util/BytecodeDescriptor.java b/jdk/src/java.base/share/classes/sun/invoke/util/BytecodeDescriptor.java
similarity index 100%
rename from jdk/src/share/classes/sun/invoke/util/BytecodeDescriptor.java
rename to jdk/src/java.base/share/classes/sun/invoke/util/BytecodeDescriptor.java
diff --git a/jdk/src/share/classes/sun/invoke/util/BytecodeName.java b/jdk/src/java.base/share/classes/sun/invoke/util/BytecodeName.java
similarity index 100%
rename from jdk/src/share/classes/sun/invoke/util/BytecodeName.java
rename to jdk/src/java.base/share/classes/sun/invoke/util/BytecodeName.java
diff --git a/jdk/src/share/classes/sun/invoke/util/ValueConversions.java b/jdk/src/java.base/share/classes/sun/invoke/util/ValueConversions.java
similarity index 100%
rename from jdk/src/share/classes/sun/invoke/util/ValueConversions.java
rename to jdk/src/java.base/share/classes/sun/invoke/util/ValueConversions.java
diff --git a/jdk/src/share/classes/sun/invoke/util/VerifyAccess.java b/jdk/src/java.base/share/classes/sun/invoke/util/VerifyAccess.java
similarity index 100%
rename from jdk/src/share/classes/sun/invoke/util/VerifyAccess.java
rename to jdk/src/java.base/share/classes/sun/invoke/util/VerifyAccess.java
diff --git a/jdk/src/share/classes/sun/invoke/util/VerifyType.java b/jdk/src/java.base/share/classes/sun/invoke/util/VerifyType.java
similarity index 100%
rename from jdk/src/share/classes/sun/invoke/util/VerifyType.java
rename to jdk/src/java.base/share/classes/sun/invoke/util/VerifyType.java
diff --git a/jdk/src/share/classes/sun/invoke/util/Wrapper.java b/jdk/src/java.base/share/classes/sun/invoke/util/Wrapper.java
similarity index 100%
rename from jdk/src/share/classes/sun/invoke/util/Wrapper.java
rename to jdk/src/java.base/share/classes/sun/invoke/util/Wrapper.java
diff --git a/jdk/src/share/classes/sun/invoke/util/package-info.java b/jdk/src/java.base/share/classes/sun/invoke/util/package-info.java
similarity index 100%
rename from jdk/src/share/classes/sun/invoke/util/package-info.java
rename to jdk/src/java.base/share/classes/sun/invoke/util/package-info.java
diff --git a/jdk/src/share/classes/sun/launcher/LauncherHelper.java b/jdk/src/java.base/share/classes/sun/launcher/LauncherHelper.java
similarity index 100%
rename from jdk/src/share/classes/sun/launcher/LauncherHelper.java
rename to jdk/src/java.base/share/classes/sun/launcher/LauncherHelper.java
diff --git a/jdk/src/share/classes/sun/launcher/resources/launcher.properties b/jdk/src/java.base/share/classes/sun/launcher/resources/launcher.properties
similarity index 100%
rename from jdk/src/share/classes/sun/launcher/resources/launcher.properties
rename to jdk/src/java.base/share/classes/sun/launcher/resources/launcher.properties
diff --git a/jdk/src/share/classes/sun/launcher/resources/launcher_de.properties b/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_de.properties
similarity index 100%
rename from jdk/src/share/classes/sun/launcher/resources/launcher_de.properties
rename to jdk/src/java.base/share/classes/sun/launcher/resources/launcher_de.properties
diff --git a/jdk/src/share/classes/sun/launcher/resources/launcher_es.properties b/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_es.properties
similarity index 100%
rename from jdk/src/share/classes/sun/launcher/resources/launcher_es.properties
rename to jdk/src/java.base/share/classes/sun/launcher/resources/launcher_es.properties
diff --git a/jdk/src/share/classes/sun/launcher/resources/launcher_fr.properties b/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_fr.properties
similarity index 100%
rename from jdk/src/share/classes/sun/launcher/resources/launcher_fr.properties
rename to jdk/src/java.base/share/classes/sun/launcher/resources/launcher_fr.properties
diff --git a/jdk/src/share/classes/sun/launcher/resources/launcher_it.properties b/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_it.properties
similarity index 100%
rename from jdk/src/share/classes/sun/launcher/resources/launcher_it.properties
rename to jdk/src/java.base/share/classes/sun/launcher/resources/launcher_it.properties
diff --git a/jdk/src/share/classes/sun/launcher/resources/launcher_ja.properties b/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_ja.properties
similarity index 100%
rename from jdk/src/share/classes/sun/launcher/resources/launcher_ja.properties
rename to jdk/src/java.base/share/classes/sun/launcher/resources/launcher_ja.properties
diff --git a/jdk/src/share/classes/sun/launcher/resources/launcher_ko.properties b/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_ko.properties
similarity index 100%
rename from jdk/src/share/classes/sun/launcher/resources/launcher_ko.properties
rename to jdk/src/java.base/share/classes/sun/launcher/resources/launcher_ko.properties
diff --git a/jdk/src/share/classes/sun/launcher/resources/launcher_pt_BR.properties b/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_pt_BR.properties
similarity index 100%
rename from jdk/src/share/classes/sun/launcher/resources/launcher_pt_BR.properties
rename to jdk/src/java.base/share/classes/sun/launcher/resources/launcher_pt_BR.properties
diff --git a/jdk/src/share/classes/sun/launcher/resources/launcher_sv.properties b/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_sv.properties
similarity index 100%
rename from jdk/src/share/classes/sun/launcher/resources/launcher_sv.properties
rename to jdk/src/java.base/share/classes/sun/launcher/resources/launcher_sv.properties
diff --git a/jdk/src/share/classes/sun/launcher/resources/launcher_zh_CN.properties b/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_zh_CN.properties
similarity index 100%
rename from jdk/src/share/classes/sun/launcher/resources/launcher_zh_CN.properties
rename to jdk/src/java.base/share/classes/sun/launcher/resources/launcher_zh_CN.properties
diff --git a/jdk/src/share/classes/sun/launcher/resources/launcher_zh_TW.properties b/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_zh_TW.properties
similarity index 100%
rename from jdk/src/share/classes/sun/launcher/resources/launcher_zh_TW.properties
rename to jdk/src/java.base/share/classes/sun/launcher/resources/launcher_zh_TW.properties
diff --git a/jdk/src/share/classes/sun/misc/ASCIICaseInsensitiveComparator.java b/jdk/src/java.base/share/classes/sun/misc/ASCIICaseInsensitiveComparator.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/ASCIICaseInsensitiveComparator.java
rename to jdk/src/java.base/share/classes/sun/misc/ASCIICaseInsensitiveComparator.java
diff --git a/jdk/src/share/classes/sun/misc/BASE64Decoder.java b/jdk/src/java.base/share/classes/sun/misc/BASE64Decoder.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/BASE64Decoder.java
rename to jdk/src/java.base/share/classes/sun/misc/BASE64Decoder.java
diff --git a/jdk/src/share/classes/sun/misc/BASE64Encoder.java b/jdk/src/java.base/share/classes/sun/misc/BASE64Encoder.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/BASE64Encoder.java
rename to jdk/src/java.base/share/classes/sun/misc/BASE64Encoder.java
diff --git a/jdk/src/share/classes/sun/misc/CEFormatException.java b/jdk/src/java.base/share/classes/sun/misc/CEFormatException.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/CEFormatException.java
rename to jdk/src/java.base/share/classes/sun/misc/CEFormatException.java
diff --git a/jdk/src/share/classes/sun/misc/CEStreamExhausted.java b/jdk/src/java.base/share/classes/sun/misc/CEStreamExhausted.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/CEStreamExhausted.java
rename to jdk/src/java.base/share/classes/sun/misc/CEStreamExhausted.java
diff --git a/jdk/src/share/classes/sun/misc/CRC16.java b/jdk/src/java.base/share/classes/sun/misc/CRC16.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/CRC16.java
rename to jdk/src/java.base/share/classes/sun/misc/CRC16.java
diff --git a/jdk/src/share/classes/sun/misc/Cache.java b/jdk/src/java.base/share/classes/sun/misc/Cache.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/Cache.java
rename to jdk/src/java.base/share/classes/sun/misc/Cache.java
diff --git a/jdk/src/share/classes/sun/misc/CharacterDecoder.java b/jdk/src/java.base/share/classes/sun/misc/CharacterDecoder.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/CharacterDecoder.java
rename to jdk/src/java.base/share/classes/sun/misc/CharacterDecoder.java
diff --git a/jdk/src/share/classes/sun/misc/CharacterEncoder.java b/jdk/src/java.base/share/classes/sun/misc/CharacterEncoder.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/CharacterEncoder.java
rename to jdk/src/java.base/share/classes/sun/misc/CharacterEncoder.java
diff --git a/jdk/src/share/classes/sun/misc/ClassFileTransformer.java b/jdk/src/java.base/share/classes/sun/misc/ClassFileTransformer.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/ClassFileTransformer.java
rename to jdk/src/java.base/share/classes/sun/misc/ClassFileTransformer.java
diff --git a/jdk/src/share/classes/sun/misc/Cleaner.java b/jdk/src/java.base/share/classes/sun/misc/Cleaner.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/Cleaner.java
rename to jdk/src/java.base/share/classes/sun/misc/Cleaner.java
diff --git a/jdk/src/share/classes/sun/misc/CompoundEnumeration.java b/jdk/src/java.base/share/classes/sun/misc/CompoundEnumeration.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/CompoundEnumeration.java
rename to jdk/src/java.base/share/classes/sun/misc/CompoundEnumeration.java
diff --git a/jdk/src/share/classes/sun/misc/ConditionLock.java b/jdk/src/java.base/share/classes/sun/misc/ConditionLock.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/ConditionLock.java
rename to jdk/src/java.base/share/classes/sun/misc/ConditionLock.java
diff --git a/jdk/src/share/classes/sun/misc/Contended.java b/jdk/src/java.base/share/classes/sun/misc/Contended.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/Contended.java
rename to jdk/src/java.base/share/classes/sun/misc/Contended.java
diff --git a/jdk/src/share/classes/sun/misc/DoubleConsts.java b/jdk/src/java.base/share/classes/sun/misc/DoubleConsts.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/DoubleConsts.java
rename to jdk/src/java.base/share/classes/sun/misc/DoubleConsts.java
diff --git a/jdk/src/share/classes/sun/misc/ExtensionDependency.java b/jdk/src/java.base/share/classes/sun/misc/ExtensionDependency.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/ExtensionDependency.java
rename to jdk/src/java.base/share/classes/sun/misc/ExtensionDependency.java
diff --git a/jdk/src/share/classes/sun/misc/ExtensionInfo.java b/jdk/src/java.base/share/classes/sun/misc/ExtensionInfo.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/ExtensionInfo.java
rename to jdk/src/java.base/share/classes/sun/misc/ExtensionInfo.java
diff --git a/jdk/src/share/classes/sun/misc/ExtensionInstallationException.java b/jdk/src/java.base/share/classes/sun/misc/ExtensionInstallationException.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/ExtensionInstallationException.java
rename to jdk/src/java.base/share/classes/sun/misc/ExtensionInstallationException.java
diff --git a/jdk/src/share/classes/sun/misc/ExtensionInstallationProvider.java b/jdk/src/java.base/share/classes/sun/misc/ExtensionInstallationProvider.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/ExtensionInstallationProvider.java
rename to jdk/src/java.base/share/classes/sun/misc/ExtensionInstallationProvider.java
diff --git a/jdk/src/share/classes/sun/misc/FDBigInteger.java b/jdk/src/java.base/share/classes/sun/misc/FDBigInteger.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/FDBigInteger.java
rename to jdk/src/java.base/share/classes/sun/misc/FDBigInteger.java
diff --git a/jdk/src/share/classes/sun/misc/FloatConsts.java b/jdk/src/java.base/share/classes/sun/misc/FloatConsts.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/FloatConsts.java
rename to jdk/src/java.base/share/classes/sun/misc/FloatConsts.java
diff --git a/jdk/src/share/classes/sun/misc/FloatingDecimal.java b/jdk/src/java.base/share/classes/sun/misc/FloatingDecimal.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/FloatingDecimal.java
rename to jdk/src/java.base/share/classes/sun/misc/FloatingDecimal.java
diff --git a/jdk/src/share/classes/sun/misc/FormattedFloatingDecimal.java b/jdk/src/java.base/share/classes/sun/misc/FormattedFloatingDecimal.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/FormattedFloatingDecimal.java
rename to jdk/src/java.base/share/classes/sun/misc/FormattedFloatingDecimal.java
diff --git a/jdk/src/share/classes/sun/misc/GC.java b/jdk/src/java.base/share/classes/sun/misc/GC.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/GC.java
rename to jdk/src/java.base/share/classes/sun/misc/GC.java
diff --git a/jdk/src/share/classes/sun/misc/HexDumpEncoder.java b/jdk/src/java.base/share/classes/sun/misc/HexDumpEncoder.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/HexDumpEncoder.java
rename to jdk/src/java.base/share/classes/sun/misc/HexDumpEncoder.java
diff --git a/jdk/src/share/classes/sun/misc/IOUtils.java b/jdk/src/java.base/share/classes/sun/misc/IOUtils.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/IOUtils.java
rename to jdk/src/java.base/share/classes/sun/misc/IOUtils.java
diff --git a/jdk/src/share/classes/sun/misc/InnocuousThread.java b/jdk/src/java.base/share/classes/sun/misc/InnocuousThread.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/InnocuousThread.java
rename to jdk/src/java.base/share/classes/sun/misc/InnocuousThread.java
diff --git a/jdk/src/share/classes/sun/misc/InvalidJarIndexException.java b/jdk/src/java.base/share/classes/sun/misc/InvalidJarIndexException.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/InvalidJarIndexException.java
rename to jdk/src/java.base/share/classes/sun/misc/InvalidJarIndexException.java
diff --git a/jdk/src/share/classes/sun/misc/JarFilter.java b/jdk/src/java.base/share/classes/sun/misc/JarFilter.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/JarFilter.java
rename to jdk/src/java.base/share/classes/sun/misc/JarFilter.java
diff --git a/jdk/src/share/classes/sun/misc/JarIndex.java b/jdk/src/java.base/share/classes/sun/misc/JarIndex.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/JarIndex.java
rename to jdk/src/java.base/share/classes/sun/misc/JarIndex.java
diff --git a/jdk/src/share/classes/sun/misc/JavaAWTAccess.java b/jdk/src/java.base/share/classes/sun/misc/JavaAWTAccess.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/JavaAWTAccess.java
rename to jdk/src/java.base/share/classes/sun/misc/JavaAWTAccess.java
diff --git a/jdk/src/share/classes/sun/misc/JavaAWTFontAccess.java b/jdk/src/java.base/share/classes/sun/misc/JavaAWTFontAccess.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/JavaAWTFontAccess.java
rename to jdk/src/java.base/share/classes/sun/misc/JavaAWTFontAccess.java
diff --git a/jdk/src/share/classes/sun/misc/JavaBeansIntrospectorAccess.java b/jdk/src/java.base/share/classes/sun/misc/JavaBeansIntrospectorAccess.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/JavaBeansIntrospectorAccess.java
rename to jdk/src/java.base/share/classes/sun/misc/JavaBeansIntrospectorAccess.java
diff --git a/jdk/src/share/classes/sun/misc/JavaIOAccess.java b/jdk/src/java.base/share/classes/sun/misc/JavaIOAccess.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/JavaIOAccess.java
rename to jdk/src/java.base/share/classes/sun/misc/JavaIOAccess.java
diff --git a/jdk/src/share/classes/sun/misc/JavaIOFileDescriptorAccess.java b/jdk/src/java.base/share/classes/sun/misc/JavaIOFileDescriptorAccess.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/JavaIOFileDescriptorAccess.java
rename to jdk/src/java.base/share/classes/sun/misc/JavaIOFileDescriptorAccess.java
diff --git a/jdk/src/share/classes/sun/misc/JavaLangAccess.java b/jdk/src/java.base/share/classes/sun/misc/JavaLangAccess.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/JavaLangAccess.java
rename to jdk/src/java.base/share/classes/sun/misc/JavaLangAccess.java
diff --git a/jdk/src/share/classes/sun/misc/JavaLangRefAccess.java b/jdk/src/java.base/share/classes/sun/misc/JavaLangRefAccess.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/JavaLangRefAccess.java
rename to jdk/src/java.base/share/classes/sun/misc/JavaLangRefAccess.java
diff --git a/jdk/src/share/classes/sun/misc/JavaNetAccess.java b/jdk/src/java.base/share/classes/sun/misc/JavaNetAccess.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/JavaNetAccess.java
rename to jdk/src/java.base/share/classes/sun/misc/JavaNetAccess.java
diff --git a/jdk/src/share/classes/sun/misc/JavaNetHttpCookieAccess.java b/jdk/src/java.base/share/classes/sun/misc/JavaNetHttpCookieAccess.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/JavaNetHttpCookieAccess.java
rename to jdk/src/java.base/share/classes/sun/misc/JavaNetHttpCookieAccess.java
diff --git a/jdk/src/share/classes/sun/misc/JavaNioAccess.java b/jdk/src/java.base/share/classes/sun/misc/JavaNioAccess.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/JavaNioAccess.java
rename to jdk/src/java.base/share/classes/sun/misc/JavaNioAccess.java
diff --git a/jdk/src/share/classes/sun/misc/JavaSecurityAccess.java b/jdk/src/java.base/share/classes/sun/misc/JavaSecurityAccess.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/JavaSecurityAccess.java
rename to jdk/src/java.base/share/classes/sun/misc/JavaSecurityAccess.java
diff --git a/jdk/src/share/classes/sun/misc/JavaSecurityProtectionDomainAccess.java b/jdk/src/java.base/share/classes/sun/misc/JavaSecurityProtectionDomainAccess.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/JavaSecurityProtectionDomainAccess.java
rename to jdk/src/java.base/share/classes/sun/misc/JavaSecurityProtectionDomainAccess.java
diff --git a/jdk/src/share/classes/sun/misc/JavaUtilJarAccess.java b/jdk/src/java.base/share/classes/sun/misc/JavaUtilJarAccess.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/JavaUtilJarAccess.java
rename to jdk/src/java.base/share/classes/sun/misc/JavaUtilJarAccess.java
diff --git a/jdk/src/share/classes/sun/misc/JavaUtilZipFileAccess.java b/jdk/src/java.base/share/classes/sun/misc/JavaUtilZipFileAccess.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/JavaUtilZipFileAccess.java
rename to jdk/src/java.base/share/classes/sun/misc/JavaUtilZipFileAccess.java
diff --git a/jdk/src/share/classes/sun/misc/LRUCache.java b/jdk/src/java.base/share/classes/sun/misc/LRUCache.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/LRUCache.java
rename to jdk/src/java.base/share/classes/sun/misc/LRUCache.java
diff --git a/jdk/src/share/classes/sun/misc/Launcher.java b/jdk/src/java.base/share/classes/sun/misc/Launcher.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/Launcher.java
rename to jdk/src/java.base/share/classes/sun/misc/Launcher.java
diff --git a/jdk/src/share/classes/sun/misc/Lock.java b/jdk/src/java.base/share/classes/sun/misc/Lock.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/Lock.java
rename to jdk/src/java.base/share/classes/sun/misc/Lock.java
diff --git a/jdk/src/share/classes/sun/misc/MessageUtils.java b/jdk/src/java.base/share/classes/sun/misc/MessageUtils.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/MessageUtils.java
rename to jdk/src/java.base/share/classes/sun/misc/MessageUtils.java
diff --git a/jdk/src/share/classes/sun/misc/MetaIndex.java b/jdk/src/java.base/share/classes/sun/misc/MetaIndex.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/MetaIndex.java
rename to jdk/src/java.base/share/classes/sun/misc/MetaIndex.java
diff --git a/jdk/src/share/classes/sun/misc/NativeSignalHandler.java b/jdk/src/java.base/share/classes/sun/misc/NativeSignalHandler.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/NativeSignalHandler.java
rename to jdk/src/java.base/share/classes/sun/misc/NativeSignalHandler.java
diff --git a/jdk/src/share/classes/sun/misc/Perf.java b/jdk/src/java.base/share/classes/sun/misc/Perf.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/Perf.java
rename to jdk/src/java.base/share/classes/sun/misc/Perf.java
diff --git a/jdk/src/share/classes/sun/misc/PerfCounter.java b/jdk/src/java.base/share/classes/sun/misc/PerfCounter.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/PerfCounter.java
rename to jdk/src/java.base/share/classes/sun/misc/PerfCounter.java
diff --git a/jdk/src/share/classes/sun/misc/PerformanceLogger.java b/jdk/src/java.base/share/classes/sun/misc/PerformanceLogger.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/PerformanceLogger.java
rename to jdk/src/java.base/share/classes/sun/misc/PerformanceLogger.java
diff --git a/jdk/src/share/classes/sun/misc/ProxyGenerator.java b/jdk/src/java.base/share/classes/sun/misc/ProxyGenerator.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/ProxyGenerator.java
rename to jdk/src/java.base/share/classes/sun/misc/ProxyGenerator.java
diff --git a/jdk/src/share/classes/sun/misc/Queue.java b/jdk/src/java.base/share/classes/sun/misc/Queue.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/Queue.java
rename to jdk/src/java.base/share/classes/sun/misc/Queue.java
diff --git a/jdk/src/share/classes/sun/misc/Request.java b/jdk/src/java.base/share/classes/sun/misc/Request.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/Request.java
rename to jdk/src/java.base/share/classes/sun/misc/Request.java
diff --git a/jdk/src/share/classes/sun/misc/RequestProcessor.java b/jdk/src/java.base/share/classes/sun/misc/RequestProcessor.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/RequestProcessor.java
rename to jdk/src/java.base/share/classes/sun/misc/RequestProcessor.java
diff --git a/jdk/src/share/classes/sun/misc/Resource.java b/jdk/src/java.base/share/classes/sun/misc/Resource.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/Resource.java
rename to jdk/src/java.base/share/classes/sun/misc/Resource.java
diff --git a/jdk/src/share/classes/sun/misc/SharedSecrets.java b/jdk/src/java.base/share/classes/sun/misc/SharedSecrets.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/SharedSecrets.java
rename to jdk/src/java.base/share/classes/sun/misc/SharedSecrets.java
diff --git a/jdk/src/share/classes/sun/misc/Signal.java b/jdk/src/java.base/share/classes/sun/misc/Signal.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/Signal.java
rename to jdk/src/java.base/share/classes/sun/misc/Signal.java
diff --git a/jdk/src/share/classes/sun/misc/SignalHandler.java b/jdk/src/java.base/share/classes/sun/misc/SignalHandler.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/SignalHandler.java
rename to jdk/src/java.base/share/classes/sun/misc/SignalHandler.java
diff --git a/jdk/src/share/classes/sun/misc/SoftCache.java b/jdk/src/java.base/share/classes/sun/misc/SoftCache.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/SoftCache.java
rename to jdk/src/java.base/share/classes/sun/misc/SoftCache.java
diff --git a/jdk/src/share/classes/sun/misc/UCDecoder.java b/jdk/src/java.base/share/classes/sun/misc/UCDecoder.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/UCDecoder.java
rename to jdk/src/java.base/share/classes/sun/misc/UCDecoder.java
diff --git a/jdk/src/share/classes/sun/misc/UCEncoder.java b/jdk/src/java.base/share/classes/sun/misc/UCEncoder.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/UCEncoder.java
rename to jdk/src/java.base/share/classes/sun/misc/UCEncoder.java
diff --git a/jdk/src/share/classes/sun/misc/URLClassPath.java b/jdk/src/java.base/share/classes/sun/misc/URLClassPath.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/URLClassPath.java
rename to jdk/src/java.base/share/classes/sun/misc/URLClassPath.java
diff --git a/jdk/src/share/classes/sun/misc/UUDecoder.java b/jdk/src/java.base/share/classes/sun/misc/UUDecoder.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/UUDecoder.java
rename to jdk/src/java.base/share/classes/sun/misc/UUDecoder.java
diff --git a/jdk/src/share/classes/sun/misc/UUEncoder.java b/jdk/src/java.base/share/classes/sun/misc/UUEncoder.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/UUEncoder.java
rename to jdk/src/java.base/share/classes/sun/misc/UUEncoder.java
diff --git a/jdk/src/share/classes/sun/misc/Unsafe.java b/jdk/src/java.base/share/classes/sun/misc/Unsafe.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/Unsafe.java
rename to jdk/src/java.base/share/classes/sun/misc/Unsafe.java
diff --git a/jdk/src/share/classes/sun/misc/VM.java b/jdk/src/java.base/share/classes/sun/misc/VM.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/VM.java
rename to jdk/src/java.base/share/classes/sun/misc/VM.java
diff --git a/jdk/src/share/classes/sun/misc/VMNotification.java b/jdk/src/java.base/share/classes/sun/misc/VMNotification.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/VMNotification.java
rename to jdk/src/java.base/share/classes/sun/misc/VMNotification.java
diff --git a/jdk/src/share/classes/sun/misc/VMSupport.java b/jdk/src/java.base/share/classes/sun/misc/VMSupport.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/VMSupport.java
rename to jdk/src/java.base/share/classes/sun/misc/VMSupport.java
diff --git a/jdk/src/share/classes/sun/misc/Version.java.template b/jdk/src/java.base/share/classes/sun/misc/Version.java.template
similarity index 100%
rename from jdk/src/share/classes/sun/misc/Version.java.template
rename to jdk/src/java.base/share/classes/sun/misc/Version.java.template
diff --git a/jdk/src/share/classes/sun/misc/resources/Messages.java b/jdk/src/java.base/share/classes/sun/misc/resources/Messages.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/resources/Messages.java
rename to jdk/src/java.base/share/classes/sun/misc/resources/Messages.java
diff --git a/jdk/src/share/classes/sun/misc/resources/Messages_de.java b/jdk/src/java.base/share/classes/sun/misc/resources/Messages_de.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/resources/Messages_de.java
rename to jdk/src/java.base/share/classes/sun/misc/resources/Messages_de.java
diff --git a/jdk/src/share/classes/sun/misc/resources/Messages_es.java b/jdk/src/java.base/share/classes/sun/misc/resources/Messages_es.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/resources/Messages_es.java
rename to jdk/src/java.base/share/classes/sun/misc/resources/Messages_es.java
diff --git a/jdk/src/share/classes/sun/misc/resources/Messages_fr.java b/jdk/src/java.base/share/classes/sun/misc/resources/Messages_fr.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/resources/Messages_fr.java
rename to jdk/src/java.base/share/classes/sun/misc/resources/Messages_fr.java
diff --git a/jdk/src/share/classes/sun/misc/resources/Messages_it.java b/jdk/src/java.base/share/classes/sun/misc/resources/Messages_it.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/resources/Messages_it.java
rename to jdk/src/java.base/share/classes/sun/misc/resources/Messages_it.java
diff --git a/jdk/src/share/classes/sun/misc/resources/Messages_ja.java b/jdk/src/java.base/share/classes/sun/misc/resources/Messages_ja.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/resources/Messages_ja.java
rename to jdk/src/java.base/share/classes/sun/misc/resources/Messages_ja.java
diff --git a/jdk/src/share/classes/sun/misc/resources/Messages_ko.java b/jdk/src/java.base/share/classes/sun/misc/resources/Messages_ko.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/resources/Messages_ko.java
rename to jdk/src/java.base/share/classes/sun/misc/resources/Messages_ko.java
diff --git a/jdk/src/share/classes/sun/misc/resources/Messages_pt_BR.java b/jdk/src/java.base/share/classes/sun/misc/resources/Messages_pt_BR.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/resources/Messages_pt_BR.java
rename to jdk/src/java.base/share/classes/sun/misc/resources/Messages_pt_BR.java
diff --git a/jdk/src/share/classes/sun/misc/resources/Messages_sv.java b/jdk/src/java.base/share/classes/sun/misc/resources/Messages_sv.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/resources/Messages_sv.java
rename to jdk/src/java.base/share/classes/sun/misc/resources/Messages_sv.java
diff --git a/jdk/src/share/classes/sun/misc/resources/Messages_zh_CN.java b/jdk/src/java.base/share/classes/sun/misc/resources/Messages_zh_CN.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/resources/Messages_zh_CN.java
rename to jdk/src/java.base/share/classes/sun/misc/resources/Messages_zh_CN.java
diff --git a/jdk/src/share/classes/sun/misc/resources/Messages_zh_TW.java b/jdk/src/java.base/share/classes/sun/misc/resources/Messages_zh_TW.java
similarity index 100%
rename from jdk/src/share/classes/sun/misc/resources/Messages_zh_TW.java
rename to jdk/src/java.base/share/classes/sun/misc/resources/Messages_zh_TW.java
diff --git a/jdk/src/share/classes/sun/net/ApplicationProxy.java b/jdk/src/java.base/share/classes/sun/net/ApplicationProxy.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/ApplicationProxy.java
rename to jdk/src/java.base/share/classes/sun/net/ApplicationProxy.java
diff --git a/jdk/src/share/classes/sun/net/ConnectionResetException.java b/jdk/src/java.base/share/classes/sun/net/ConnectionResetException.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/ConnectionResetException.java
rename to jdk/src/java.base/share/classes/sun/net/ConnectionResetException.java
diff --git a/jdk/src/share/classes/sun/net/ExtendedOptionsImpl.java b/jdk/src/java.base/share/classes/sun/net/ExtendedOptionsImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/ExtendedOptionsImpl.java
rename to jdk/src/java.base/share/classes/sun/net/ExtendedOptionsImpl.java
diff --git a/jdk/src/share/classes/sun/net/InetAddressCachePolicy.java b/jdk/src/java.base/share/classes/sun/net/InetAddressCachePolicy.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/InetAddressCachePolicy.java
rename to jdk/src/java.base/share/classes/sun/net/InetAddressCachePolicy.java
diff --git a/jdk/src/share/classes/sun/net/NetProperties.java b/jdk/src/java.base/share/classes/sun/net/NetProperties.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/NetProperties.java
rename to jdk/src/java.base/share/classes/sun/net/NetProperties.java
diff --git a/jdk/src/share/classes/sun/net/NetworkClient.java b/jdk/src/java.base/share/classes/sun/net/NetworkClient.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/NetworkClient.java
rename to jdk/src/java.base/share/classes/sun/net/NetworkClient.java
diff --git a/jdk/src/share/classes/sun/net/NetworkServer.java b/jdk/src/java.base/share/classes/sun/net/NetworkServer.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/NetworkServer.java
rename to jdk/src/java.base/share/classes/sun/net/NetworkServer.java
diff --git a/jdk/src/share/classes/sun/net/ProgressEvent.java b/jdk/src/java.base/share/classes/sun/net/ProgressEvent.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/ProgressEvent.java
rename to jdk/src/java.base/share/classes/sun/net/ProgressEvent.java
diff --git a/jdk/src/share/classes/sun/net/ProgressListener.java b/jdk/src/java.base/share/classes/sun/net/ProgressListener.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/ProgressListener.java
rename to jdk/src/java.base/share/classes/sun/net/ProgressListener.java
diff --git a/jdk/src/share/classes/sun/net/ProgressMeteringPolicy.java b/jdk/src/java.base/share/classes/sun/net/ProgressMeteringPolicy.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/ProgressMeteringPolicy.java
rename to jdk/src/java.base/share/classes/sun/net/ProgressMeteringPolicy.java
diff --git a/jdk/src/share/classes/sun/net/ProgressMonitor.java b/jdk/src/java.base/share/classes/sun/net/ProgressMonitor.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/ProgressMonitor.java
rename to jdk/src/java.base/share/classes/sun/net/ProgressMonitor.java
diff --git a/jdk/src/share/classes/sun/net/ProgressSource.java b/jdk/src/java.base/share/classes/sun/net/ProgressSource.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/ProgressSource.java
rename to jdk/src/java.base/share/classes/sun/net/ProgressSource.java
diff --git a/jdk/src/share/classes/sun/net/RegisteredDomain.java b/jdk/src/java.base/share/classes/sun/net/RegisteredDomain.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/RegisteredDomain.java
rename to jdk/src/java.base/share/classes/sun/net/RegisteredDomain.java
diff --git a/jdk/src/share/classes/sun/net/ResourceManager.java b/jdk/src/java.base/share/classes/sun/net/ResourceManager.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/ResourceManager.java
rename to jdk/src/java.base/share/classes/sun/net/ResourceManager.java
diff --git a/jdk/src/share/classes/sun/net/SocksProxy.java b/jdk/src/java.base/share/classes/sun/net/SocksProxy.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/SocksProxy.java
rename to jdk/src/java.base/share/classes/sun/net/SocksProxy.java
diff --git a/jdk/src/share/classes/sun/net/TelnetInputStream.java b/jdk/src/java.base/share/classes/sun/net/TelnetInputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/TelnetInputStream.java
rename to jdk/src/java.base/share/classes/sun/net/TelnetInputStream.java
diff --git a/jdk/src/share/classes/sun/net/TelnetOutputStream.java b/jdk/src/java.base/share/classes/sun/net/TelnetOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/TelnetOutputStream.java
rename to jdk/src/java.base/share/classes/sun/net/TelnetOutputStream.java
diff --git a/jdk/src/share/classes/sun/net/TelnetProtocolException.java b/jdk/src/java.base/share/classes/sun/net/TelnetProtocolException.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/TelnetProtocolException.java
rename to jdk/src/java.base/share/classes/sun/net/TelnetProtocolException.java
diff --git a/jdk/src/share/classes/sun/net/TransferProtocolClient.java b/jdk/src/java.base/share/classes/sun/net/TransferProtocolClient.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/TransferProtocolClient.java
rename to jdk/src/java.base/share/classes/sun/net/TransferProtocolClient.java
diff --git a/jdk/src/share/classes/sun/net/URLCanonicalizer.java b/jdk/src/java.base/share/classes/sun/net/URLCanonicalizer.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/URLCanonicalizer.java
rename to jdk/src/java.base/share/classes/sun/net/URLCanonicalizer.java
diff --git a/jdk/src/share/classes/sun/net/dns/ResolverConfiguration.java b/jdk/src/java.base/share/classes/sun/net/dns/ResolverConfiguration.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/dns/ResolverConfiguration.java
rename to jdk/src/java.base/share/classes/sun/net/dns/ResolverConfiguration.java
diff --git a/jdk/src/share/classes/sun/net/ftp/FtpClient.java b/jdk/src/java.base/share/classes/sun/net/ftp/FtpClient.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/ftp/FtpClient.java
rename to jdk/src/java.base/share/classes/sun/net/ftp/FtpClient.java
diff --git a/jdk/src/share/classes/sun/net/ftp/FtpClientProvider.java b/jdk/src/java.base/share/classes/sun/net/ftp/FtpClientProvider.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/ftp/FtpClientProvider.java
rename to jdk/src/java.base/share/classes/sun/net/ftp/FtpClientProvider.java
diff --git a/jdk/src/share/classes/sun/net/ftp/FtpDirEntry.java b/jdk/src/java.base/share/classes/sun/net/ftp/FtpDirEntry.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/ftp/FtpDirEntry.java
rename to jdk/src/java.base/share/classes/sun/net/ftp/FtpDirEntry.java
diff --git a/jdk/src/share/classes/sun/net/ftp/FtpDirParser.java b/jdk/src/java.base/share/classes/sun/net/ftp/FtpDirParser.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/ftp/FtpDirParser.java
rename to jdk/src/java.base/share/classes/sun/net/ftp/FtpDirParser.java
diff --git a/jdk/src/share/classes/sun/net/ftp/FtpLoginException.java b/jdk/src/java.base/share/classes/sun/net/ftp/FtpLoginException.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/ftp/FtpLoginException.java
rename to jdk/src/java.base/share/classes/sun/net/ftp/FtpLoginException.java
diff --git a/jdk/src/share/classes/sun/net/ftp/FtpProtocolException.java b/jdk/src/java.base/share/classes/sun/net/ftp/FtpProtocolException.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/ftp/FtpProtocolException.java
rename to jdk/src/java.base/share/classes/sun/net/ftp/FtpProtocolException.java
diff --git a/jdk/src/share/classes/sun/net/ftp/FtpReplyCode.java b/jdk/src/java.base/share/classes/sun/net/ftp/FtpReplyCode.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/ftp/FtpReplyCode.java
rename to jdk/src/java.base/share/classes/sun/net/ftp/FtpReplyCode.java
diff --git a/jdk/src/share/classes/sun/net/ftp/impl/DefaultFtpClientProvider.java b/jdk/src/java.base/share/classes/sun/net/ftp/impl/DefaultFtpClientProvider.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/ftp/impl/DefaultFtpClientProvider.java
rename to jdk/src/java.base/share/classes/sun/net/ftp/impl/DefaultFtpClientProvider.java
diff --git a/jdk/src/share/classes/sun/net/ftp/impl/FtpClient.java b/jdk/src/java.base/share/classes/sun/net/ftp/impl/FtpClient.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/ftp/impl/FtpClient.java
rename to jdk/src/java.base/share/classes/sun/net/ftp/impl/FtpClient.java
diff --git a/jdk/src/share/classes/sun/net/idn/Punycode.java b/jdk/src/java.base/share/classes/sun/net/idn/Punycode.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/idn/Punycode.java
rename to jdk/src/java.base/share/classes/sun/net/idn/Punycode.java
diff --git a/jdk/src/share/classes/sun/net/idn/StringPrep.java b/jdk/src/java.base/share/classes/sun/net/idn/StringPrep.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/idn/StringPrep.java
rename to jdk/src/java.base/share/classes/sun/net/idn/StringPrep.java
diff --git a/jdk/src/share/classes/sun/net/idn/StringPrepDataReader.java b/jdk/src/java.base/share/classes/sun/net/idn/StringPrepDataReader.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/idn/StringPrepDataReader.java
rename to jdk/src/java.base/share/classes/sun/net/idn/StringPrepDataReader.java
diff --git a/jdk/src/share/classes/sun/net/idn/UCharacterDirection.java b/jdk/src/java.base/share/classes/sun/net/idn/UCharacterDirection.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/idn/UCharacterDirection.java
rename to jdk/src/java.base/share/classes/sun/net/idn/UCharacterDirection.java
diff --git a/jdk/src/share/classes/sun/net/idn/UCharacterEnums.java b/jdk/src/java.base/share/classes/sun/net/idn/UCharacterEnums.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/idn/UCharacterEnums.java
rename to jdk/src/java.base/share/classes/sun/net/idn/UCharacterEnums.java
diff --git a/jdk/src/share/classes/sun/net/idn/uidna.spp b/jdk/src/java.base/share/classes/sun/net/idn/uidna.spp
similarity index 100%
rename from jdk/src/share/classes/sun/net/idn/uidna.spp
rename to jdk/src/java.base/share/classes/sun/net/idn/uidna.spp
diff --git a/jdk/src/share/classes/sun/net/sdp/SdpSupport.java b/jdk/src/java.base/share/classes/sun/net/sdp/SdpSupport.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/sdp/SdpSupport.java
rename to jdk/src/java.base/share/classes/sun/net/sdp/SdpSupport.java
diff --git a/jdk/src/share/classes/sun/net/smtp/SmtpClient.java b/jdk/src/java.base/share/classes/sun/net/smtp/SmtpClient.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/smtp/SmtpClient.java
rename to jdk/src/java.base/share/classes/sun/net/smtp/SmtpClient.java
diff --git a/jdk/src/share/classes/sun/net/smtp/SmtpProtocolException.java b/jdk/src/java.base/share/classes/sun/net/smtp/SmtpProtocolException.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/smtp/SmtpProtocolException.java
rename to jdk/src/java.base/share/classes/sun/net/smtp/SmtpProtocolException.java
diff --git a/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java b/jdk/src/java.base/share/classes/sun/net/spi/DefaultProxySelector.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java
rename to jdk/src/java.base/share/classes/sun/net/spi/DefaultProxySelector.java
diff --git a/jdk/src/share/classes/sun/net/spi/nameservice/NameService.java b/jdk/src/java.base/share/classes/sun/net/spi/nameservice/NameService.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/spi/nameservice/NameService.java
rename to jdk/src/java.base/share/classes/sun/net/spi/nameservice/NameService.java
diff --git a/jdk/src/share/classes/sun/net/spi/nameservice/NameServiceDescriptor.java b/jdk/src/java.base/share/classes/sun/net/spi/nameservice/NameServiceDescriptor.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/spi/nameservice/NameServiceDescriptor.java
rename to jdk/src/java.base/share/classes/sun/net/spi/nameservice/NameServiceDescriptor.java
diff --git a/jdk/src/share/classes/sun/net/util/IPAddressUtil.java b/jdk/src/java.base/share/classes/sun/net/util/IPAddressUtil.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/util/IPAddressUtil.java
rename to jdk/src/java.base/share/classes/sun/net/util/IPAddressUtil.java
diff --git a/jdk/src/share/classes/sun/net/util/URLUtil.java b/jdk/src/java.base/share/classes/sun/net/util/URLUtil.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/util/URLUtil.java
rename to jdk/src/java.base/share/classes/sun/net/util/URLUtil.java
diff --git a/jdk/src/share/classes/sun/net/www/ApplicationLaunchException.java b/jdk/src/java.base/share/classes/sun/net/www/ApplicationLaunchException.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/ApplicationLaunchException.java
rename to jdk/src/java.base/share/classes/sun/net/www/ApplicationLaunchException.java
diff --git a/jdk/src/share/classes/sun/net/www/HeaderParser.java b/jdk/src/java.base/share/classes/sun/net/www/HeaderParser.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/HeaderParser.java
rename to jdk/src/java.base/share/classes/sun/net/www/HeaderParser.java
diff --git a/jdk/src/share/classes/sun/net/www/MessageHeader.java b/jdk/src/java.base/share/classes/sun/net/www/MessageHeader.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/MessageHeader.java
rename to jdk/src/java.base/share/classes/sun/net/www/MessageHeader.java
diff --git a/jdk/src/share/classes/sun/net/www/MeteredStream.java b/jdk/src/java.base/share/classes/sun/net/www/MeteredStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/MeteredStream.java
rename to jdk/src/java.base/share/classes/sun/net/www/MeteredStream.java
diff --git a/jdk/src/share/classes/sun/net/www/MimeEntry.java b/jdk/src/java.base/share/classes/sun/net/www/MimeEntry.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/MimeEntry.java
rename to jdk/src/java.base/share/classes/sun/net/www/MimeEntry.java
diff --git a/jdk/src/share/classes/sun/net/www/MimeLauncher.java b/jdk/src/java.base/share/classes/sun/net/www/MimeLauncher.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/MimeLauncher.java
rename to jdk/src/java.base/share/classes/sun/net/www/MimeLauncher.java
diff --git a/jdk/src/share/classes/sun/net/www/MimeTable.java b/jdk/src/java.base/share/classes/sun/net/www/MimeTable.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/MimeTable.java
rename to jdk/src/java.base/share/classes/sun/net/www/MimeTable.java
diff --git a/jdk/src/share/classes/sun/net/www/ParseUtil.java b/jdk/src/java.base/share/classes/sun/net/www/ParseUtil.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/ParseUtil.java
rename to jdk/src/java.base/share/classes/sun/net/www/ParseUtil.java
diff --git a/jdk/src/share/classes/sun/net/www/URLConnection.java b/jdk/src/java.base/share/classes/sun/net/www/URLConnection.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/URLConnection.java
rename to jdk/src/java.base/share/classes/sun/net/www/URLConnection.java
diff --git a/jdk/src/share/classes/sun/net/www/content/text/Generic.java b/jdk/src/java.base/share/classes/sun/net/www/content/text/Generic.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/content/text/Generic.java
rename to jdk/src/java.base/share/classes/sun/net/www/content/text/Generic.java
diff --git a/jdk/src/share/classes/sun/net/www/content/text/PlainTextInputStream.java b/jdk/src/java.base/share/classes/sun/net/www/content/text/PlainTextInputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/content/text/PlainTextInputStream.java
rename to jdk/src/java.base/share/classes/sun/net/www/content/text/PlainTextInputStream.java
diff --git a/jdk/src/share/classes/sun/net/www/content/text/plain.java b/jdk/src/java.base/share/classes/sun/net/www/content/text/plain.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/content/text/plain.java
rename to jdk/src/java.base/share/classes/sun/net/www/content/text/plain.java
diff --git a/jdk/src/share/classes/sun/net/www/http/ChunkedInputStream.java b/jdk/src/java.base/share/classes/sun/net/www/http/ChunkedInputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/http/ChunkedInputStream.java
rename to jdk/src/java.base/share/classes/sun/net/www/http/ChunkedInputStream.java
diff --git a/jdk/src/share/classes/sun/net/www/http/ChunkedOutputStream.java b/jdk/src/java.base/share/classes/sun/net/www/http/ChunkedOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/http/ChunkedOutputStream.java
rename to jdk/src/java.base/share/classes/sun/net/www/http/ChunkedOutputStream.java
diff --git a/jdk/src/share/classes/sun/net/www/http/HttpCapture.java b/jdk/src/java.base/share/classes/sun/net/www/http/HttpCapture.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/http/HttpCapture.java
rename to jdk/src/java.base/share/classes/sun/net/www/http/HttpCapture.java
diff --git a/jdk/src/share/classes/sun/net/www/http/HttpCaptureInputStream.java b/jdk/src/java.base/share/classes/sun/net/www/http/HttpCaptureInputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/http/HttpCaptureInputStream.java
rename to jdk/src/java.base/share/classes/sun/net/www/http/HttpCaptureInputStream.java
diff --git a/jdk/src/share/classes/sun/net/www/http/HttpCaptureOutputStream.java b/jdk/src/java.base/share/classes/sun/net/www/http/HttpCaptureOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/http/HttpCaptureOutputStream.java
rename to jdk/src/java.base/share/classes/sun/net/www/http/HttpCaptureOutputStream.java
diff --git a/jdk/src/share/classes/sun/net/www/http/HttpClient.java b/jdk/src/java.base/share/classes/sun/net/www/http/HttpClient.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/http/HttpClient.java
rename to jdk/src/java.base/share/classes/sun/net/www/http/HttpClient.java
diff --git a/jdk/src/share/classes/sun/net/www/http/Hurryable.java b/jdk/src/java.base/share/classes/sun/net/www/http/Hurryable.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/http/Hurryable.java
rename to jdk/src/java.base/share/classes/sun/net/www/http/Hurryable.java
diff --git a/jdk/src/share/classes/sun/net/www/http/KeepAliveCache.java b/jdk/src/java.base/share/classes/sun/net/www/http/KeepAliveCache.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/http/KeepAliveCache.java
rename to jdk/src/java.base/share/classes/sun/net/www/http/KeepAliveCache.java
diff --git a/jdk/src/share/classes/sun/net/www/http/KeepAliveCleanerEntry.java b/jdk/src/java.base/share/classes/sun/net/www/http/KeepAliveCleanerEntry.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/http/KeepAliveCleanerEntry.java
rename to jdk/src/java.base/share/classes/sun/net/www/http/KeepAliveCleanerEntry.java
diff --git a/jdk/src/share/classes/sun/net/www/http/KeepAliveStream.java b/jdk/src/java.base/share/classes/sun/net/www/http/KeepAliveStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/http/KeepAliveStream.java
rename to jdk/src/java.base/share/classes/sun/net/www/http/KeepAliveStream.java
diff --git a/jdk/src/share/classes/sun/net/www/http/KeepAliveStreamCleaner.java b/jdk/src/java.base/share/classes/sun/net/www/http/KeepAliveStreamCleaner.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/http/KeepAliveStreamCleaner.java
rename to jdk/src/java.base/share/classes/sun/net/www/http/KeepAliveStreamCleaner.java
diff --git a/jdk/src/share/classes/sun/net/www/http/PosterOutputStream.java b/jdk/src/java.base/share/classes/sun/net/www/http/PosterOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/http/PosterOutputStream.java
rename to jdk/src/java.base/share/classes/sun/net/www/http/PosterOutputStream.java
diff --git a/jdk/src/share/classes/sun/net/www/protocol/file/FileURLConnection.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/file/FileURLConnection.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/protocol/file/FileURLConnection.java
rename to jdk/src/java.base/share/classes/sun/net/www/protocol/file/FileURLConnection.java
diff --git a/jdk/src/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java
rename to jdk/src/java.base/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java
diff --git a/jdk/src/share/classes/sun/net/www/protocol/ftp/Handler.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/ftp/Handler.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/protocol/ftp/Handler.java
rename to jdk/src/java.base/share/classes/sun/net/www/protocol/ftp/Handler.java
diff --git a/jdk/src/share/classes/sun/net/www/protocol/http/AuthCache.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthCache.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/protocol/http/AuthCache.java
rename to jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthCache.java
diff --git a/jdk/src/share/classes/sun/net/www/protocol/http/AuthCacheImpl.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthCacheImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/protocol/http/AuthCacheImpl.java
rename to jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthCacheImpl.java
diff --git a/jdk/src/share/classes/sun/net/www/protocol/http/AuthCacheValue.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthCacheValue.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/protocol/http/AuthCacheValue.java
rename to jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthCacheValue.java
diff --git a/jdk/src/share/classes/sun/net/www/protocol/http/AuthScheme.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthScheme.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/protocol/http/AuthScheme.java
rename to jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthScheme.java
diff --git a/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationHeader.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthenticationHeader.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationHeader.java
rename to jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthenticationHeader.java
diff --git a/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java
rename to jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java
diff --git a/jdk/src/share/classes/sun/net/www/protocol/http/BasicAuthentication.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/BasicAuthentication.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/protocol/http/BasicAuthentication.java
rename to jdk/src/java.base/share/classes/sun/net/www/protocol/http/BasicAuthentication.java
diff --git a/jdk/src/share/classes/sun/net/www/protocol/http/DigestAuthentication.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/DigestAuthentication.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/protocol/http/DigestAuthentication.java
rename to jdk/src/java.base/share/classes/sun/net/www/protocol/http/DigestAuthentication.java
diff --git a/jdk/src/share/classes/sun/net/www/protocol/http/Handler.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/Handler.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/protocol/http/Handler.java
rename to jdk/src/java.base/share/classes/sun/net/www/protocol/http/Handler.java
diff --git a/jdk/src/share/classes/sun/net/www/protocol/http/HttpAuthenticator.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/HttpAuthenticator.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/protocol/http/HttpAuthenticator.java
rename to jdk/src/java.base/share/classes/sun/net/www/protocol/http/HttpAuthenticator.java
diff --git a/jdk/src/share/classes/sun/net/www/protocol/http/HttpCallerInfo.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/HttpCallerInfo.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/protocol/http/HttpCallerInfo.java
rename to jdk/src/java.base/share/classes/sun/net/www/protocol/http/HttpCallerInfo.java
diff --git a/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
rename to jdk/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
diff --git a/jdk/src/share/classes/sun/net/www/protocol/http/NTLMAuthenticationProxy.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/NTLMAuthenticationProxy.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/protocol/http/NTLMAuthenticationProxy.java
rename to jdk/src/java.base/share/classes/sun/net/www/protocol/http/NTLMAuthenticationProxy.java
diff --git a/jdk/src/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java
rename to jdk/src/java.base/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java
diff --git a/jdk/src/share/classes/sun/net/www/protocol/http/Negotiator.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/Negotiator.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/protocol/http/Negotiator.java
rename to jdk/src/java.base/share/classes/sun/net/www/protocol/http/Negotiator.java
diff --git a/jdk/src/share/classes/sun/net/www/protocol/http/ntlm/NTLMAuthenticationCallback.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/ntlm/NTLMAuthenticationCallback.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/protocol/http/ntlm/NTLMAuthenticationCallback.java
rename to jdk/src/java.base/share/classes/sun/net/www/protocol/http/ntlm/NTLMAuthenticationCallback.java
diff --git a/jdk/src/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java
rename to jdk/src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java
diff --git a/jdk/src/share/classes/sun/net/www/protocol/https/DefaultHostnameVerifier.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/https/DefaultHostnameVerifier.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/protocol/https/DefaultHostnameVerifier.java
rename to jdk/src/java.base/share/classes/sun/net/www/protocol/https/DefaultHostnameVerifier.java
diff --git a/jdk/src/share/classes/sun/net/www/protocol/https/DelegateHttpsURLConnection.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/https/DelegateHttpsURLConnection.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/protocol/https/DelegateHttpsURLConnection.java
rename to jdk/src/java.base/share/classes/sun/net/www/protocol/https/DelegateHttpsURLConnection.java
diff --git a/jdk/src/share/classes/sun/net/www/protocol/https/Handler.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/https/Handler.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/protocol/https/Handler.java
rename to jdk/src/java.base/share/classes/sun/net/www/protocol/https/Handler.java
diff --git a/jdk/src/share/classes/sun/net/www/protocol/https/HttpsClient.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/https/HttpsClient.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/protocol/https/HttpsClient.java
rename to jdk/src/java.base/share/classes/sun/net/www/protocol/https/HttpsClient.java
diff --git a/jdk/src/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java
rename to jdk/src/java.base/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java
diff --git a/jdk/src/share/classes/sun/net/www/protocol/jar/Handler.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/jar/Handler.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/protocol/jar/Handler.java
rename to jdk/src/java.base/share/classes/sun/net/www/protocol/jar/Handler.java
diff --git a/jdk/src/share/classes/sun/net/www/protocol/jar/JarURLConnection.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/jar/JarURLConnection.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/protocol/jar/JarURLConnection.java
rename to jdk/src/java.base/share/classes/sun/net/www/protocol/jar/JarURLConnection.java
diff --git a/jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/jar/URLJarFile.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java
rename to jdk/src/java.base/share/classes/sun/net/www/protocol/jar/URLJarFile.java
diff --git a/jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFileCallBack.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/jar/URLJarFileCallBack.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFileCallBack.java
rename to jdk/src/java.base/share/classes/sun/net/www/protocol/jar/URLJarFileCallBack.java
diff --git a/jdk/src/share/classes/sun/net/www/protocol/mailto/Handler.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/mailto/Handler.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/protocol/mailto/Handler.java
rename to jdk/src/java.base/share/classes/sun/net/www/protocol/mailto/Handler.java
diff --git a/jdk/src/share/classes/sun/net/www/protocol/mailto/MailToURLConnection.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/mailto/MailToURLConnection.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/protocol/mailto/MailToURLConnection.java
rename to jdk/src/java.base/share/classes/sun/net/www/protocol/mailto/MailToURLConnection.java
diff --git a/jdk/src/share/classes/sun/net/www/protocol/netdoc/Handler.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/netdoc/Handler.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/protocol/netdoc/Handler.java
rename to jdk/src/java.base/share/classes/sun/net/www/protocol/netdoc/Handler.java
diff --git a/jdk/src/share/classes/sun/nio/ByteBuffered.java b/jdk/src/java.base/share/classes/sun/nio/ByteBuffered.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ByteBuffered.java
rename to jdk/src/java.base/share/classes/sun/nio/ByteBuffered.java
diff --git a/jdk/src/share/classes/sun/nio/ch/AbstractPollArrayWrapper.java b/jdk/src/java.base/share/classes/sun/nio/ch/AbstractPollArrayWrapper.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/AbstractPollArrayWrapper.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/AbstractPollArrayWrapper.java
diff --git a/jdk/src/share/classes/sun/nio/ch/AbstractPollSelectorImpl.java b/jdk/src/java.base/share/classes/sun/nio/ch/AbstractPollSelectorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/AbstractPollSelectorImpl.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/AbstractPollSelectorImpl.java
diff --git a/jdk/src/share/classes/sun/nio/ch/AllocatedNativeObject.java b/jdk/src/java.base/share/classes/sun/nio/ch/AllocatedNativeObject.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/AllocatedNativeObject.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/AllocatedNativeObject.java
diff --git a/jdk/src/share/classes/sun/nio/ch/AsynchronousChannelGroupImpl.java b/jdk/src/java.base/share/classes/sun/nio/ch/AsynchronousChannelGroupImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/AsynchronousChannelGroupImpl.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/AsynchronousChannelGroupImpl.java
diff --git a/jdk/src/share/classes/sun/nio/ch/AsynchronousFileChannelImpl.java b/jdk/src/java.base/share/classes/sun/nio/ch/AsynchronousFileChannelImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/AsynchronousFileChannelImpl.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/AsynchronousFileChannelImpl.java
diff --git a/jdk/src/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java b/jdk/src/java.base/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java
diff --git a/jdk/src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java b/jdk/src/java.base/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java
diff --git a/jdk/src/share/classes/sun/nio/ch/Cancellable.java b/jdk/src/java.base/share/classes/sun/nio/ch/Cancellable.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/Cancellable.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/Cancellable.java
diff --git a/jdk/src/share/classes/sun/nio/ch/ChannelInputStream.java b/jdk/src/java.base/share/classes/sun/nio/ch/ChannelInputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/ChannelInputStream.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/ChannelInputStream.java
diff --git a/jdk/src/share/classes/sun/nio/ch/CompletedFuture.java b/jdk/src/java.base/share/classes/sun/nio/ch/CompletedFuture.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/CompletedFuture.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/CompletedFuture.java
diff --git a/jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java b/jdk/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java
diff --git a/jdk/src/share/classes/sun/nio/ch/DatagramSocketAdaptor.java b/jdk/src/java.base/share/classes/sun/nio/ch/DatagramSocketAdaptor.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/DatagramSocketAdaptor.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/DatagramSocketAdaptor.java
diff --git a/jdk/src/share/classes/sun/nio/ch/DirectBuffer.java b/jdk/src/java.base/share/classes/sun/nio/ch/DirectBuffer.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/DirectBuffer.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/DirectBuffer.java
diff --git a/jdk/src/share/classes/sun/nio/ch/ExtendedSocketOption.java b/jdk/src/java.base/share/classes/sun/nio/ch/ExtendedSocketOption.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/ExtendedSocketOption.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/ExtendedSocketOption.java
diff --git a/jdk/src/share/classes/sun/nio/ch/FileChannelImpl.java b/jdk/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/FileChannelImpl.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java
diff --git a/jdk/src/share/classes/sun/nio/ch/FileDispatcher.java b/jdk/src/java.base/share/classes/sun/nio/ch/FileDispatcher.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/FileDispatcher.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/FileDispatcher.java
diff --git a/jdk/src/share/classes/sun/nio/ch/FileLockImpl.java b/jdk/src/java.base/share/classes/sun/nio/ch/FileLockImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/FileLockImpl.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/FileLockImpl.java
diff --git a/jdk/src/share/classes/sun/nio/ch/FileLockTable.java b/jdk/src/java.base/share/classes/sun/nio/ch/FileLockTable.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/FileLockTable.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/FileLockTable.java
diff --git a/jdk/src/share/classes/sun/nio/ch/Groupable.java b/jdk/src/java.base/share/classes/sun/nio/ch/Groupable.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/Groupable.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/Groupable.java
diff --git a/jdk/src/share/classes/sun/nio/ch/IOStatus.java b/jdk/src/java.base/share/classes/sun/nio/ch/IOStatus.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/IOStatus.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/IOStatus.java
diff --git a/jdk/src/share/classes/sun/nio/ch/IOUtil.java b/jdk/src/java.base/share/classes/sun/nio/ch/IOUtil.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/IOUtil.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/IOUtil.java
diff --git a/jdk/src/share/classes/sun/nio/ch/IOVecWrapper.java b/jdk/src/java.base/share/classes/sun/nio/ch/IOVecWrapper.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/IOVecWrapper.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/IOVecWrapper.java
diff --git a/jdk/src/share/classes/sun/nio/ch/Interruptible.java b/jdk/src/java.base/share/classes/sun/nio/ch/Interruptible.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/Interruptible.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/Interruptible.java
diff --git a/jdk/src/share/classes/sun/nio/ch/Invoker.java b/jdk/src/java.base/share/classes/sun/nio/ch/Invoker.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/Invoker.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/Invoker.java
diff --git a/jdk/src/share/classes/sun/nio/ch/MembershipKeyImpl.java b/jdk/src/java.base/share/classes/sun/nio/ch/MembershipKeyImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/MembershipKeyImpl.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/MembershipKeyImpl.java
diff --git a/jdk/src/share/classes/sun/nio/ch/MembershipRegistry.java b/jdk/src/java.base/share/classes/sun/nio/ch/MembershipRegistry.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/MembershipRegistry.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/MembershipRegistry.java
diff --git a/jdk/src/share/classes/sun/nio/ch/NativeDispatcher.java b/jdk/src/java.base/share/classes/sun/nio/ch/NativeDispatcher.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/NativeDispatcher.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/NativeDispatcher.java
diff --git a/jdk/src/share/classes/sun/nio/ch/NativeObject.java b/jdk/src/java.base/share/classes/sun/nio/ch/NativeObject.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/NativeObject.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/NativeObject.java
diff --git a/jdk/src/share/classes/sun/nio/ch/NativeThreadSet.java b/jdk/src/java.base/share/classes/sun/nio/ch/NativeThreadSet.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/NativeThreadSet.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/NativeThreadSet.java
diff --git a/jdk/src/share/classes/sun/nio/ch/Net.java b/jdk/src/java.base/share/classes/sun/nio/ch/Net.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/Net.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/Net.java
diff --git a/jdk/src/share/classes/sun/nio/ch/OptionKey.java b/jdk/src/java.base/share/classes/sun/nio/ch/OptionKey.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/OptionKey.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/OptionKey.java
diff --git a/jdk/src/share/classes/sun/nio/ch/PendingFuture.java b/jdk/src/java.base/share/classes/sun/nio/ch/PendingFuture.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/PendingFuture.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/PendingFuture.java
diff --git a/jdk/src/share/classes/sun/nio/ch/PollSelectorProvider.java b/jdk/src/java.base/share/classes/sun/nio/ch/PollSelectorProvider.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/PollSelectorProvider.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/PollSelectorProvider.java
diff --git a/jdk/src/share/classes/sun/nio/ch/Reflect.java b/jdk/src/java.base/share/classes/sun/nio/ch/Reflect.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/Reflect.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/Reflect.java
diff --git a/jdk/src/share/classes/sun/nio/ch/Secrets.java b/jdk/src/java.base/share/classes/sun/nio/ch/Secrets.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/Secrets.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/Secrets.java
diff --git a/jdk/src/share/classes/sun/nio/ch/SelChImpl.java b/jdk/src/java.base/share/classes/sun/nio/ch/SelChImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/SelChImpl.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/SelChImpl.java
diff --git a/jdk/src/share/classes/sun/nio/ch/SelectionKeyImpl.java b/jdk/src/java.base/share/classes/sun/nio/ch/SelectionKeyImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/SelectionKeyImpl.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/SelectionKeyImpl.java
diff --git a/jdk/src/share/classes/sun/nio/ch/SelectorImpl.java b/jdk/src/java.base/share/classes/sun/nio/ch/SelectorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/SelectorImpl.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/SelectorImpl.java
diff --git a/jdk/src/share/classes/sun/nio/ch/SelectorProviderImpl.java b/jdk/src/java.base/share/classes/sun/nio/ch/SelectorProviderImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/SelectorProviderImpl.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/SelectorProviderImpl.java
diff --git a/jdk/src/share/classes/sun/nio/ch/ServerSocketAdaptor.java b/jdk/src/java.base/share/classes/sun/nio/ch/ServerSocketAdaptor.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/ServerSocketAdaptor.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/ServerSocketAdaptor.java
diff --git a/jdk/src/share/classes/sun/nio/ch/ServerSocketChannelImpl.java b/jdk/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
diff --git a/jdk/src/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java b/jdk/src/java.base/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java
diff --git a/jdk/src/share/classes/sun/nio/ch/SocketAdaptor.java b/jdk/src/java.base/share/classes/sun/nio/ch/SocketAdaptor.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/SocketAdaptor.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/SocketAdaptor.java
diff --git a/jdk/src/share/classes/sun/nio/ch/SocketChannelImpl.java b/jdk/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/SocketChannelImpl.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
diff --git a/jdk/src/share/classes/sun/nio/ch/ThreadPool.java b/jdk/src/java.base/share/classes/sun/nio/ch/ThreadPool.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/ThreadPool.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/ThreadPool.java
diff --git a/jdk/src/share/classes/sun/nio/ch/Util.java b/jdk/src/java.base/share/classes/sun/nio/ch/Util.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/Util.java
rename to jdk/src/java.base/share/classes/sun/nio/ch/Util.java
diff --git a/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java b/jdk/src/java.base/share/classes/sun/nio/cs/AbstractCharsetProvider.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java
rename to jdk/src/java.base/share/classes/sun/nio/cs/AbstractCharsetProvider.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ArrayDecoder.java b/jdk/src/java.base/share/classes/sun/nio/cs/ArrayDecoder.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ArrayDecoder.java
rename to jdk/src/java.base/share/classes/sun/nio/cs/ArrayDecoder.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ArrayEncoder.java b/jdk/src/java.base/share/classes/sun/nio/cs/ArrayEncoder.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ArrayEncoder.java
rename to jdk/src/java.base/share/classes/sun/nio/cs/ArrayEncoder.java
diff --git a/jdk/src/share/classes/sun/nio/cs/CESU_8.java b/jdk/src/java.base/share/classes/sun/nio/cs/CESU_8.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/CESU_8.java
rename to jdk/src/java.base/share/classes/sun/nio/cs/CESU_8.java
diff --git a/jdk/src/share/classes/sun/nio/cs/CharsetMapping.java b/jdk/src/java.base/share/classes/sun/nio/cs/CharsetMapping.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/CharsetMapping.java
rename to jdk/src/java.base/share/classes/sun/nio/cs/CharsetMapping.java
diff --git a/jdk/src/share/classes/sun/nio/cs/FastCharsetProvider.java b/jdk/src/java.base/share/classes/sun/nio/cs/FastCharsetProvider.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/FastCharsetProvider.java
rename to jdk/src/java.base/share/classes/sun/nio/cs/FastCharsetProvider.java
diff --git a/jdk/src/share/classes/sun/nio/cs/HistoricallyNamedCharset.java b/jdk/src/java.base/share/classes/sun/nio/cs/HistoricallyNamedCharset.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/HistoricallyNamedCharset.java
rename to jdk/src/java.base/share/classes/sun/nio/cs/HistoricallyNamedCharset.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ISO_8859_1.java b/jdk/src/java.base/share/classes/sun/nio/cs/ISO_8859_1.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ISO_8859_1.java
rename to jdk/src/java.base/share/classes/sun/nio/cs/ISO_8859_1.java
diff --git a/jdk/src/share/classes/sun/nio/cs/SingleByte.java b/jdk/src/java.base/share/classes/sun/nio/cs/SingleByte.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/SingleByte.java
rename to jdk/src/java.base/share/classes/sun/nio/cs/SingleByte.java
diff --git a/jdk/src/share/classes/sun/nio/cs/StandardCharsets.java.template b/jdk/src/java.base/share/classes/sun/nio/cs/StandardCharsets.java.template
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/StandardCharsets.java.template
rename to jdk/src/java.base/share/classes/sun/nio/cs/StandardCharsets.java.template
diff --git a/jdk/src/share/classes/sun/nio/cs/StreamDecoder.java b/jdk/src/java.base/share/classes/sun/nio/cs/StreamDecoder.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/StreamDecoder.java
rename to jdk/src/java.base/share/classes/sun/nio/cs/StreamDecoder.java
diff --git a/jdk/src/share/classes/sun/nio/cs/StreamEncoder.java b/jdk/src/java.base/share/classes/sun/nio/cs/StreamEncoder.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/StreamEncoder.java
rename to jdk/src/java.base/share/classes/sun/nio/cs/StreamEncoder.java
diff --git a/jdk/src/share/classes/sun/nio/cs/Surrogate.java b/jdk/src/java.base/share/classes/sun/nio/cs/Surrogate.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/Surrogate.java
rename to jdk/src/java.base/share/classes/sun/nio/cs/Surrogate.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ThreadLocalCoders.java b/jdk/src/java.base/share/classes/sun/nio/cs/ThreadLocalCoders.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ThreadLocalCoders.java
rename to jdk/src/java.base/share/classes/sun/nio/cs/ThreadLocalCoders.java
diff --git a/jdk/src/share/classes/sun/nio/cs/US_ASCII.java b/jdk/src/java.base/share/classes/sun/nio/cs/US_ASCII.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/US_ASCII.java
rename to jdk/src/java.base/share/classes/sun/nio/cs/US_ASCII.java
diff --git a/jdk/src/share/classes/sun/nio/cs/UTF_16.java b/jdk/src/java.base/share/classes/sun/nio/cs/UTF_16.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/UTF_16.java
rename to jdk/src/java.base/share/classes/sun/nio/cs/UTF_16.java
diff --git a/jdk/src/share/classes/sun/nio/cs/UTF_16BE.java b/jdk/src/java.base/share/classes/sun/nio/cs/UTF_16BE.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/UTF_16BE.java
rename to jdk/src/java.base/share/classes/sun/nio/cs/UTF_16BE.java
diff --git a/jdk/src/share/classes/sun/nio/cs/UTF_16LE.java b/jdk/src/java.base/share/classes/sun/nio/cs/UTF_16LE.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/UTF_16LE.java
rename to jdk/src/java.base/share/classes/sun/nio/cs/UTF_16LE.java
diff --git a/jdk/src/share/classes/sun/nio/cs/UTF_16LE_BOM.java b/jdk/src/java.base/share/classes/sun/nio/cs/UTF_16LE_BOM.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/UTF_16LE_BOM.java
rename to jdk/src/java.base/share/classes/sun/nio/cs/UTF_16LE_BOM.java
diff --git a/jdk/src/share/classes/sun/nio/cs/UTF_32.java b/jdk/src/java.base/share/classes/sun/nio/cs/UTF_32.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/UTF_32.java
rename to jdk/src/java.base/share/classes/sun/nio/cs/UTF_32.java
diff --git a/jdk/src/share/classes/sun/nio/cs/UTF_32BE.java b/jdk/src/java.base/share/classes/sun/nio/cs/UTF_32BE.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/UTF_32BE.java
rename to jdk/src/java.base/share/classes/sun/nio/cs/UTF_32BE.java
diff --git a/jdk/src/share/classes/sun/nio/cs/UTF_32BE_BOM.java b/jdk/src/java.base/share/classes/sun/nio/cs/UTF_32BE_BOM.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/UTF_32BE_BOM.java
rename to jdk/src/java.base/share/classes/sun/nio/cs/UTF_32BE_BOM.java
diff --git a/jdk/src/share/classes/sun/nio/cs/UTF_32Coder.java b/jdk/src/java.base/share/classes/sun/nio/cs/UTF_32Coder.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/UTF_32Coder.java
rename to jdk/src/java.base/share/classes/sun/nio/cs/UTF_32Coder.java
diff --git a/jdk/src/share/classes/sun/nio/cs/UTF_32LE.java b/jdk/src/java.base/share/classes/sun/nio/cs/UTF_32LE.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/UTF_32LE.java
rename to jdk/src/java.base/share/classes/sun/nio/cs/UTF_32LE.java
diff --git a/jdk/src/share/classes/sun/nio/cs/UTF_32LE_BOM.java b/jdk/src/java.base/share/classes/sun/nio/cs/UTF_32LE_BOM.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/UTF_32LE_BOM.java
rename to jdk/src/java.base/share/classes/sun/nio/cs/UTF_32LE_BOM.java
diff --git a/jdk/src/share/classes/sun/nio/cs/UTF_8.java b/jdk/src/java.base/share/classes/sun/nio/cs/UTF_8.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/UTF_8.java
rename to jdk/src/java.base/share/classes/sun/nio/cs/UTF_8.java
diff --git a/jdk/src/share/classes/sun/nio/cs/Unicode.java b/jdk/src/java.base/share/classes/sun/nio/cs/Unicode.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/Unicode.java
rename to jdk/src/java.base/share/classes/sun/nio/cs/Unicode.java
diff --git a/jdk/src/share/classes/sun/nio/cs/UnicodeDecoder.java b/jdk/src/java.base/share/classes/sun/nio/cs/UnicodeDecoder.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/UnicodeDecoder.java
rename to jdk/src/java.base/share/classes/sun/nio/cs/UnicodeDecoder.java
diff --git a/jdk/src/share/classes/sun/nio/cs/UnicodeEncoder.java b/jdk/src/java.base/share/classes/sun/nio/cs/UnicodeEncoder.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/UnicodeEncoder.java
rename to jdk/src/java.base/share/classes/sun/nio/cs/UnicodeEncoder.java
diff --git a/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java b/jdk/src/java.base/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java
rename to jdk/src/java.base/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java
diff --git a/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java b/jdk/src/java.base/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java
rename to jdk/src/java.base/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java
diff --git a/jdk/src/share/classes/sun/nio/fs/AbstractFileSystemProvider.java b/jdk/src/java.base/share/classes/sun/nio/fs/AbstractFileSystemProvider.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/fs/AbstractFileSystemProvider.java
rename to jdk/src/java.base/share/classes/sun/nio/fs/AbstractFileSystemProvider.java
diff --git a/jdk/src/share/classes/sun/nio/fs/AbstractFileTypeDetector.java b/jdk/src/java.base/share/classes/sun/nio/fs/AbstractFileTypeDetector.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/fs/AbstractFileTypeDetector.java
rename to jdk/src/java.base/share/classes/sun/nio/fs/AbstractFileTypeDetector.java
diff --git a/jdk/src/share/classes/sun/nio/fs/AbstractPath.java b/jdk/src/java.base/share/classes/sun/nio/fs/AbstractPath.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/fs/AbstractPath.java
rename to jdk/src/java.base/share/classes/sun/nio/fs/AbstractPath.java
diff --git a/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java b/jdk/src/java.base/share/classes/sun/nio/fs/AbstractPoller.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/fs/AbstractPoller.java
rename to jdk/src/java.base/share/classes/sun/nio/fs/AbstractPoller.java
diff --git a/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java b/jdk/src/java.base/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java
rename to jdk/src/java.base/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java
diff --git a/jdk/src/share/classes/sun/nio/fs/AbstractWatchKey.java b/jdk/src/java.base/share/classes/sun/nio/fs/AbstractWatchKey.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/fs/AbstractWatchKey.java
rename to jdk/src/java.base/share/classes/sun/nio/fs/AbstractWatchKey.java
diff --git a/jdk/src/share/classes/sun/nio/fs/AbstractWatchService.java b/jdk/src/java.base/share/classes/sun/nio/fs/AbstractWatchService.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/fs/AbstractWatchService.java
rename to jdk/src/java.base/share/classes/sun/nio/fs/AbstractWatchService.java
diff --git a/jdk/src/share/classes/sun/nio/fs/BasicFileAttributesHolder.java b/jdk/src/java.base/share/classes/sun/nio/fs/BasicFileAttributesHolder.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/fs/BasicFileAttributesHolder.java
rename to jdk/src/java.base/share/classes/sun/nio/fs/BasicFileAttributesHolder.java
diff --git a/jdk/src/share/classes/sun/nio/fs/Cancellable.java b/jdk/src/java.base/share/classes/sun/nio/fs/Cancellable.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/fs/Cancellable.java
rename to jdk/src/java.base/share/classes/sun/nio/fs/Cancellable.java
diff --git a/jdk/src/share/classes/sun/nio/fs/DynamicFileAttributeView.java b/jdk/src/java.base/share/classes/sun/nio/fs/DynamicFileAttributeView.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/fs/DynamicFileAttributeView.java
rename to jdk/src/java.base/share/classes/sun/nio/fs/DynamicFileAttributeView.java
diff --git a/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java b/jdk/src/java.base/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java
rename to jdk/src/java.base/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java
diff --git a/jdk/src/share/classes/sun/nio/fs/Globs.java b/jdk/src/java.base/share/classes/sun/nio/fs/Globs.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/fs/Globs.java
rename to jdk/src/java.base/share/classes/sun/nio/fs/Globs.java
diff --git a/jdk/src/share/classes/sun/nio/fs/NativeBuffer.java b/jdk/src/java.base/share/classes/sun/nio/fs/NativeBuffer.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/fs/NativeBuffer.java
rename to jdk/src/java.base/share/classes/sun/nio/fs/NativeBuffer.java
diff --git a/jdk/src/share/classes/sun/nio/fs/NativeBuffers.java b/jdk/src/java.base/share/classes/sun/nio/fs/NativeBuffers.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/fs/NativeBuffers.java
rename to jdk/src/java.base/share/classes/sun/nio/fs/NativeBuffers.java
diff --git a/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java b/jdk/src/java.base/share/classes/sun/nio/fs/PollingWatchService.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/fs/PollingWatchService.java
rename to jdk/src/java.base/share/classes/sun/nio/fs/PollingWatchService.java
diff --git a/jdk/src/share/classes/sun/nio/fs/Reflect.java b/jdk/src/java.base/share/classes/sun/nio/fs/Reflect.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/fs/Reflect.java
rename to jdk/src/java.base/share/classes/sun/nio/fs/Reflect.java
diff --git a/jdk/src/share/classes/sun/nio/fs/Util.java b/jdk/src/java.base/share/classes/sun/nio/fs/Util.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/fs/Util.java
rename to jdk/src/java.base/share/classes/sun/nio/fs/Util.java
diff --git a/jdk/src/share/classes/sun/reflect/AccessorGenerator.java b/jdk/src/java.base/share/classes/sun/reflect/AccessorGenerator.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/AccessorGenerator.java
rename to jdk/src/java.base/share/classes/sun/reflect/AccessorGenerator.java
diff --git a/jdk/src/share/classes/sun/reflect/BootstrapConstructorAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/BootstrapConstructorAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/BootstrapConstructorAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/BootstrapConstructorAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/ByteVector.java b/jdk/src/java.base/share/classes/sun/reflect/ByteVector.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/ByteVector.java
rename to jdk/src/java.base/share/classes/sun/reflect/ByteVector.java
diff --git a/jdk/src/share/classes/sun/reflect/ByteVectorFactory.java b/jdk/src/java.base/share/classes/sun/reflect/ByteVectorFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/ByteVectorFactory.java
rename to jdk/src/java.base/share/classes/sun/reflect/ByteVectorFactory.java
diff --git a/jdk/src/share/classes/sun/reflect/ByteVectorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/ByteVectorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/ByteVectorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/ByteVectorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/CallerSensitive.java b/jdk/src/java.base/share/classes/sun/reflect/CallerSensitive.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/CallerSensitive.java
rename to jdk/src/java.base/share/classes/sun/reflect/CallerSensitive.java
diff --git a/jdk/src/share/classes/sun/reflect/ClassDefiner.java b/jdk/src/java.base/share/classes/sun/reflect/ClassDefiner.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/ClassDefiner.java
rename to jdk/src/java.base/share/classes/sun/reflect/ClassDefiner.java
diff --git a/jdk/src/share/classes/sun/reflect/ClassFileAssembler.java b/jdk/src/java.base/share/classes/sun/reflect/ClassFileAssembler.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/ClassFileAssembler.java
rename to jdk/src/java.base/share/classes/sun/reflect/ClassFileAssembler.java
diff --git a/jdk/src/share/classes/sun/reflect/ClassFileConstants.java b/jdk/src/java.base/share/classes/sun/reflect/ClassFileConstants.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/ClassFileConstants.java
rename to jdk/src/java.base/share/classes/sun/reflect/ClassFileConstants.java
diff --git a/jdk/src/share/classes/sun/reflect/ConstantPool.java b/jdk/src/java.base/share/classes/sun/reflect/ConstantPool.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/ConstantPool.java
rename to jdk/src/java.base/share/classes/sun/reflect/ConstantPool.java
diff --git a/jdk/src/share/classes/sun/reflect/ConstructorAccessor.java b/jdk/src/java.base/share/classes/sun/reflect/ConstructorAccessor.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/ConstructorAccessor.java
rename to jdk/src/java.base/share/classes/sun/reflect/ConstructorAccessor.java
diff --git a/jdk/src/share/classes/sun/reflect/ConstructorAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/ConstructorAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/ConstructorAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/ConstructorAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/DelegatingConstructorAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/DelegatingConstructorAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/DelegatingConstructorAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/DelegatingConstructorAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/DelegatingMethodAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/DelegatingMethodAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/DelegatingMethodAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/DelegatingMethodAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/FieldAccessor.java b/jdk/src/java.base/share/classes/sun/reflect/FieldAccessor.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/FieldAccessor.java
rename to jdk/src/java.base/share/classes/sun/reflect/FieldAccessor.java
diff --git a/jdk/src/share/classes/sun/reflect/FieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/FieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/FieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/FieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/FieldInfo.java b/jdk/src/java.base/share/classes/sun/reflect/FieldInfo.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/FieldInfo.java
rename to jdk/src/java.base/share/classes/sun/reflect/FieldInfo.java
diff --git a/jdk/src/share/classes/sun/reflect/InstantiationExceptionConstructorAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/InstantiationExceptionConstructorAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/InstantiationExceptionConstructorAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/InstantiationExceptionConstructorAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/Label.java b/jdk/src/java.base/share/classes/sun/reflect/Label.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/Label.java
rename to jdk/src/java.base/share/classes/sun/reflect/Label.java
diff --git a/jdk/src/share/classes/sun/reflect/LangReflectAccess.java b/jdk/src/java.base/share/classes/sun/reflect/LangReflectAccess.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/LangReflectAccess.java
rename to jdk/src/java.base/share/classes/sun/reflect/LangReflectAccess.java
diff --git a/jdk/src/share/classes/sun/reflect/MagicAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/MagicAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/MagicAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/MagicAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/MethodAccessor.java b/jdk/src/java.base/share/classes/sun/reflect/MethodAccessor.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/MethodAccessor.java
rename to jdk/src/java.base/share/classes/sun/reflect/MethodAccessor.java
diff --git a/jdk/src/share/classes/sun/reflect/MethodAccessorGenerator.java b/jdk/src/java.base/share/classes/sun/reflect/MethodAccessorGenerator.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/MethodAccessorGenerator.java
rename to jdk/src/java.base/share/classes/sun/reflect/MethodAccessorGenerator.java
diff --git a/jdk/src/share/classes/sun/reflect/MethodAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/MethodAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/MethodAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/MethodAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/NativeConstructorAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/NativeConstructorAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/NativeConstructorAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/NativeConstructorAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/NativeMethodAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/NativeMethodAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/NativeMethodAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/NativeMethodAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/Reflection.java b/jdk/src/java.base/share/classes/sun/reflect/Reflection.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/Reflection.java
rename to jdk/src/java.base/share/classes/sun/reflect/Reflection.java
diff --git a/jdk/src/share/classes/sun/reflect/ReflectionFactory.java b/jdk/src/java.base/share/classes/sun/reflect/ReflectionFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/ReflectionFactory.java
rename to jdk/src/java.base/share/classes/sun/reflect/ReflectionFactory.java
diff --git a/jdk/src/share/classes/sun/reflect/SerializationConstructorAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/SerializationConstructorAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/SerializationConstructorAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/SerializationConstructorAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/SignatureIterator.java b/jdk/src/java.base/share/classes/sun/reflect/SignatureIterator.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/SignatureIterator.java
rename to jdk/src/java.base/share/classes/sun/reflect/SignatureIterator.java
diff --git a/jdk/src/share/classes/sun/reflect/UTF8.java b/jdk/src/java.base/share/classes/sun/reflect/UTF8.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UTF8.java
rename to jdk/src/java.base/share/classes/sun/reflect/UTF8.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeBooleanFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeBooleanFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeBooleanFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeBooleanFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeByteFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeByteFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeByteFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeByteFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeCharacterFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeCharacterFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeCharacterFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeCharacterFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeDoubleFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeDoubleFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeDoubleFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeDoubleFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeFieldAccessorFactory.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeFieldAccessorFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeFieldAccessorFactory.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeFieldAccessorFactory.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeFloatFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeFloatFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeFloatFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeFloatFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeIntegerFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeIntegerFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeIntegerFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeIntegerFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeLongFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeLongFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeLongFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeLongFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeObjectFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeObjectFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeObjectFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeObjectFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeQualifiedBooleanFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedBooleanFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeQualifiedBooleanFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedBooleanFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeQualifiedByteFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedByteFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeQualifiedByteFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedByteFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeQualifiedCharacterFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedCharacterFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeQualifiedCharacterFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedCharacterFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeQualifiedDoubleFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedDoubleFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeQualifiedDoubleFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedDoubleFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeQualifiedFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeQualifiedFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeQualifiedFloatFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedFloatFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeQualifiedFloatFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedFloatFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeQualifiedIntegerFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedIntegerFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeQualifiedIntegerFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedIntegerFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeQualifiedLongFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedLongFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeQualifiedLongFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedLongFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeQualifiedObjectFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedObjectFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeQualifiedObjectFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedObjectFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeQualifiedShortFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedShortFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeQualifiedShortFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedShortFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeQualifiedStaticBooleanFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticBooleanFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeQualifiedStaticBooleanFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticBooleanFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeQualifiedStaticByteFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticByteFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeQualifiedStaticByteFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticByteFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeQualifiedStaticCharacterFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticCharacterFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeQualifiedStaticCharacterFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticCharacterFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeQualifiedStaticDoubleFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticDoubleFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeQualifiedStaticDoubleFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticDoubleFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeQualifiedStaticFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeQualifiedStaticFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeQualifiedStaticFloatFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticFloatFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeQualifiedStaticFloatFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticFloatFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeQualifiedStaticIntegerFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticIntegerFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeQualifiedStaticIntegerFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticIntegerFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeQualifiedStaticLongFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticLongFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeQualifiedStaticLongFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticLongFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeQualifiedStaticObjectFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticObjectFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeQualifiedStaticObjectFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticObjectFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeQualifiedStaticShortFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticShortFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeQualifiedStaticShortFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticShortFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeShortFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeShortFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeShortFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeShortFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeStaticBooleanFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeStaticBooleanFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeStaticBooleanFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeStaticBooleanFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeStaticByteFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeStaticByteFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeStaticByteFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeStaticByteFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeStaticCharacterFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeStaticCharacterFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeStaticCharacterFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeStaticCharacterFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeStaticDoubleFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeStaticDoubleFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeStaticDoubleFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeStaticDoubleFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeStaticFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeStaticFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeStaticFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeStaticFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeStaticFloatFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeStaticFloatFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeStaticFloatFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeStaticFloatFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeStaticIntegerFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeStaticIntegerFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeStaticIntegerFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeStaticIntegerFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeStaticLongFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeStaticLongFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeStaticLongFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeStaticLongFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeStaticObjectFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeStaticObjectFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeStaticObjectFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeStaticObjectFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/UnsafeStaticShortFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeStaticShortFieldAccessorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/UnsafeStaticShortFieldAccessorImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/UnsafeStaticShortFieldAccessorImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/annotation/AnnotatedTypeFactory.java b/jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotatedTypeFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/annotation/AnnotatedTypeFactory.java
rename to jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotatedTypeFactory.java
diff --git a/jdk/src/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java b/jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java
rename to jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java
diff --git a/jdk/src/share/classes/sun/reflect/annotation/AnnotationParser.java b/jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationParser.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/annotation/AnnotationParser.java
rename to jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationParser.java
diff --git a/jdk/src/share/classes/sun/reflect/annotation/AnnotationSupport.java b/jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationSupport.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/annotation/AnnotationSupport.java
rename to jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationSupport.java
diff --git a/jdk/src/share/classes/sun/reflect/annotation/AnnotationType.java b/jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationType.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/annotation/AnnotationType.java
rename to jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationType.java
diff --git a/jdk/src/share/classes/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java b/jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java
rename to jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java
diff --git a/jdk/src/share/classes/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java b/jdk/src/java.base/share/classes/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java
rename to jdk/src/java.base/share/classes/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java
diff --git a/jdk/src/share/classes/sun/reflect/annotation/ExceptionProxy.java b/jdk/src/java.base/share/classes/sun/reflect/annotation/ExceptionProxy.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/annotation/ExceptionProxy.java
rename to jdk/src/java.base/share/classes/sun/reflect/annotation/ExceptionProxy.java
diff --git a/jdk/src/share/classes/sun/reflect/annotation/TypeAnnotation.java b/jdk/src/java.base/share/classes/sun/reflect/annotation/TypeAnnotation.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/annotation/TypeAnnotation.java
rename to jdk/src/java.base/share/classes/sun/reflect/annotation/TypeAnnotation.java
diff --git a/jdk/src/share/classes/sun/reflect/annotation/TypeAnnotationParser.java b/jdk/src/java.base/share/classes/sun/reflect/annotation/TypeAnnotationParser.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/annotation/TypeAnnotationParser.java
rename to jdk/src/java.base/share/classes/sun/reflect/annotation/TypeAnnotationParser.java
diff --git a/jdk/src/share/classes/sun/reflect/annotation/TypeNotPresentExceptionProxy.java b/jdk/src/java.base/share/classes/sun/reflect/annotation/TypeNotPresentExceptionProxy.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/annotation/TypeNotPresentExceptionProxy.java
rename to jdk/src/java.base/share/classes/sun/reflect/annotation/TypeNotPresentExceptionProxy.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/factory/CoreReflectionFactory.java b/jdk/src/java.base/share/classes/sun/reflect/generics/factory/CoreReflectionFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/factory/CoreReflectionFactory.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/factory/CoreReflectionFactory.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/factory/GenericsFactory.java b/jdk/src/java.base/share/classes/sun/reflect/generics/factory/GenericsFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/factory/GenericsFactory.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/factory/GenericsFactory.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java b/jdk/src/java.base/share/classes/sun/reflect/generics/parser/SignatureParser.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/parser/SignatureParser.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/reflectiveObjects/GenericArrayTypeImpl.java b/jdk/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/GenericArrayTypeImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/reflectiveObjects/GenericArrayTypeImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/GenericArrayTypeImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/reflectiveObjects/LazyReflectiveObjectGenerator.java b/jdk/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/LazyReflectiveObjectGenerator.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/reflectiveObjects/LazyReflectiveObjectGenerator.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/LazyReflectiveObjectGenerator.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/reflectiveObjects/NotImplementedException.java b/jdk/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/NotImplementedException.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/reflectiveObjects/NotImplementedException.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/NotImplementedException.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/reflectiveObjects/ParameterizedTypeImpl.java b/jdk/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/ParameterizedTypeImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/reflectiveObjects/ParameterizedTypeImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/ParameterizedTypeImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/reflectiveObjects/TypeVariableImpl.java b/jdk/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/TypeVariableImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/reflectiveObjects/TypeVariableImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/TypeVariableImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/reflectiveObjects/WildcardTypeImpl.java b/jdk/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/WildcardTypeImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/reflectiveObjects/WildcardTypeImpl.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/WildcardTypeImpl.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/repository/AbstractRepository.java b/jdk/src/java.base/share/classes/sun/reflect/generics/repository/AbstractRepository.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/repository/AbstractRepository.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/repository/AbstractRepository.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/repository/ClassRepository.java b/jdk/src/java.base/share/classes/sun/reflect/generics/repository/ClassRepository.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/repository/ClassRepository.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/repository/ClassRepository.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/repository/ConstructorRepository.java b/jdk/src/java.base/share/classes/sun/reflect/generics/repository/ConstructorRepository.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/repository/ConstructorRepository.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/repository/ConstructorRepository.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/repository/FieldRepository.java b/jdk/src/java.base/share/classes/sun/reflect/generics/repository/FieldRepository.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/repository/FieldRepository.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/repository/FieldRepository.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/repository/GenericDeclRepository.java b/jdk/src/java.base/share/classes/sun/reflect/generics/repository/GenericDeclRepository.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/repository/GenericDeclRepository.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/repository/GenericDeclRepository.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/repository/MethodRepository.java b/jdk/src/java.base/share/classes/sun/reflect/generics/repository/MethodRepository.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/repository/MethodRepository.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/repository/MethodRepository.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/scope/AbstractScope.java b/jdk/src/java.base/share/classes/sun/reflect/generics/scope/AbstractScope.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/scope/AbstractScope.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/scope/AbstractScope.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/scope/ClassScope.java b/jdk/src/java.base/share/classes/sun/reflect/generics/scope/ClassScope.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/scope/ClassScope.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/scope/ClassScope.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/scope/ConstructorScope.java b/jdk/src/java.base/share/classes/sun/reflect/generics/scope/ConstructorScope.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/scope/ConstructorScope.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/scope/ConstructorScope.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/scope/DummyScope.java b/jdk/src/java.base/share/classes/sun/reflect/generics/scope/DummyScope.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/scope/DummyScope.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/scope/DummyScope.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/scope/MethodScope.java b/jdk/src/java.base/share/classes/sun/reflect/generics/scope/MethodScope.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/scope/MethodScope.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/scope/MethodScope.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/scope/Scope.java b/jdk/src/java.base/share/classes/sun/reflect/generics/scope/Scope.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/scope/Scope.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/scope/Scope.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/tree/ArrayTypeSignature.java b/jdk/src/java.base/share/classes/sun/reflect/generics/tree/ArrayTypeSignature.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/tree/ArrayTypeSignature.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/tree/ArrayTypeSignature.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/tree/BaseType.java b/jdk/src/java.base/share/classes/sun/reflect/generics/tree/BaseType.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/tree/BaseType.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/tree/BaseType.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/tree/BooleanSignature.java b/jdk/src/java.base/share/classes/sun/reflect/generics/tree/BooleanSignature.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/tree/BooleanSignature.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/tree/BooleanSignature.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/tree/BottomSignature.java b/jdk/src/java.base/share/classes/sun/reflect/generics/tree/BottomSignature.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/tree/BottomSignature.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/tree/BottomSignature.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/tree/ByteSignature.java b/jdk/src/java.base/share/classes/sun/reflect/generics/tree/ByteSignature.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/tree/ByteSignature.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/tree/ByteSignature.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/tree/CharSignature.java b/jdk/src/java.base/share/classes/sun/reflect/generics/tree/CharSignature.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/tree/CharSignature.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/tree/CharSignature.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/tree/ClassSignature.java b/jdk/src/java.base/share/classes/sun/reflect/generics/tree/ClassSignature.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/tree/ClassSignature.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/tree/ClassSignature.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/tree/ClassTypeSignature.java b/jdk/src/java.base/share/classes/sun/reflect/generics/tree/ClassTypeSignature.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/tree/ClassTypeSignature.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/tree/ClassTypeSignature.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/tree/DoubleSignature.java b/jdk/src/java.base/share/classes/sun/reflect/generics/tree/DoubleSignature.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/tree/DoubleSignature.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/tree/DoubleSignature.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/tree/FieldTypeSignature.java b/jdk/src/java.base/share/classes/sun/reflect/generics/tree/FieldTypeSignature.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/tree/FieldTypeSignature.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/tree/FieldTypeSignature.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/tree/FloatSignature.java b/jdk/src/java.base/share/classes/sun/reflect/generics/tree/FloatSignature.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/tree/FloatSignature.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/tree/FloatSignature.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/tree/FormalTypeParameter.java b/jdk/src/java.base/share/classes/sun/reflect/generics/tree/FormalTypeParameter.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/tree/FormalTypeParameter.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/tree/FormalTypeParameter.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/tree/IntSignature.java b/jdk/src/java.base/share/classes/sun/reflect/generics/tree/IntSignature.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/tree/IntSignature.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/tree/IntSignature.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/tree/LongSignature.java b/jdk/src/java.base/share/classes/sun/reflect/generics/tree/LongSignature.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/tree/LongSignature.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/tree/LongSignature.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/tree/MethodTypeSignature.java b/jdk/src/java.base/share/classes/sun/reflect/generics/tree/MethodTypeSignature.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/tree/MethodTypeSignature.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/tree/MethodTypeSignature.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/tree/ReturnType.java b/jdk/src/java.base/share/classes/sun/reflect/generics/tree/ReturnType.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/tree/ReturnType.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/tree/ReturnType.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/tree/ShortSignature.java b/jdk/src/java.base/share/classes/sun/reflect/generics/tree/ShortSignature.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/tree/ShortSignature.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/tree/ShortSignature.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/tree/Signature.java b/jdk/src/java.base/share/classes/sun/reflect/generics/tree/Signature.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/tree/Signature.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/tree/Signature.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/tree/SimpleClassTypeSignature.java b/jdk/src/java.base/share/classes/sun/reflect/generics/tree/SimpleClassTypeSignature.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/tree/SimpleClassTypeSignature.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/tree/SimpleClassTypeSignature.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/tree/Tree.java b/jdk/src/java.base/share/classes/sun/reflect/generics/tree/Tree.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/tree/Tree.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/tree/Tree.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/tree/TypeArgument.java b/jdk/src/java.base/share/classes/sun/reflect/generics/tree/TypeArgument.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/tree/TypeArgument.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/tree/TypeArgument.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/tree/TypeSignature.java b/jdk/src/java.base/share/classes/sun/reflect/generics/tree/TypeSignature.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/tree/TypeSignature.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/tree/TypeSignature.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/tree/TypeTree.java b/jdk/src/java.base/share/classes/sun/reflect/generics/tree/TypeTree.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/tree/TypeTree.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/tree/TypeTree.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/tree/TypeVariableSignature.java b/jdk/src/java.base/share/classes/sun/reflect/generics/tree/TypeVariableSignature.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/tree/TypeVariableSignature.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/tree/TypeVariableSignature.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/tree/VoidDescriptor.java b/jdk/src/java.base/share/classes/sun/reflect/generics/tree/VoidDescriptor.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/tree/VoidDescriptor.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/tree/VoidDescriptor.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/tree/Wildcard.java b/jdk/src/java.base/share/classes/sun/reflect/generics/tree/Wildcard.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/tree/Wildcard.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/tree/Wildcard.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/visitor/Reifier.java b/jdk/src/java.base/share/classes/sun/reflect/generics/visitor/Reifier.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/visitor/Reifier.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/visitor/Reifier.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/visitor/TypeTreeVisitor.java b/jdk/src/java.base/share/classes/sun/reflect/generics/visitor/TypeTreeVisitor.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/visitor/TypeTreeVisitor.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/visitor/TypeTreeVisitor.java
diff --git a/jdk/src/share/classes/sun/reflect/generics/visitor/Visitor.java b/jdk/src/java.base/share/classes/sun/reflect/generics/visitor/Visitor.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/generics/visitor/Visitor.java
rename to jdk/src/java.base/share/classes/sun/reflect/generics/visitor/Visitor.java
diff --git a/jdk/src/share/classes/sun/reflect/misc/ConstructorUtil.java b/jdk/src/java.base/share/classes/sun/reflect/misc/ConstructorUtil.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/misc/ConstructorUtil.java
rename to jdk/src/java.base/share/classes/sun/reflect/misc/ConstructorUtil.java
diff --git a/jdk/src/share/classes/sun/reflect/misc/FieldUtil.java b/jdk/src/java.base/share/classes/sun/reflect/misc/FieldUtil.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/misc/FieldUtil.java
rename to jdk/src/java.base/share/classes/sun/reflect/misc/FieldUtil.java
diff --git a/jdk/src/share/classes/sun/reflect/misc/MethodUtil.java b/jdk/src/java.base/share/classes/sun/reflect/misc/MethodUtil.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/misc/MethodUtil.java
rename to jdk/src/java.base/share/classes/sun/reflect/misc/MethodUtil.java
diff --git a/jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java b/jdk/src/java.base/share/classes/sun/reflect/misc/ReflectUtil.java
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java
rename to jdk/src/java.base/share/classes/sun/reflect/misc/ReflectUtil.java
diff --git a/jdk/src/share/classes/sun/reflect/package.html b/jdk/src/java.base/share/classes/sun/reflect/package.html
similarity index 100%
rename from jdk/src/share/classes/sun/reflect/package.html
rename to jdk/src/java.base/share/classes/sun/reflect/package.html
diff --git a/jdk/src/share/classes/sun/security/action/GetBooleanAction.java b/jdk/src/java.base/share/classes/sun/security/action/GetBooleanAction.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/action/GetBooleanAction.java
rename to jdk/src/java.base/share/classes/sun/security/action/GetBooleanAction.java
diff --git a/jdk/src/share/classes/sun/security/action/GetBooleanSecurityPropertyAction.java b/jdk/src/java.base/share/classes/sun/security/action/GetBooleanSecurityPropertyAction.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/action/GetBooleanSecurityPropertyAction.java
rename to jdk/src/java.base/share/classes/sun/security/action/GetBooleanSecurityPropertyAction.java
diff --git a/jdk/src/share/classes/sun/security/action/GetIntegerAction.java b/jdk/src/java.base/share/classes/sun/security/action/GetIntegerAction.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/action/GetIntegerAction.java
rename to jdk/src/java.base/share/classes/sun/security/action/GetIntegerAction.java
diff --git a/jdk/src/share/classes/sun/security/action/GetLongAction.java b/jdk/src/java.base/share/classes/sun/security/action/GetLongAction.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/action/GetLongAction.java
rename to jdk/src/java.base/share/classes/sun/security/action/GetLongAction.java
diff --git a/jdk/src/share/classes/sun/security/action/GetPropertyAction.java b/jdk/src/java.base/share/classes/sun/security/action/GetPropertyAction.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/action/GetPropertyAction.java
rename to jdk/src/java.base/share/classes/sun/security/action/GetPropertyAction.java
diff --git a/jdk/src/share/classes/sun/security/action/OpenFileInputStreamAction.java b/jdk/src/java.base/share/classes/sun/security/action/OpenFileInputStreamAction.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/action/OpenFileInputStreamAction.java
rename to jdk/src/java.base/share/classes/sun/security/action/OpenFileInputStreamAction.java
diff --git a/jdk/src/share/classes/sun/security/action/PutAllAction.java b/jdk/src/java.base/share/classes/sun/security/action/PutAllAction.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/action/PutAllAction.java
rename to jdk/src/java.base/share/classes/sun/security/action/PutAllAction.java
diff --git a/jdk/src/share/classes/sun/security/internal/interfaces/TlsMasterSecret.java b/jdk/src/java.base/share/classes/sun/security/internal/interfaces/TlsMasterSecret.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/internal/interfaces/TlsMasterSecret.java
rename to jdk/src/java.base/share/classes/sun/security/internal/interfaces/TlsMasterSecret.java
diff --git a/jdk/src/share/classes/sun/security/internal/spec/TlsKeyMaterialParameterSpec.java b/jdk/src/java.base/share/classes/sun/security/internal/spec/TlsKeyMaterialParameterSpec.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/internal/spec/TlsKeyMaterialParameterSpec.java
rename to jdk/src/java.base/share/classes/sun/security/internal/spec/TlsKeyMaterialParameterSpec.java
diff --git a/jdk/src/share/classes/sun/security/internal/spec/TlsKeyMaterialSpec.java b/jdk/src/java.base/share/classes/sun/security/internal/spec/TlsKeyMaterialSpec.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/internal/spec/TlsKeyMaterialSpec.java
rename to jdk/src/java.base/share/classes/sun/security/internal/spec/TlsKeyMaterialSpec.java
diff --git a/jdk/src/share/classes/sun/security/internal/spec/TlsMasterSecretParameterSpec.java b/jdk/src/java.base/share/classes/sun/security/internal/spec/TlsMasterSecretParameterSpec.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/internal/spec/TlsMasterSecretParameterSpec.java
rename to jdk/src/java.base/share/classes/sun/security/internal/spec/TlsMasterSecretParameterSpec.java
diff --git a/jdk/src/share/classes/sun/security/internal/spec/TlsPrfParameterSpec.java b/jdk/src/java.base/share/classes/sun/security/internal/spec/TlsPrfParameterSpec.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/internal/spec/TlsPrfParameterSpec.java
rename to jdk/src/java.base/share/classes/sun/security/internal/spec/TlsPrfParameterSpec.java
diff --git a/jdk/src/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java b/jdk/src/java.base/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java
rename to jdk/src/java.base/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java
diff --git a/jdk/src/share/classes/sun/security/jca/GetInstance.java b/jdk/src/java.base/share/classes/sun/security/jca/GetInstance.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jca/GetInstance.java
rename to jdk/src/java.base/share/classes/sun/security/jca/GetInstance.java
diff --git a/jdk/src/share/classes/sun/security/jca/JCAUtil.java b/jdk/src/java.base/share/classes/sun/security/jca/JCAUtil.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jca/JCAUtil.java
rename to jdk/src/java.base/share/classes/sun/security/jca/JCAUtil.java
diff --git a/jdk/src/share/classes/sun/security/jca/ProviderConfig.java b/jdk/src/java.base/share/classes/sun/security/jca/ProviderConfig.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jca/ProviderConfig.java
rename to jdk/src/java.base/share/classes/sun/security/jca/ProviderConfig.java
diff --git a/jdk/src/share/classes/sun/security/jca/ProviderList.java b/jdk/src/java.base/share/classes/sun/security/jca/ProviderList.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jca/ProviderList.java
rename to jdk/src/java.base/share/classes/sun/security/jca/ProviderList.java
diff --git a/jdk/src/share/classes/sun/security/jca/Providers.java b/jdk/src/java.base/share/classes/sun/security/jca/Providers.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jca/Providers.java
rename to jdk/src/java.base/share/classes/sun/security/jca/Providers.java
diff --git a/jdk/src/share/classes/sun/security/jca/ServiceId.java b/jdk/src/java.base/share/classes/sun/security/jca/ServiceId.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jca/ServiceId.java
rename to jdk/src/java.base/share/classes/sun/security/jca/ServiceId.java
diff --git a/jdk/src/share/classes/sun/security/pkcs/ContentInfo.java b/jdk/src/java.base/share/classes/sun/security/pkcs/ContentInfo.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs/ContentInfo.java
rename to jdk/src/java.base/share/classes/sun/security/pkcs/ContentInfo.java
diff --git a/jdk/src/share/classes/sun/security/pkcs/EncryptedPrivateKeyInfo.java b/jdk/src/java.base/share/classes/sun/security/pkcs/EncryptedPrivateKeyInfo.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs/EncryptedPrivateKeyInfo.java
rename to jdk/src/java.base/share/classes/sun/security/pkcs/EncryptedPrivateKeyInfo.java
diff --git a/jdk/src/share/classes/sun/security/pkcs/PKCS7.java b/jdk/src/java.base/share/classes/sun/security/pkcs/PKCS7.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs/PKCS7.java
rename to jdk/src/java.base/share/classes/sun/security/pkcs/PKCS7.java
diff --git a/jdk/src/share/classes/sun/security/pkcs/PKCS8Key.java b/jdk/src/java.base/share/classes/sun/security/pkcs/PKCS8Key.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs/PKCS8Key.java
rename to jdk/src/java.base/share/classes/sun/security/pkcs/PKCS8Key.java
diff --git a/jdk/src/share/classes/sun/security/pkcs/PKCS9Attribute.java b/jdk/src/java.base/share/classes/sun/security/pkcs/PKCS9Attribute.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs/PKCS9Attribute.java
rename to jdk/src/java.base/share/classes/sun/security/pkcs/PKCS9Attribute.java
diff --git a/jdk/src/share/classes/sun/security/pkcs/PKCS9Attributes.java b/jdk/src/java.base/share/classes/sun/security/pkcs/PKCS9Attributes.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs/PKCS9Attributes.java
rename to jdk/src/java.base/share/classes/sun/security/pkcs/PKCS9Attributes.java
diff --git a/jdk/src/share/classes/sun/security/pkcs/ParsingException.java b/jdk/src/java.base/share/classes/sun/security/pkcs/ParsingException.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs/ParsingException.java
rename to jdk/src/java.base/share/classes/sun/security/pkcs/ParsingException.java
diff --git a/jdk/src/share/classes/sun/security/pkcs/SignerInfo.java b/jdk/src/java.base/share/classes/sun/security/pkcs/SignerInfo.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs/SignerInfo.java
rename to jdk/src/java.base/share/classes/sun/security/pkcs/SignerInfo.java
diff --git a/jdk/src/share/classes/sun/security/pkcs/SigningCertificateInfo.java b/jdk/src/java.base/share/classes/sun/security/pkcs/SigningCertificateInfo.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs/SigningCertificateInfo.java
rename to jdk/src/java.base/share/classes/sun/security/pkcs/SigningCertificateInfo.java
diff --git a/jdk/src/share/classes/sun/security/pkcs10/PKCS10.java b/jdk/src/java.base/share/classes/sun/security/pkcs10/PKCS10.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs10/PKCS10.java
rename to jdk/src/java.base/share/classes/sun/security/pkcs10/PKCS10.java
diff --git a/jdk/src/share/classes/sun/security/pkcs10/PKCS10Attribute.java b/jdk/src/java.base/share/classes/sun/security/pkcs10/PKCS10Attribute.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs10/PKCS10Attribute.java
rename to jdk/src/java.base/share/classes/sun/security/pkcs10/PKCS10Attribute.java
diff --git a/jdk/src/share/classes/sun/security/pkcs10/PKCS10Attributes.java b/jdk/src/java.base/share/classes/sun/security/pkcs10/PKCS10Attributes.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs10/PKCS10Attributes.java
rename to jdk/src/java.base/share/classes/sun/security/pkcs10/PKCS10Attributes.java
diff --git a/jdk/src/share/classes/sun/security/pkcs12/MacData.java b/jdk/src/java.base/share/classes/sun/security/pkcs12/MacData.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs12/MacData.java
rename to jdk/src/java.base/share/classes/sun/security/pkcs12/MacData.java
diff --git a/jdk/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java b/jdk/src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java
rename to jdk/src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java
diff --git a/jdk/src/share/classes/sun/security/provider/AuthPolicyFile.java b/jdk/src/java.base/share/classes/sun/security/provider/AuthPolicyFile.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/AuthPolicyFile.java
rename to jdk/src/java.base/share/classes/sun/security/provider/AuthPolicyFile.java
diff --git a/jdk/src/share/classes/sun/security/provider/ByteArrayAccess.java b/jdk/src/java.base/share/classes/sun/security/provider/ByteArrayAccess.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/ByteArrayAccess.java
rename to jdk/src/java.base/share/classes/sun/security/provider/ByteArrayAccess.java
diff --git a/jdk/src/share/classes/sun/security/provider/ConfigFile.java b/jdk/src/java.base/share/classes/sun/security/provider/ConfigFile.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/ConfigFile.java
rename to jdk/src/java.base/share/classes/sun/security/provider/ConfigFile.java
diff --git a/jdk/src/share/classes/sun/security/provider/DSA.java b/jdk/src/java.base/share/classes/sun/security/provider/DSA.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/DSA.java
rename to jdk/src/java.base/share/classes/sun/security/provider/DSA.java
diff --git a/jdk/src/share/classes/sun/security/provider/DSAKeyFactory.java b/jdk/src/java.base/share/classes/sun/security/provider/DSAKeyFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/DSAKeyFactory.java
rename to jdk/src/java.base/share/classes/sun/security/provider/DSAKeyFactory.java
diff --git a/jdk/src/share/classes/sun/security/provider/DSAKeyPairGenerator.java b/jdk/src/java.base/share/classes/sun/security/provider/DSAKeyPairGenerator.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/DSAKeyPairGenerator.java
rename to jdk/src/java.base/share/classes/sun/security/provider/DSAKeyPairGenerator.java
diff --git a/jdk/src/share/classes/sun/security/provider/DSAParameterGenerator.java b/jdk/src/java.base/share/classes/sun/security/provider/DSAParameterGenerator.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/DSAParameterGenerator.java
rename to jdk/src/java.base/share/classes/sun/security/provider/DSAParameterGenerator.java
diff --git a/jdk/src/share/classes/sun/security/provider/DSAParameters.java b/jdk/src/java.base/share/classes/sun/security/provider/DSAParameters.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/DSAParameters.java
rename to jdk/src/java.base/share/classes/sun/security/provider/DSAParameters.java
diff --git a/jdk/src/share/classes/sun/security/provider/DSAPrivateKey.java b/jdk/src/java.base/share/classes/sun/security/provider/DSAPrivateKey.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/DSAPrivateKey.java
rename to jdk/src/java.base/share/classes/sun/security/provider/DSAPrivateKey.java
diff --git a/jdk/src/share/classes/sun/security/provider/DSAPublicKey.java b/jdk/src/java.base/share/classes/sun/security/provider/DSAPublicKey.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/DSAPublicKey.java
rename to jdk/src/java.base/share/classes/sun/security/provider/DSAPublicKey.java
diff --git a/jdk/src/share/classes/sun/security/provider/DSAPublicKeyImpl.java b/jdk/src/java.base/share/classes/sun/security/provider/DSAPublicKeyImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/DSAPublicKeyImpl.java
rename to jdk/src/java.base/share/classes/sun/security/provider/DSAPublicKeyImpl.java
diff --git a/jdk/src/share/classes/sun/security/provider/DigestBase.java b/jdk/src/java.base/share/classes/sun/security/provider/DigestBase.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/DigestBase.java
rename to jdk/src/java.base/share/classes/sun/security/provider/DigestBase.java
diff --git a/jdk/src/share/classes/sun/security/provider/DomainKeyStore.java b/jdk/src/java.base/share/classes/sun/security/provider/DomainKeyStore.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/DomainKeyStore.java
rename to jdk/src/java.base/share/classes/sun/security/provider/DomainKeyStore.java
diff --git a/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java b/jdk/src/java.base/share/classes/sun/security/provider/JavaKeyStore.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/JavaKeyStore.java
rename to jdk/src/java.base/share/classes/sun/security/provider/JavaKeyStore.java
diff --git a/jdk/src/share/classes/sun/security/provider/KeyProtector.java b/jdk/src/java.base/share/classes/sun/security/provider/KeyProtector.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/KeyProtector.java
rename to jdk/src/java.base/share/classes/sun/security/provider/KeyProtector.java
diff --git a/jdk/src/share/classes/sun/security/provider/MD2.java b/jdk/src/java.base/share/classes/sun/security/provider/MD2.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/MD2.java
rename to jdk/src/java.base/share/classes/sun/security/provider/MD2.java
diff --git a/jdk/src/share/classes/sun/security/provider/MD4.java b/jdk/src/java.base/share/classes/sun/security/provider/MD4.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/MD4.java
rename to jdk/src/java.base/share/classes/sun/security/provider/MD4.java
diff --git a/jdk/src/share/classes/sun/security/provider/MD5.java b/jdk/src/java.base/share/classes/sun/security/provider/MD5.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/MD5.java
rename to jdk/src/java.base/share/classes/sun/security/provider/MD5.java
diff --git a/jdk/src/share/classes/sun/security/provider/ParameterCache.java b/jdk/src/java.base/share/classes/sun/security/provider/ParameterCache.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/ParameterCache.java
rename to jdk/src/java.base/share/classes/sun/security/provider/ParameterCache.java
diff --git a/jdk/src/share/classes/sun/security/provider/PolicyFile.java b/jdk/src/java.base/share/classes/sun/security/provider/PolicyFile.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/PolicyFile.java
rename to jdk/src/java.base/share/classes/sun/security/provider/PolicyFile.java
diff --git a/jdk/src/share/classes/sun/security/provider/PolicyParser.java b/jdk/src/java.base/share/classes/sun/security/provider/PolicyParser.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/PolicyParser.java
rename to jdk/src/java.base/share/classes/sun/security/provider/PolicyParser.java
diff --git a/jdk/src/share/classes/sun/security/provider/PolicySpiFile.java b/jdk/src/java.base/share/classes/sun/security/provider/PolicySpiFile.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/PolicySpiFile.java
rename to jdk/src/java.base/share/classes/sun/security/provider/PolicySpiFile.java
diff --git a/jdk/src/share/classes/sun/security/provider/SHA.java b/jdk/src/java.base/share/classes/sun/security/provider/SHA.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/SHA.java
rename to jdk/src/java.base/share/classes/sun/security/provider/SHA.java
diff --git a/jdk/src/share/classes/sun/security/provider/SHA2.java b/jdk/src/java.base/share/classes/sun/security/provider/SHA2.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/SHA2.java
rename to jdk/src/java.base/share/classes/sun/security/provider/SHA2.java
diff --git a/jdk/src/share/classes/sun/security/provider/SHA5.java b/jdk/src/java.base/share/classes/sun/security/provider/SHA5.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/SHA5.java
rename to jdk/src/java.base/share/classes/sun/security/provider/SHA5.java
diff --git a/jdk/src/share/classes/sun/security/provider/SecureRandom.java b/jdk/src/java.base/share/classes/sun/security/provider/SecureRandom.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/SecureRandom.java
rename to jdk/src/java.base/share/classes/sun/security/provider/SecureRandom.java
diff --git a/jdk/src/share/classes/sun/security/provider/SeedGenerator.java b/jdk/src/java.base/share/classes/sun/security/provider/SeedGenerator.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/SeedGenerator.java
rename to jdk/src/java.base/share/classes/sun/security/provider/SeedGenerator.java
diff --git a/jdk/src/share/classes/sun/security/provider/SubjectCodeSource.java b/jdk/src/java.base/share/classes/sun/security/provider/SubjectCodeSource.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/SubjectCodeSource.java
rename to jdk/src/java.base/share/classes/sun/security/provider/SubjectCodeSource.java
diff --git a/jdk/src/share/classes/sun/security/provider/Sun.java b/jdk/src/java.base/share/classes/sun/security/provider/Sun.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/Sun.java
rename to jdk/src/java.base/share/classes/sun/security/provider/Sun.java
diff --git a/jdk/src/share/classes/sun/security/provider/SunEntries.java b/jdk/src/java.base/share/classes/sun/security/provider/SunEntries.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/SunEntries.java
rename to jdk/src/java.base/share/classes/sun/security/provider/SunEntries.java
diff --git a/jdk/src/share/classes/sun/security/provider/VerificationProvider.java b/jdk/src/java.base/share/classes/sun/security/provider/VerificationProvider.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/VerificationProvider.java
rename to jdk/src/java.base/share/classes/sun/security/provider/VerificationProvider.java
diff --git a/jdk/src/share/classes/sun/security/provider/X509Factory.java b/jdk/src/java.base/share/classes/sun/security/provider/X509Factory.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/X509Factory.java
rename to jdk/src/java.base/share/classes/sun/security/provider/X509Factory.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/AdaptableX509CertSelector.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/AdaptableX509CertSelector.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/AdaptableX509CertSelector.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/AdaptableX509CertSelector.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/AdjacencyList.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/AdjacencyList.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/AdjacencyList.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/AdjacencyList.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/AlgorithmChecker.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/AlgorithmChecker.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/AlgorithmChecker.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/AlgorithmChecker.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/BasicChecker.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/BasicChecker.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/BasicChecker.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/BasicChecker.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/BuildStep.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/BuildStep.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/BuildStep.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/BuildStep.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/Builder.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/Builder.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/Builder.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/Builder.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/CertId.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/CertId.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/CertId.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/CertId.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/CertPathHelper.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/CertPathHelper.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/CertPathHelper.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/CertPathHelper.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/CertStoreHelper.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/CertStoreHelper.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/CertStoreHelper.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/CertStoreHelper.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/CollectionCertStore.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/CollectionCertStore.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/CollectionCertStore.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/CollectionCertStore.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/ConstraintsChecker.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/ConstraintsChecker.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/ConstraintsChecker.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/ConstraintsChecker.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/ForwardBuilder.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/ForwardBuilder.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/ForwardBuilder.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/ForwardBuilder.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/ForwardState.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/ForwardState.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/ForwardState.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/ForwardState.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/IndexedCollectionCertStore.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/IndexedCollectionCertStore.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/IndexedCollectionCertStore.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/IndexedCollectionCertStore.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/KeyChecker.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/KeyChecker.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/KeyChecker.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/KeyChecker.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/OCSP.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/OCSP.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/OCSP.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/OCSP.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/OCSPRequest.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/OCSPRequest.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/OCSPRequest.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/OCSPRequest.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/OCSPResponse.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/OCSPResponse.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/PKIX.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/PKIX.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/PKIX.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/PKIX.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/PKIXMasterCertPathValidator.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/PKIXMasterCertPathValidator.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/PKIXMasterCertPathValidator.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/PKIXMasterCertPathValidator.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/PolicyChecker.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/PolicyChecker.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/PolicyChecker.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/PolicyChecker.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/PolicyNodeImpl.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/PolicyNodeImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/PolicyNodeImpl.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/PolicyNodeImpl.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/ReverseBuilder.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/ReverseBuilder.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/ReverseBuilder.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/ReverseBuilder.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/ReverseState.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/ReverseState.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/ReverseState.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/ReverseState.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/RevocationChecker.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/RevocationChecker.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/RevocationChecker.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/RevocationChecker.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/State.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/State.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/State.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/State.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilder.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/SunCertPathBuilder.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilder.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/SunCertPathBuilder.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderException.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/SunCertPathBuilderException.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderException.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/SunCertPathBuilderException.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderParameters.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/SunCertPathBuilderParameters.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderParameters.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/SunCertPathBuilderParameters.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderResult.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/SunCertPathBuilderResult.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderResult.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/SunCertPathBuilderResult.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/URICertStore.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/URICertStore.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/URICertStore.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/URICertStore.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/UntrustedChecker.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/UntrustedChecker.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/UntrustedChecker.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/UntrustedChecker.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/Vertex.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/Vertex.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/Vertex.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/Vertex.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/X509CertPath.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/X509CertPath.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/X509CertPath.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/X509CertPath.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/X509CertificatePair.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/X509CertificatePair.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/X509CertificatePair.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/X509CertificatePair.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStore.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStore.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStore.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStore.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStoreHelper.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStoreHelper.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStoreHelper.java
rename to jdk/src/java.base/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStoreHelper.java
diff --git a/jdk/src/share/classes/sun/security/rsa/RSACore.java b/jdk/src/java.base/share/classes/sun/security/rsa/RSACore.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/rsa/RSACore.java
rename to jdk/src/java.base/share/classes/sun/security/rsa/RSACore.java
diff --git a/jdk/src/share/classes/sun/security/rsa/RSAKeyFactory.java b/jdk/src/java.base/share/classes/sun/security/rsa/RSAKeyFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/rsa/RSAKeyFactory.java
rename to jdk/src/java.base/share/classes/sun/security/rsa/RSAKeyFactory.java
diff --git a/jdk/src/share/classes/sun/security/rsa/RSAKeyPairGenerator.java b/jdk/src/java.base/share/classes/sun/security/rsa/RSAKeyPairGenerator.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/rsa/RSAKeyPairGenerator.java
rename to jdk/src/java.base/share/classes/sun/security/rsa/RSAKeyPairGenerator.java
diff --git a/jdk/src/share/classes/sun/security/rsa/RSAPadding.java b/jdk/src/java.base/share/classes/sun/security/rsa/RSAPadding.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/rsa/RSAPadding.java
rename to jdk/src/java.base/share/classes/sun/security/rsa/RSAPadding.java
diff --git a/jdk/src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java b/jdk/src/java.base/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java
rename to jdk/src/java.base/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java
diff --git a/jdk/src/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java b/jdk/src/java.base/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java
rename to jdk/src/java.base/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java
diff --git a/jdk/src/share/classes/sun/security/rsa/RSAPublicKeyImpl.java b/jdk/src/java.base/share/classes/sun/security/rsa/RSAPublicKeyImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/rsa/RSAPublicKeyImpl.java
rename to jdk/src/java.base/share/classes/sun/security/rsa/RSAPublicKeyImpl.java
diff --git a/jdk/src/share/classes/sun/security/rsa/RSASignature.java b/jdk/src/java.base/share/classes/sun/security/rsa/RSASignature.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/rsa/RSASignature.java
rename to jdk/src/java.base/share/classes/sun/security/rsa/RSASignature.java
diff --git a/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java b/jdk/src/java.base/share/classes/sun/security/rsa/SunRsaSign.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/rsa/SunRsaSign.java
rename to jdk/src/java.base/share/classes/sun/security/rsa/SunRsaSign.java
diff --git a/jdk/src/share/classes/sun/security/rsa/SunRsaSignEntries.java b/jdk/src/java.base/share/classes/sun/security/rsa/SunRsaSignEntries.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/rsa/SunRsaSignEntries.java
rename to jdk/src/java.base/share/classes/sun/security/rsa/SunRsaSignEntries.java
diff --git a/jdk/src/share/classes/sun/security/ssl/Alerts.java b/jdk/src/java.base/share/classes/sun/security/ssl/Alerts.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/Alerts.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/Alerts.java
diff --git a/jdk/src/share/classes/sun/security/ssl/AppInputStream.java b/jdk/src/java.base/share/classes/sun/security/ssl/AppInputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/AppInputStream.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/AppInputStream.java
diff --git a/jdk/src/share/classes/sun/security/ssl/AppOutputStream.java b/jdk/src/java.base/share/classes/sun/security/ssl/AppOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/AppOutputStream.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/AppOutputStream.java
diff --git a/jdk/src/share/classes/sun/security/ssl/Authenticator.java b/jdk/src/java.base/share/classes/sun/security/ssl/Authenticator.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/Authenticator.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/Authenticator.java
diff --git a/jdk/src/share/classes/sun/security/ssl/BaseSSLSocketImpl.java b/jdk/src/java.base/share/classes/sun/security/ssl/BaseSSLSocketImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/BaseSSLSocketImpl.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/BaseSSLSocketImpl.java
diff --git a/jdk/src/share/classes/sun/security/ssl/ByteBufferInputStream.java b/jdk/src/java.base/share/classes/sun/security/ssl/ByteBufferInputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/ByteBufferInputStream.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/ByteBufferInputStream.java
diff --git a/jdk/src/share/classes/sun/security/ssl/CipherBox.java b/jdk/src/java.base/share/classes/sun/security/ssl/CipherBox.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/CipherBox.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/CipherBox.java
diff --git a/jdk/src/share/classes/sun/security/ssl/CipherSuite.java b/jdk/src/java.base/share/classes/sun/security/ssl/CipherSuite.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/CipherSuite.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/CipherSuite.java
diff --git a/jdk/src/share/classes/sun/security/ssl/CipherSuiteList.java b/jdk/src/java.base/share/classes/sun/security/ssl/CipherSuiteList.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/CipherSuiteList.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/CipherSuiteList.java
diff --git a/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java b/jdk/src/java.base/share/classes/sun/security/ssl/ClientHandshaker.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/ClientHandshaker.java
diff --git a/jdk/src/share/classes/sun/security/ssl/DHClientKeyExchange.java b/jdk/src/java.base/share/classes/sun/security/ssl/DHClientKeyExchange.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/DHClientKeyExchange.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/DHClientKeyExchange.java
diff --git a/jdk/src/share/classes/sun/security/ssl/DHCrypt.java b/jdk/src/java.base/share/classes/sun/security/ssl/DHCrypt.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/DHCrypt.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/DHCrypt.java
diff --git a/jdk/src/share/classes/sun/security/ssl/Debug.java b/jdk/src/java.base/share/classes/sun/security/ssl/Debug.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/Debug.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/Debug.java
diff --git a/jdk/src/share/classes/sun/security/ssl/ECDHClientKeyExchange.java b/jdk/src/java.base/share/classes/sun/security/ssl/ECDHClientKeyExchange.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/ECDHClientKeyExchange.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/ECDHClientKeyExchange.java
diff --git a/jdk/src/share/classes/sun/security/ssl/ECDHCrypt.java b/jdk/src/java.base/share/classes/sun/security/ssl/ECDHCrypt.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/ECDHCrypt.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/ECDHCrypt.java
diff --git a/jdk/src/share/classes/sun/security/ssl/EngineArgs.java b/jdk/src/java.base/share/classes/sun/security/ssl/EngineArgs.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/EngineArgs.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/EngineArgs.java
diff --git a/jdk/src/share/classes/sun/security/ssl/EngineInputRecord.java b/jdk/src/java.base/share/classes/sun/security/ssl/EngineInputRecord.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/EngineInputRecord.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/EngineInputRecord.java
diff --git a/jdk/src/share/classes/sun/security/ssl/EngineOutputRecord.java b/jdk/src/java.base/share/classes/sun/security/ssl/EngineOutputRecord.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/EngineOutputRecord.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/EngineOutputRecord.java
diff --git a/jdk/src/share/classes/sun/security/ssl/EngineWriter.java b/jdk/src/java.base/share/classes/sun/security/ssl/EngineWriter.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/EngineWriter.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/EngineWriter.java
diff --git a/jdk/src/share/classes/sun/security/ssl/EphemeralKeyManager.java b/jdk/src/java.base/share/classes/sun/security/ssl/EphemeralKeyManager.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/EphemeralKeyManager.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/EphemeralKeyManager.java
diff --git a/jdk/src/share/classes/sun/security/ssl/ExtensionType.java b/jdk/src/java.base/share/classes/sun/security/ssl/ExtensionType.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/ExtensionType.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/ExtensionType.java
diff --git a/jdk/src/share/classes/sun/security/ssl/HandshakeHash.java b/jdk/src/java.base/share/classes/sun/security/ssl/HandshakeHash.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/HandshakeHash.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/HandshakeHash.java
diff --git a/jdk/src/share/classes/sun/security/ssl/HandshakeInStream.java b/jdk/src/java.base/share/classes/sun/security/ssl/HandshakeInStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/HandshakeInStream.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/HandshakeInStream.java
diff --git a/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java b/jdk/src/java.base/share/classes/sun/security/ssl/HandshakeMessage.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/HandshakeMessage.java
diff --git a/jdk/src/share/classes/sun/security/ssl/HandshakeOutStream.java b/jdk/src/java.base/share/classes/sun/security/ssl/HandshakeOutStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/HandshakeOutStream.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/HandshakeOutStream.java
diff --git a/jdk/src/share/classes/sun/security/ssl/Handshaker.java b/jdk/src/java.base/share/classes/sun/security/ssl/Handshaker.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/Handshaker.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/Handshaker.java
diff --git a/jdk/src/share/classes/sun/security/ssl/HelloExtension.java b/jdk/src/java.base/share/classes/sun/security/ssl/HelloExtension.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/HelloExtension.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/HelloExtension.java
diff --git a/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java b/jdk/src/java.base/share/classes/sun/security/ssl/HelloExtensions.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/HelloExtensions.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/HelloExtensions.java
diff --git a/jdk/src/share/classes/sun/security/ssl/InputRecord.java b/jdk/src/java.base/share/classes/sun/security/ssl/InputRecord.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/InputRecord.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/InputRecord.java
diff --git a/jdk/src/share/classes/sun/security/ssl/JsseJce.java b/jdk/src/java.base/share/classes/sun/security/ssl/JsseJce.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/JsseJce.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/JsseJce.java
diff --git a/jdk/src/share/classes/sun/security/ssl/KerberosClientKeyExchange.java b/jdk/src/java.base/share/classes/sun/security/ssl/KerberosClientKeyExchange.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/KerberosClientKeyExchange.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/KerberosClientKeyExchange.java
diff --git a/jdk/src/share/classes/sun/security/ssl/KeyManagerFactoryImpl.java b/jdk/src/java.base/share/classes/sun/security/ssl/KeyManagerFactoryImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/KeyManagerFactoryImpl.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/KeyManagerFactoryImpl.java
diff --git a/jdk/src/share/classes/sun/security/ssl/Krb5Helper.java b/jdk/src/java.base/share/classes/sun/security/ssl/Krb5Helper.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/Krb5Helper.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/Krb5Helper.java
diff --git a/jdk/src/share/classes/sun/security/ssl/Krb5Proxy.java b/jdk/src/java.base/share/classes/sun/security/ssl/Krb5Proxy.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/Krb5Proxy.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/Krb5Proxy.java
diff --git a/jdk/src/share/classes/sun/security/ssl/MAC.java b/jdk/src/java.base/share/classes/sun/security/ssl/MAC.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/MAC.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/MAC.java
diff --git a/jdk/src/share/classes/sun/security/ssl/OutputRecord.java b/jdk/src/java.base/share/classes/sun/security/ssl/OutputRecord.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/OutputRecord.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/OutputRecord.java
diff --git a/jdk/src/share/classes/sun/security/ssl/ProtocolList.java b/jdk/src/java.base/share/classes/sun/security/ssl/ProtocolList.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/ProtocolList.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/ProtocolList.java
diff --git a/jdk/src/share/classes/sun/security/ssl/ProtocolVersion.java b/jdk/src/java.base/share/classes/sun/security/ssl/ProtocolVersion.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/ProtocolVersion.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/ProtocolVersion.java
diff --git a/jdk/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java b/jdk/src/java.base/share/classes/sun/security/ssl/RSAClientKeyExchange.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/RSAClientKeyExchange.java
diff --git a/jdk/src/share/classes/sun/security/ssl/RSASignature.java b/jdk/src/java.base/share/classes/sun/security/ssl/RSASignature.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/RSASignature.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/RSASignature.java
diff --git a/jdk/src/share/classes/sun/security/ssl/RandomCookie.java b/jdk/src/java.base/share/classes/sun/security/ssl/RandomCookie.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/RandomCookie.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/RandomCookie.java
diff --git a/jdk/src/share/classes/sun/security/ssl/Record.java b/jdk/src/java.base/share/classes/sun/security/ssl/Record.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/Record.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/Record.java
diff --git a/jdk/src/share/classes/sun/security/ssl/RenegotiationInfoExtension.java b/jdk/src/java.base/share/classes/sun/security/ssl/RenegotiationInfoExtension.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/RenegotiationInfoExtension.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/RenegotiationInfoExtension.java
diff --git a/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java b/jdk/src/java.base/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java
diff --git a/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java b/jdk/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java
diff --git a/jdk/src/share/classes/sun/security/ssl/SSLEngineImpl.java b/jdk/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/SSLEngineImpl.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java
diff --git a/jdk/src/share/classes/sun/security/ssl/SSLServerSocketFactoryImpl.java b/jdk/src/java.base/share/classes/sun/security/ssl/SSLServerSocketFactoryImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/SSLServerSocketFactoryImpl.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/SSLServerSocketFactoryImpl.java
diff --git a/jdk/src/share/classes/sun/security/ssl/SSLServerSocketImpl.java b/jdk/src/java.base/share/classes/sun/security/ssl/SSLServerSocketImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/SSLServerSocketImpl.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/SSLServerSocketImpl.java
diff --git a/jdk/src/share/classes/sun/security/ssl/SSLSessionContextImpl.java b/jdk/src/java.base/share/classes/sun/security/ssl/SSLSessionContextImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/SSLSessionContextImpl.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/SSLSessionContextImpl.java
diff --git a/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java b/jdk/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java
diff --git a/jdk/src/share/classes/sun/security/ssl/SSLSocketFactoryImpl.java b/jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketFactoryImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/SSLSocketFactoryImpl.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketFactoryImpl.java
diff --git a/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java b/jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
diff --git a/jdk/src/share/classes/sun/security/ssl/ServerHandshaker.java b/jdk/src/java.base/share/classes/sun/security/ssl/ServerHandshaker.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/ServerHandshaker.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/ServerHandshaker.java
diff --git a/jdk/src/share/classes/sun/security/ssl/ServerNameExtension.java b/jdk/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/ServerNameExtension.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java
diff --git a/jdk/src/share/classes/sun/security/ssl/SessionId.java b/jdk/src/java.base/share/classes/sun/security/ssl/SessionId.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/SessionId.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/SessionId.java
diff --git a/jdk/src/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java b/jdk/src/java.base/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java
diff --git a/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java b/jdk/src/java.base/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java
diff --git a/jdk/src/share/classes/sun/security/ssl/SunJSSE.java b/jdk/src/java.base/share/classes/sun/security/ssl/SunJSSE.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/SunJSSE.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/SunJSSE.java
diff --git a/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java b/jdk/src/java.base/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java
diff --git a/jdk/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java b/jdk/src/java.base/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java
diff --git a/jdk/src/share/classes/sun/security/ssl/SupportedEllipticPointFormatsExtension.java b/jdk/src/java.base/share/classes/sun/security/ssl/SupportedEllipticPointFormatsExtension.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/SupportedEllipticPointFormatsExtension.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/SupportedEllipticPointFormatsExtension.java
diff --git a/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java b/jdk/src/java.base/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
diff --git a/jdk/src/share/classes/sun/security/ssl/UnknownExtension.java b/jdk/src/java.base/share/classes/sun/security/ssl/UnknownExtension.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/UnknownExtension.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/UnknownExtension.java
diff --git a/jdk/src/share/classes/sun/security/ssl/Utilities.java b/jdk/src/java.base/share/classes/sun/security/ssl/Utilities.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/Utilities.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/Utilities.java
diff --git a/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java b/jdk/src/java.base/share/classes/sun/security/ssl/X509KeyManagerImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/X509KeyManagerImpl.java
diff --git a/jdk/src/share/classes/sun/security/ssl/X509TrustManagerImpl.java b/jdk/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/X509TrustManagerImpl.java
rename to jdk/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java
diff --git a/jdk/src/share/classes/sun/security/timestamp/HttpTimestamper.java b/jdk/src/java.base/share/classes/sun/security/timestamp/HttpTimestamper.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/timestamp/HttpTimestamper.java
rename to jdk/src/java.base/share/classes/sun/security/timestamp/HttpTimestamper.java
diff --git a/jdk/src/share/classes/sun/security/timestamp/TSRequest.java b/jdk/src/java.base/share/classes/sun/security/timestamp/TSRequest.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/timestamp/TSRequest.java
rename to jdk/src/java.base/share/classes/sun/security/timestamp/TSRequest.java
diff --git a/jdk/src/share/classes/sun/security/timestamp/TSResponse.java b/jdk/src/java.base/share/classes/sun/security/timestamp/TSResponse.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/timestamp/TSResponse.java
rename to jdk/src/java.base/share/classes/sun/security/timestamp/TSResponse.java
diff --git a/jdk/src/share/classes/sun/security/timestamp/TimestampToken.java b/jdk/src/java.base/share/classes/sun/security/timestamp/TimestampToken.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/timestamp/TimestampToken.java
rename to jdk/src/java.base/share/classes/sun/security/timestamp/TimestampToken.java
diff --git a/jdk/src/share/classes/sun/security/timestamp/Timestamper.java b/jdk/src/java.base/share/classes/sun/security/timestamp/Timestamper.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/timestamp/Timestamper.java
rename to jdk/src/java.base/share/classes/sun/security/timestamp/Timestamper.java
diff --git a/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java b/jdk/src/java.base/share/classes/sun/security/tools/KeyStoreUtil.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
rename to jdk/src/java.base/share/classes/sun/security/tools/KeyStoreUtil.java
diff --git a/jdk/src/share/classes/sun/security/tools/PathList.java b/jdk/src/java.base/share/classes/sun/security/tools/PathList.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/tools/PathList.java
rename to jdk/src/java.base/share/classes/sun/security/tools/PathList.java
diff --git a/jdk/src/share/classes/sun/security/tools/keytool/CertAndKeyGen.java b/jdk/src/java.base/share/classes/sun/security/tools/keytool/CertAndKeyGen.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/tools/keytool/CertAndKeyGen.java
rename to jdk/src/java.base/share/classes/sun/security/tools/keytool/CertAndKeyGen.java
diff --git a/jdk/src/share/classes/sun/security/tools/keytool/Main.java b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Main.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/tools/keytool/Main.java
rename to jdk/src/java.base/share/classes/sun/security/tools/keytool/Main.java
diff --git a/jdk/src/share/classes/sun/security/tools/keytool/Resources.java b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/tools/keytool/Resources.java
rename to jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources.java
diff --git a/jdk/src/share/classes/sun/security/tools/keytool/Resources_de.java b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_de.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/tools/keytool/Resources_de.java
rename to jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_de.java
diff --git a/jdk/src/share/classes/sun/security/tools/keytool/Resources_es.java b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_es.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/tools/keytool/Resources_es.java
rename to jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_es.java
diff --git a/jdk/src/share/classes/sun/security/tools/keytool/Resources_fr.java b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_fr.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/tools/keytool/Resources_fr.java
rename to jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_fr.java
diff --git a/jdk/src/share/classes/sun/security/tools/keytool/Resources_it.java b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_it.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/tools/keytool/Resources_it.java
rename to jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_it.java
diff --git a/jdk/src/share/classes/sun/security/tools/keytool/Resources_ja.java b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_ja.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/tools/keytool/Resources_ja.java
rename to jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_ja.java
diff --git a/jdk/src/share/classes/sun/security/tools/keytool/Resources_ko.java b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_ko.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/tools/keytool/Resources_ko.java
rename to jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_ko.java
diff --git a/jdk/src/share/classes/sun/security/tools/keytool/Resources_pt_BR.java b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_pt_BR.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/tools/keytool/Resources_pt_BR.java
rename to jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_pt_BR.java
diff --git a/jdk/src/share/classes/sun/security/tools/keytool/Resources_sv.java b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_sv.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/tools/keytool/Resources_sv.java
rename to jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_sv.java
diff --git a/jdk/src/share/classes/sun/security/tools/keytool/Resources_zh_CN.java b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/tools/keytool/Resources_zh_CN.java
rename to jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java
diff --git a/jdk/src/share/classes/sun/security/tools/keytool/Resources_zh_HK.java b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_HK.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/tools/keytool/Resources_zh_HK.java
rename to jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_HK.java
diff --git a/jdk/src/share/classes/sun/security/tools/keytool/Resources_zh_TW.java b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_TW.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/tools/keytool/Resources_zh_TW.java
rename to jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_TW.java
diff --git a/jdk/src/share/classes/sun/security/util/AuthResources.java b/jdk/src/java.base/share/classes/sun/security/util/AuthResources.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/AuthResources.java
rename to jdk/src/java.base/share/classes/sun/security/util/AuthResources.java
diff --git a/jdk/src/share/classes/sun/security/util/AuthResources_de.java b/jdk/src/java.base/share/classes/sun/security/util/AuthResources_de.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/AuthResources_de.java
rename to jdk/src/java.base/share/classes/sun/security/util/AuthResources_de.java
diff --git a/jdk/src/share/classes/sun/security/util/AuthResources_es.java b/jdk/src/java.base/share/classes/sun/security/util/AuthResources_es.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/AuthResources_es.java
rename to jdk/src/java.base/share/classes/sun/security/util/AuthResources_es.java
diff --git a/jdk/src/share/classes/sun/security/util/AuthResources_fr.java b/jdk/src/java.base/share/classes/sun/security/util/AuthResources_fr.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/AuthResources_fr.java
rename to jdk/src/java.base/share/classes/sun/security/util/AuthResources_fr.java
diff --git a/jdk/src/share/classes/sun/security/util/AuthResources_it.java b/jdk/src/java.base/share/classes/sun/security/util/AuthResources_it.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/AuthResources_it.java
rename to jdk/src/java.base/share/classes/sun/security/util/AuthResources_it.java
diff --git a/jdk/src/share/classes/sun/security/util/AuthResources_ja.java b/jdk/src/java.base/share/classes/sun/security/util/AuthResources_ja.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/AuthResources_ja.java
rename to jdk/src/java.base/share/classes/sun/security/util/AuthResources_ja.java
diff --git a/jdk/src/share/classes/sun/security/util/AuthResources_ko.java b/jdk/src/java.base/share/classes/sun/security/util/AuthResources_ko.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/AuthResources_ko.java
rename to jdk/src/java.base/share/classes/sun/security/util/AuthResources_ko.java
diff --git a/jdk/src/share/classes/sun/security/util/AuthResources_pt_BR.java b/jdk/src/java.base/share/classes/sun/security/util/AuthResources_pt_BR.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/AuthResources_pt_BR.java
rename to jdk/src/java.base/share/classes/sun/security/util/AuthResources_pt_BR.java
diff --git a/jdk/src/share/classes/sun/security/util/AuthResources_sv.java b/jdk/src/java.base/share/classes/sun/security/util/AuthResources_sv.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/AuthResources_sv.java
rename to jdk/src/java.base/share/classes/sun/security/util/AuthResources_sv.java
diff --git a/jdk/src/share/classes/sun/security/util/AuthResources_zh_CN.java b/jdk/src/java.base/share/classes/sun/security/util/AuthResources_zh_CN.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/AuthResources_zh_CN.java
rename to jdk/src/java.base/share/classes/sun/security/util/AuthResources_zh_CN.java
diff --git a/jdk/src/share/classes/sun/security/util/AuthResources_zh_TW.java b/jdk/src/java.base/share/classes/sun/security/util/AuthResources_zh_TW.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/AuthResources_zh_TW.java
rename to jdk/src/java.base/share/classes/sun/security/util/AuthResources_zh_TW.java
diff --git a/jdk/src/share/classes/sun/security/util/BitArray.java b/jdk/src/java.base/share/classes/sun/security/util/BitArray.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/BitArray.java
rename to jdk/src/java.base/share/classes/sun/security/util/BitArray.java
diff --git a/jdk/src/share/classes/sun/security/util/ByteArrayLexOrder.java b/jdk/src/java.base/share/classes/sun/security/util/ByteArrayLexOrder.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/ByteArrayLexOrder.java
rename to jdk/src/java.base/share/classes/sun/security/util/ByteArrayLexOrder.java
diff --git a/jdk/src/share/classes/sun/security/util/ByteArrayTagOrder.java b/jdk/src/java.base/share/classes/sun/security/util/ByteArrayTagOrder.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/ByteArrayTagOrder.java
rename to jdk/src/java.base/share/classes/sun/security/util/ByteArrayTagOrder.java
diff --git a/jdk/src/share/classes/sun/security/util/Cache.java b/jdk/src/java.base/share/classes/sun/security/util/Cache.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/Cache.java
rename to jdk/src/java.base/share/classes/sun/security/util/Cache.java
diff --git a/jdk/src/share/classes/sun/security/util/ConsoleCallbackHandler.java b/jdk/src/java.base/share/classes/sun/security/util/ConsoleCallbackHandler.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/ConsoleCallbackHandler.java
rename to jdk/src/java.base/share/classes/sun/security/util/ConsoleCallbackHandler.java
diff --git a/jdk/src/share/classes/sun/security/util/CurveDB.java b/jdk/src/java.base/share/classes/sun/security/util/CurveDB.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/CurveDB.java
rename to jdk/src/java.base/share/classes/sun/security/util/CurveDB.java
diff --git a/jdk/src/share/classes/sun/security/util/Debug.java b/jdk/src/java.base/share/classes/sun/security/util/Debug.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/Debug.java
rename to jdk/src/java.base/share/classes/sun/security/util/Debug.java
diff --git a/jdk/src/share/classes/sun/security/util/DerEncoder.java b/jdk/src/java.base/share/classes/sun/security/util/DerEncoder.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/DerEncoder.java
rename to jdk/src/java.base/share/classes/sun/security/util/DerEncoder.java
diff --git a/jdk/src/share/classes/sun/security/util/DerIndefLenConverter.java b/jdk/src/java.base/share/classes/sun/security/util/DerIndefLenConverter.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/DerIndefLenConverter.java
rename to jdk/src/java.base/share/classes/sun/security/util/DerIndefLenConverter.java
diff --git a/jdk/src/share/classes/sun/security/util/DerInputBuffer.java b/jdk/src/java.base/share/classes/sun/security/util/DerInputBuffer.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/DerInputBuffer.java
rename to jdk/src/java.base/share/classes/sun/security/util/DerInputBuffer.java
diff --git a/jdk/src/share/classes/sun/security/util/DerInputStream.java b/jdk/src/java.base/share/classes/sun/security/util/DerInputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/DerInputStream.java
rename to jdk/src/java.base/share/classes/sun/security/util/DerInputStream.java
diff --git a/jdk/src/share/classes/sun/security/util/DerOutputStream.java b/jdk/src/java.base/share/classes/sun/security/util/DerOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/DerOutputStream.java
rename to jdk/src/java.base/share/classes/sun/security/util/DerOutputStream.java
diff --git a/jdk/src/share/classes/sun/security/util/DerValue.java b/jdk/src/java.base/share/classes/sun/security/util/DerValue.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/DerValue.java
rename to jdk/src/java.base/share/classes/sun/security/util/DerValue.java
diff --git a/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java b/jdk/src/java.base/share/classes/sun/security/util/DisabledAlgorithmConstraints.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java
rename to jdk/src/java.base/share/classes/sun/security/util/DisabledAlgorithmConstraints.java
diff --git a/jdk/src/share/classes/sun/security/util/ECKeySizeParameterSpec.java b/jdk/src/java.base/share/classes/sun/security/util/ECKeySizeParameterSpec.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/ECKeySizeParameterSpec.java
rename to jdk/src/java.base/share/classes/sun/security/util/ECKeySizeParameterSpec.java
diff --git a/jdk/src/share/classes/sun/security/util/ECParameters.java b/jdk/src/java.base/share/classes/sun/security/util/ECParameters.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/ECParameters.java
rename to jdk/src/java.base/share/classes/sun/security/util/ECParameters.java
diff --git a/jdk/src/share/classes/sun/security/util/ECUtil.java b/jdk/src/java.base/share/classes/sun/security/util/ECUtil.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/ECUtil.java
rename to jdk/src/java.base/share/classes/sun/security/util/ECUtil.java
diff --git a/jdk/src/share/classes/sun/security/util/HostnameChecker.java b/jdk/src/java.base/share/classes/sun/security/util/HostnameChecker.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/HostnameChecker.java
rename to jdk/src/java.base/share/classes/sun/security/util/HostnameChecker.java
diff --git a/jdk/src/share/classes/sun/security/util/KeyUtil.java b/jdk/src/java.base/share/classes/sun/security/util/KeyUtil.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/KeyUtil.java
rename to jdk/src/java.base/share/classes/sun/security/util/KeyUtil.java
diff --git a/jdk/src/share/classes/sun/security/util/Length.java b/jdk/src/java.base/share/classes/sun/security/util/Length.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/Length.java
rename to jdk/src/java.base/share/classes/sun/security/util/Length.java
diff --git a/jdk/src/share/classes/sun/security/util/ManifestDigester.java b/jdk/src/java.base/share/classes/sun/security/util/ManifestDigester.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/ManifestDigester.java
rename to jdk/src/java.base/share/classes/sun/security/util/ManifestDigester.java
diff --git a/jdk/src/share/classes/sun/security/util/ManifestEntryVerifier.java b/jdk/src/java.base/share/classes/sun/security/util/ManifestEntryVerifier.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/ManifestEntryVerifier.java
rename to jdk/src/java.base/share/classes/sun/security/util/ManifestEntryVerifier.java
diff --git a/jdk/src/share/classes/sun/security/util/NamedCurve.java b/jdk/src/java.base/share/classes/sun/security/util/NamedCurve.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/NamedCurve.java
rename to jdk/src/java.base/share/classes/sun/security/util/NamedCurve.java
diff --git a/jdk/src/share/classes/sun/security/util/ObjectIdentifier.java b/jdk/src/java.base/share/classes/sun/security/util/ObjectIdentifier.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/ObjectIdentifier.java
rename to jdk/src/java.base/share/classes/sun/security/util/ObjectIdentifier.java
diff --git a/jdk/src/share/classes/sun/security/util/Password.java b/jdk/src/java.base/share/classes/sun/security/util/Password.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/Password.java
rename to jdk/src/java.base/share/classes/sun/security/util/Password.java
diff --git a/jdk/src/share/classes/sun/security/util/PendingException.java b/jdk/src/java.base/share/classes/sun/security/util/PendingException.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/PendingException.java
rename to jdk/src/java.base/share/classes/sun/security/util/PendingException.java
diff --git a/jdk/src/share/classes/sun/security/util/PermissionFactory.java b/jdk/src/java.base/share/classes/sun/security/util/PermissionFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/PermissionFactory.java
rename to jdk/src/java.base/share/classes/sun/security/util/PermissionFactory.java
diff --git a/jdk/src/share/classes/sun/security/util/PolicyUtil.java b/jdk/src/java.base/share/classes/sun/security/util/PolicyUtil.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/PolicyUtil.java
rename to jdk/src/java.base/share/classes/sun/security/util/PolicyUtil.java
diff --git a/jdk/src/share/classes/sun/security/util/PropertyExpander.java b/jdk/src/java.base/share/classes/sun/security/util/PropertyExpander.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/PropertyExpander.java
rename to jdk/src/java.base/share/classes/sun/security/util/PropertyExpander.java
diff --git a/jdk/src/share/classes/sun/security/util/Resources.java b/jdk/src/java.base/share/classes/sun/security/util/Resources.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/Resources.java
rename to jdk/src/java.base/share/classes/sun/security/util/Resources.java
diff --git a/jdk/src/share/classes/sun/security/util/ResourcesMgr.java b/jdk/src/java.base/share/classes/sun/security/util/ResourcesMgr.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/ResourcesMgr.java
rename to jdk/src/java.base/share/classes/sun/security/util/ResourcesMgr.java
diff --git a/jdk/src/share/classes/sun/security/util/Resources_de.java b/jdk/src/java.base/share/classes/sun/security/util/Resources_de.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/Resources_de.java
rename to jdk/src/java.base/share/classes/sun/security/util/Resources_de.java
diff --git a/jdk/src/share/classes/sun/security/util/Resources_es.java b/jdk/src/java.base/share/classes/sun/security/util/Resources_es.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/Resources_es.java
rename to jdk/src/java.base/share/classes/sun/security/util/Resources_es.java
diff --git a/jdk/src/share/classes/sun/security/util/Resources_fr.java b/jdk/src/java.base/share/classes/sun/security/util/Resources_fr.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/Resources_fr.java
rename to jdk/src/java.base/share/classes/sun/security/util/Resources_fr.java
diff --git a/jdk/src/share/classes/sun/security/util/Resources_it.java b/jdk/src/java.base/share/classes/sun/security/util/Resources_it.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/Resources_it.java
rename to jdk/src/java.base/share/classes/sun/security/util/Resources_it.java
diff --git a/jdk/src/share/classes/sun/security/util/Resources_ja.java b/jdk/src/java.base/share/classes/sun/security/util/Resources_ja.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/Resources_ja.java
rename to jdk/src/java.base/share/classes/sun/security/util/Resources_ja.java
diff --git a/jdk/src/share/classes/sun/security/util/Resources_ko.java b/jdk/src/java.base/share/classes/sun/security/util/Resources_ko.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/Resources_ko.java
rename to jdk/src/java.base/share/classes/sun/security/util/Resources_ko.java
diff --git a/jdk/src/share/classes/sun/security/util/Resources_pt_BR.java b/jdk/src/java.base/share/classes/sun/security/util/Resources_pt_BR.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/Resources_pt_BR.java
rename to jdk/src/java.base/share/classes/sun/security/util/Resources_pt_BR.java
diff --git a/jdk/src/share/classes/sun/security/util/Resources_sv.java b/jdk/src/java.base/share/classes/sun/security/util/Resources_sv.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/Resources_sv.java
rename to jdk/src/java.base/share/classes/sun/security/util/Resources_sv.java
diff --git a/jdk/src/share/classes/sun/security/util/Resources_zh_CN.java b/jdk/src/java.base/share/classes/sun/security/util/Resources_zh_CN.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/Resources_zh_CN.java
rename to jdk/src/java.base/share/classes/sun/security/util/Resources_zh_CN.java
diff --git a/jdk/src/share/classes/sun/security/util/Resources_zh_TW.java b/jdk/src/java.base/share/classes/sun/security/util/Resources_zh_TW.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/Resources_zh_TW.java
rename to jdk/src/java.base/share/classes/sun/security/util/Resources_zh_TW.java
diff --git a/jdk/src/share/classes/sun/security/util/SecurityConstants.java b/jdk/src/java.base/share/classes/sun/security/util/SecurityConstants.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/SecurityConstants.java
rename to jdk/src/java.base/share/classes/sun/security/util/SecurityConstants.java
diff --git a/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java b/jdk/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java
rename to jdk/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
diff --git a/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java b/jdk/src/java.base/share/classes/sun/security/util/UntrustedCertificates.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/util/UntrustedCertificates.java
rename to jdk/src/java.base/share/classes/sun/security/util/UntrustedCertificates.java
diff --git a/jdk/src/share/classes/sun/security/validator/EndEntityChecker.java b/jdk/src/java.base/share/classes/sun/security/validator/EndEntityChecker.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/validator/EndEntityChecker.java
rename to jdk/src/java.base/share/classes/sun/security/validator/EndEntityChecker.java
diff --git a/jdk/src/share/classes/sun/security/validator/KeyStores.java b/jdk/src/java.base/share/classes/sun/security/validator/KeyStores.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/validator/KeyStores.java
rename to jdk/src/java.base/share/classes/sun/security/validator/KeyStores.java
diff --git a/jdk/src/share/classes/sun/security/validator/PKIXValidator.java b/jdk/src/java.base/share/classes/sun/security/validator/PKIXValidator.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/validator/PKIXValidator.java
rename to jdk/src/java.base/share/classes/sun/security/validator/PKIXValidator.java
diff --git a/jdk/src/share/classes/sun/security/validator/SimpleValidator.java b/jdk/src/java.base/share/classes/sun/security/validator/SimpleValidator.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/validator/SimpleValidator.java
rename to jdk/src/java.base/share/classes/sun/security/validator/SimpleValidator.java
diff --git a/jdk/src/share/classes/sun/security/validator/Validator.java b/jdk/src/java.base/share/classes/sun/security/validator/Validator.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/validator/Validator.java
rename to jdk/src/java.base/share/classes/sun/security/validator/Validator.java
diff --git a/jdk/src/share/classes/sun/security/validator/ValidatorException.java b/jdk/src/java.base/share/classes/sun/security/validator/ValidatorException.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/validator/ValidatorException.java
rename to jdk/src/java.base/share/classes/sun/security/validator/ValidatorException.java
diff --git a/jdk/src/share/classes/sun/security/x509/AVA.java b/jdk/src/java.base/share/classes/sun/security/x509/AVA.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/AVA.java
rename to jdk/src/java.base/share/classes/sun/security/x509/AVA.java
diff --git a/jdk/src/share/classes/sun/security/x509/AccessDescription.java b/jdk/src/java.base/share/classes/sun/security/x509/AccessDescription.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/AccessDescription.java
rename to jdk/src/java.base/share/classes/sun/security/x509/AccessDescription.java
diff --git a/jdk/src/share/classes/sun/security/x509/AlgIdDSA.java b/jdk/src/java.base/share/classes/sun/security/x509/AlgIdDSA.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/AlgIdDSA.java
rename to jdk/src/java.base/share/classes/sun/security/x509/AlgIdDSA.java
diff --git a/jdk/src/share/classes/sun/security/x509/AlgorithmId.java b/jdk/src/java.base/share/classes/sun/security/x509/AlgorithmId.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/AlgorithmId.java
rename to jdk/src/java.base/share/classes/sun/security/x509/AlgorithmId.java
diff --git a/jdk/src/share/classes/sun/security/x509/AttributeNameEnumeration.java b/jdk/src/java.base/share/classes/sun/security/x509/AttributeNameEnumeration.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/AttributeNameEnumeration.java
rename to jdk/src/java.base/share/classes/sun/security/x509/AttributeNameEnumeration.java
diff --git a/jdk/src/share/classes/sun/security/x509/AuthorityInfoAccessExtension.java b/jdk/src/java.base/share/classes/sun/security/x509/AuthorityInfoAccessExtension.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/AuthorityInfoAccessExtension.java
rename to jdk/src/java.base/share/classes/sun/security/x509/AuthorityInfoAccessExtension.java
diff --git a/jdk/src/share/classes/sun/security/x509/AuthorityKeyIdentifierExtension.java b/jdk/src/java.base/share/classes/sun/security/x509/AuthorityKeyIdentifierExtension.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/AuthorityKeyIdentifierExtension.java
rename to jdk/src/java.base/share/classes/sun/security/x509/AuthorityKeyIdentifierExtension.java
diff --git a/jdk/src/share/classes/sun/security/x509/BasicConstraintsExtension.java b/jdk/src/java.base/share/classes/sun/security/x509/BasicConstraintsExtension.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/BasicConstraintsExtension.java
rename to jdk/src/java.base/share/classes/sun/security/x509/BasicConstraintsExtension.java
diff --git a/jdk/src/share/classes/sun/security/x509/CRLDistributionPointsExtension.java b/jdk/src/java.base/share/classes/sun/security/x509/CRLDistributionPointsExtension.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/CRLDistributionPointsExtension.java
rename to jdk/src/java.base/share/classes/sun/security/x509/CRLDistributionPointsExtension.java
diff --git a/jdk/src/share/classes/sun/security/x509/CRLExtensions.java b/jdk/src/java.base/share/classes/sun/security/x509/CRLExtensions.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/CRLExtensions.java
rename to jdk/src/java.base/share/classes/sun/security/x509/CRLExtensions.java
diff --git a/jdk/src/share/classes/sun/security/x509/CRLNumberExtension.java b/jdk/src/java.base/share/classes/sun/security/x509/CRLNumberExtension.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/CRLNumberExtension.java
rename to jdk/src/java.base/share/classes/sun/security/x509/CRLNumberExtension.java
diff --git a/jdk/src/share/classes/sun/security/x509/CRLReasonCodeExtension.java b/jdk/src/java.base/share/classes/sun/security/x509/CRLReasonCodeExtension.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/CRLReasonCodeExtension.java
rename to jdk/src/java.base/share/classes/sun/security/x509/CRLReasonCodeExtension.java
diff --git a/jdk/src/share/classes/sun/security/x509/CertAttrSet.java b/jdk/src/java.base/share/classes/sun/security/x509/CertAttrSet.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/CertAttrSet.java
rename to jdk/src/java.base/share/classes/sun/security/x509/CertAttrSet.java
diff --git a/jdk/src/share/classes/sun/security/x509/CertException.java b/jdk/src/java.base/share/classes/sun/security/x509/CertException.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/CertException.java
rename to jdk/src/java.base/share/classes/sun/security/x509/CertException.java
diff --git a/jdk/src/share/classes/sun/security/x509/CertParseError.java b/jdk/src/java.base/share/classes/sun/security/x509/CertParseError.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/CertParseError.java
rename to jdk/src/java.base/share/classes/sun/security/x509/CertParseError.java
diff --git a/jdk/src/share/classes/sun/security/x509/CertificateAlgorithmId.java b/jdk/src/java.base/share/classes/sun/security/x509/CertificateAlgorithmId.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/CertificateAlgorithmId.java
rename to jdk/src/java.base/share/classes/sun/security/x509/CertificateAlgorithmId.java
diff --git a/jdk/src/share/classes/sun/security/x509/CertificateExtensions.java b/jdk/src/java.base/share/classes/sun/security/x509/CertificateExtensions.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/CertificateExtensions.java
rename to jdk/src/java.base/share/classes/sun/security/x509/CertificateExtensions.java
diff --git a/jdk/src/share/classes/sun/security/x509/CertificateIssuerExtension.java b/jdk/src/java.base/share/classes/sun/security/x509/CertificateIssuerExtension.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/CertificateIssuerExtension.java
rename to jdk/src/java.base/share/classes/sun/security/x509/CertificateIssuerExtension.java
diff --git a/jdk/src/share/classes/sun/security/x509/CertificateIssuerName.java b/jdk/src/java.base/share/classes/sun/security/x509/CertificateIssuerName.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/CertificateIssuerName.java
rename to jdk/src/java.base/share/classes/sun/security/x509/CertificateIssuerName.java
diff --git a/jdk/src/share/classes/sun/security/x509/CertificatePoliciesExtension.java b/jdk/src/java.base/share/classes/sun/security/x509/CertificatePoliciesExtension.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/CertificatePoliciesExtension.java
rename to jdk/src/java.base/share/classes/sun/security/x509/CertificatePoliciesExtension.java
diff --git a/jdk/src/share/classes/sun/security/x509/CertificatePolicyId.java b/jdk/src/java.base/share/classes/sun/security/x509/CertificatePolicyId.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/CertificatePolicyId.java
rename to jdk/src/java.base/share/classes/sun/security/x509/CertificatePolicyId.java
diff --git a/jdk/src/share/classes/sun/security/x509/CertificatePolicyMap.java b/jdk/src/java.base/share/classes/sun/security/x509/CertificatePolicyMap.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/CertificatePolicyMap.java
rename to jdk/src/java.base/share/classes/sun/security/x509/CertificatePolicyMap.java
diff --git a/jdk/src/share/classes/sun/security/x509/CertificatePolicySet.java b/jdk/src/java.base/share/classes/sun/security/x509/CertificatePolicySet.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/CertificatePolicySet.java
rename to jdk/src/java.base/share/classes/sun/security/x509/CertificatePolicySet.java
diff --git a/jdk/src/share/classes/sun/security/x509/CertificateSerialNumber.java b/jdk/src/java.base/share/classes/sun/security/x509/CertificateSerialNumber.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/CertificateSerialNumber.java
rename to jdk/src/java.base/share/classes/sun/security/x509/CertificateSerialNumber.java
diff --git a/jdk/src/share/classes/sun/security/x509/CertificateSubjectName.java b/jdk/src/java.base/share/classes/sun/security/x509/CertificateSubjectName.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/CertificateSubjectName.java
rename to jdk/src/java.base/share/classes/sun/security/x509/CertificateSubjectName.java
diff --git a/jdk/src/share/classes/sun/security/x509/CertificateValidity.java b/jdk/src/java.base/share/classes/sun/security/x509/CertificateValidity.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/CertificateValidity.java
rename to jdk/src/java.base/share/classes/sun/security/x509/CertificateValidity.java
diff --git a/jdk/src/share/classes/sun/security/x509/CertificateVersion.java b/jdk/src/java.base/share/classes/sun/security/x509/CertificateVersion.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/CertificateVersion.java
rename to jdk/src/java.base/share/classes/sun/security/x509/CertificateVersion.java
diff --git a/jdk/src/share/classes/sun/security/x509/CertificateX509Key.java b/jdk/src/java.base/share/classes/sun/security/x509/CertificateX509Key.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/CertificateX509Key.java
rename to jdk/src/java.base/share/classes/sun/security/x509/CertificateX509Key.java
diff --git a/jdk/src/share/classes/sun/security/x509/DNSName.java b/jdk/src/java.base/share/classes/sun/security/x509/DNSName.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/DNSName.java
rename to jdk/src/java.base/share/classes/sun/security/x509/DNSName.java
diff --git a/jdk/src/share/classes/sun/security/x509/DeltaCRLIndicatorExtension.java b/jdk/src/java.base/share/classes/sun/security/x509/DeltaCRLIndicatorExtension.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/DeltaCRLIndicatorExtension.java
rename to jdk/src/java.base/share/classes/sun/security/x509/DeltaCRLIndicatorExtension.java
diff --git a/jdk/src/share/classes/sun/security/x509/DistributionPoint.java b/jdk/src/java.base/share/classes/sun/security/x509/DistributionPoint.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/DistributionPoint.java
rename to jdk/src/java.base/share/classes/sun/security/x509/DistributionPoint.java
diff --git a/jdk/src/share/classes/sun/security/x509/DistributionPointName.java b/jdk/src/java.base/share/classes/sun/security/x509/DistributionPointName.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/DistributionPointName.java
rename to jdk/src/java.base/share/classes/sun/security/x509/DistributionPointName.java
diff --git a/jdk/src/share/classes/sun/security/x509/EDIPartyName.java b/jdk/src/java.base/share/classes/sun/security/x509/EDIPartyName.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/EDIPartyName.java
rename to jdk/src/java.base/share/classes/sun/security/x509/EDIPartyName.java
diff --git a/jdk/src/share/classes/sun/security/x509/ExtendedKeyUsageExtension.java b/jdk/src/java.base/share/classes/sun/security/x509/ExtendedKeyUsageExtension.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/ExtendedKeyUsageExtension.java
rename to jdk/src/java.base/share/classes/sun/security/x509/ExtendedKeyUsageExtension.java
diff --git a/jdk/src/share/classes/sun/security/x509/Extension.java b/jdk/src/java.base/share/classes/sun/security/x509/Extension.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/Extension.java
rename to jdk/src/java.base/share/classes/sun/security/x509/Extension.java
diff --git a/jdk/src/share/classes/sun/security/x509/FreshestCRLExtension.java b/jdk/src/java.base/share/classes/sun/security/x509/FreshestCRLExtension.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/FreshestCRLExtension.java
rename to jdk/src/java.base/share/classes/sun/security/x509/FreshestCRLExtension.java
diff --git a/jdk/src/share/classes/sun/security/x509/GeneralName.java b/jdk/src/java.base/share/classes/sun/security/x509/GeneralName.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/GeneralName.java
rename to jdk/src/java.base/share/classes/sun/security/x509/GeneralName.java
diff --git a/jdk/src/share/classes/sun/security/x509/GeneralNameInterface.java b/jdk/src/java.base/share/classes/sun/security/x509/GeneralNameInterface.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/GeneralNameInterface.java
rename to jdk/src/java.base/share/classes/sun/security/x509/GeneralNameInterface.java
diff --git a/jdk/src/share/classes/sun/security/x509/GeneralNames.java b/jdk/src/java.base/share/classes/sun/security/x509/GeneralNames.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/GeneralNames.java
rename to jdk/src/java.base/share/classes/sun/security/x509/GeneralNames.java
diff --git a/jdk/src/share/classes/sun/security/x509/GeneralSubtree.java b/jdk/src/java.base/share/classes/sun/security/x509/GeneralSubtree.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/GeneralSubtree.java
rename to jdk/src/java.base/share/classes/sun/security/x509/GeneralSubtree.java
diff --git a/jdk/src/share/classes/sun/security/x509/GeneralSubtrees.java b/jdk/src/java.base/share/classes/sun/security/x509/GeneralSubtrees.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/GeneralSubtrees.java
rename to jdk/src/java.base/share/classes/sun/security/x509/GeneralSubtrees.java
diff --git a/jdk/src/share/classes/sun/security/x509/IPAddressName.java b/jdk/src/java.base/share/classes/sun/security/x509/IPAddressName.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/IPAddressName.java
rename to jdk/src/java.base/share/classes/sun/security/x509/IPAddressName.java
diff --git a/jdk/src/share/classes/sun/security/x509/InhibitAnyPolicyExtension.java b/jdk/src/java.base/share/classes/sun/security/x509/InhibitAnyPolicyExtension.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/InhibitAnyPolicyExtension.java
rename to jdk/src/java.base/share/classes/sun/security/x509/InhibitAnyPolicyExtension.java
diff --git a/jdk/src/share/classes/sun/security/x509/InvalidityDateExtension.java b/jdk/src/java.base/share/classes/sun/security/x509/InvalidityDateExtension.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/InvalidityDateExtension.java
rename to jdk/src/java.base/share/classes/sun/security/x509/InvalidityDateExtension.java
diff --git a/jdk/src/share/classes/sun/security/x509/IssuerAlternativeNameExtension.java b/jdk/src/java.base/share/classes/sun/security/x509/IssuerAlternativeNameExtension.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/IssuerAlternativeNameExtension.java
rename to jdk/src/java.base/share/classes/sun/security/x509/IssuerAlternativeNameExtension.java
diff --git a/jdk/src/share/classes/sun/security/x509/IssuingDistributionPointExtension.java b/jdk/src/java.base/share/classes/sun/security/x509/IssuingDistributionPointExtension.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/IssuingDistributionPointExtension.java
rename to jdk/src/java.base/share/classes/sun/security/x509/IssuingDistributionPointExtension.java
diff --git a/jdk/src/share/classes/sun/security/x509/KeyIdentifier.java b/jdk/src/java.base/share/classes/sun/security/x509/KeyIdentifier.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/KeyIdentifier.java
rename to jdk/src/java.base/share/classes/sun/security/x509/KeyIdentifier.java
diff --git a/jdk/src/share/classes/sun/security/x509/KeyUsageExtension.java b/jdk/src/java.base/share/classes/sun/security/x509/KeyUsageExtension.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/KeyUsageExtension.java
rename to jdk/src/java.base/share/classes/sun/security/x509/KeyUsageExtension.java
diff --git a/jdk/src/share/classes/sun/security/x509/NameConstraintsExtension.java b/jdk/src/java.base/share/classes/sun/security/x509/NameConstraintsExtension.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/NameConstraintsExtension.java
rename to jdk/src/java.base/share/classes/sun/security/x509/NameConstraintsExtension.java
diff --git a/jdk/src/share/classes/sun/security/x509/NetscapeCertTypeExtension.java b/jdk/src/java.base/share/classes/sun/security/x509/NetscapeCertTypeExtension.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/NetscapeCertTypeExtension.java
rename to jdk/src/java.base/share/classes/sun/security/x509/NetscapeCertTypeExtension.java
diff --git a/jdk/src/share/classes/sun/security/x509/OCSPNoCheckExtension.java b/jdk/src/java.base/share/classes/sun/security/x509/OCSPNoCheckExtension.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/OCSPNoCheckExtension.java
rename to jdk/src/java.base/share/classes/sun/security/x509/OCSPNoCheckExtension.java
diff --git a/jdk/src/share/classes/sun/security/x509/OIDMap.java b/jdk/src/java.base/share/classes/sun/security/x509/OIDMap.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/OIDMap.java
rename to jdk/src/java.base/share/classes/sun/security/x509/OIDMap.java
diff --git a/jdk/src/share/classes/sun/security/x509/OIDName.java b/jdk/src/java.base/share/classes/sun/security/x509/OIDName.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/OIDName.java
rename to jdk/src/java.base/share/classes/sun/security/x509/OIDName.java
diff --git a/jdk/src/share/classes/sun/security/x509/OtherName.java b/jdk/src/java.base/share/classes/sun/security/x509/OtherName.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/OtherName.java
rename to jdk/src/java.base/share/classes/sun/security/x509/OtherName.java
diff --git a/jdk/src/share/classes/sun/security/x509/PKIXExtensions.java b/jdk/src/java.base/share/classes/sun/security/x509/PKIXExtensions.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/PKIXExtensions.java
rename to jdk/src/java.base/share/classes/sun/security/x509/PKIXExtensions.java
diff --git a/jdk/src/share/classes/sun/security/x509/PolicyConstraintsExtension.java b/jdk/src/java.base/share/classes/sun/security/x509/PolicyConstraintsExtension.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/PolicyConstraintsExtension.java
rename to jdk/src/java.base/share/classes/sun/security/x509/PolicyConstraintsExtension.java
diff --git a/jdk/src/share/classes/sun/security/x509/PolicyInformation.java b/jdk/src/java.base/share/classes/sun/security/x509/PolicyInformation.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/PolicyInformation.java
rename to jdk/src/java.base/share/classes/sun/security/x509/PolicyInformation.java
diff --git a/jdk/src/share/classes/sun/security/x509/PolicyMappingsExtension.java b/jdk/src/java.base/share/classes/sun/security/x509/PolicyMappingsExtension.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/PolicyMappingsExtension.java
rename to jdk/src/java.base/share/classes/sun/security/x509/PolicyMappingsExtension.java
diff --git a/jdk/src/share/classes/sun/security/x509/PrivateKeyUsageExtension.java b/jdk/src/java.base/share/classes/sun/security/x509/PrivateKeyUsageExtension.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/PrivateKeyUsageExtension.java
rename to jdk/src/java.base/share/classes/sun/security/x509/PrivateKeyUsageExtension.java
diff --git a/jdk/src/share/classes/sun/security/x509/RDN.java b/jdk/src/java.base/share/classes/sun/security/x509/RDN.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/RDN.java
rename to jdk/src/java.base/share/classes/sun/security/x509/RDN.java
diff --git a/jdk/src/share/classes/sun/security/x509/README b/jdk/src/java.base/share/classes/sun/security/x509/README
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/README
rename to jdk/src/java.base/share/classes/sun/security/x509/README
diff --git a/jdk/src/share/classes/sun/security/x509/RFC822Name.java b/jdk/src/java.base/share/classes/sun/security/x509/RFC822Name.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/RFC822Name.java
rename to jdk/src/java.base/share/classes/sun/security/x509/RFC822Name.java
diff --git a/jdk/src/share/classes/sun/security/x509/ReasonFlags.java b/jdk/src/java.base/share/classes/sun/security/x509/ReasonFlags.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/ReasonFlags.java
rename to jdk/src/java.base/share/classes/sun/security/x509/ReasonFlags.java
diff --git a/jdk/src/share/classes/sun/security/x509/SerialNumber.java b/jdk/src/java.base/share/classes/sun/security/x509/SerialNumber.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/SerialNumber.java
rename to jdk/src/java.base/share/classes/sun/security/x509/SerialNumber.java
diff --git a/jdk/src/share/classes/sun/security/x509/SubjectAlternativeNameExtension.java b/jdk/src/java.base/share/classes/sun/security/x509/SubjectAlternativeNameExtension.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/SubjectAlternativeNameExtension.java
rename to jdk/src/java.base/share/classes/sun/security/x509/SubjectAlternativeNameExtension.java
diff --git a/jdk/src/share/classes/sun/security/x509/SubjectInfoAccessExtension.java b/jdk/src/java.base/share/classes/sun/security/x509/SubjectInfoAccessExtension.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/SubjectInfoAccessExtension.java
rename to jdk/src/java.base/share/classes/sun/security/x509/SubjectInfoAccessExtension.java
diff --git a/jdk/src/share/classes/sun/security/x509/SubjectKeyIdentifierExtension.java b/jdk/src/java.base/share/classes/sun/security/x509/SubjectKeyIdentifierExtension.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/SubjectKeyIdentifierExtension.java
rename to jdk/src/java.base/share/classes/sun/security/x509/SubjectKeyIdentifierExtension.java
diff --git a/jdk/src/share/classes/sun/security/x509/URIName.java b/jdk/src/java.base/share/classes/sun/security/x509/URIName.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/URIName.java
rename to jdk/src/java.base/share/classes/sun/security/x509/URIName.java
diff --git a/jdk/src/share/classes/sun/security/x509/UniqueIdentity.java b/jdk/src/java.base/share/classes/sun/security/x509/UniqueIdentity.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/UniqueIdentity.java
rename to jdk/src/java.base/share/classes/sun/security/x509/UniqueIdentity.java
diff --git a/jdk/src/share/classes/sun/security/x509/X400Address.java b/jdk/src/java.base/share/classes/sun/security/x509/X400Address.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/X400Address.java
rename to jdk/src/java.base/share/classes/sun/security/x509/X400Address.java
diff --git a/jdk/src/share/classes/sun/security/x509/X500Name.java b/jdk/src/java.base/share/classes/sun/security/x509/X500Name.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/X500Name.java
rename to jdk/src/java.base/share/classes/sun/security/x509/X500Name.java
diff --git a/jdk/src/share/classes/sun/security/x509/X509AttributeName.java b/jdk/src/java.base/share/classes/sun/security/x509/X509AttributeName.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/X509AttributeName.java
rename to jdk/src/java.base/share/classes/sun/security/x509/X509AttributeName.java
diff --git a/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java b/jdk/src/java.base/share/classes/sun/security/x509/X509CRLEntryImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java
rename to jdk/src/java.base/share/classes/sun/security/x509/X509CRLEntryImpl.java
diff --git a/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java b/jdk/src/java.base/share/classes/sun/security/x509/X509CRLImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/X509CRLImpl.java
rename to jdk/src/java.base/share/classes/sun/security/x509/X509CRLImpl.java
diff --git a/jdk/src/share/classes/sun/security/x509/X509CertImpl.java b/jdk/src/java.base/share/classes/sun/security/x509/X509CertImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/X509CertImpl.java
rename to jdk/src/java.base/share/classes/sun/security/x509/X509CertImpl.java
diff --git a/jdk/src/share/classes/sun/security/x509/X509CertInfo.java b/jdk/src/java.base/share/classes/sun/security/x509/X509CertInfo.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/X509CertInfo.java
rename to jdk/src/java.base/share/classes/sun/security/x509/X509CertInfo.java
diff --git a/jdk/src/share/classes/sun/security/x509/X509Key.java b/jdk/src/java.base/share/classes/sun/security/x509/X509Key.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/X509Key.java
rename to jdk/src/java.base/share/classes/sun/security/x509/X509Key.java
diff --git a/jdk/src/share/classes/sun/security/x509/certAttributes.html b/jdk/src/java.base/share/classes/sun/security/x509/certAttributes.html
similarity index 100%
rename from jdk/src/share/classes/sun/security/x509/certAttributes.html
rename to jdk/src/java.base/share/classes/sun/security/x509/certAttributes.html
diff --git a/jdk/src/share/classes/sun/text/CollatorUtilities.java b/jdk/src/java.base/share/classes/sun/text/CollatorUtilities.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/CollatorUtilities.java
rename to jdk/src/java.base/share/classes/sun/text/CollatorUtilities.java
diff --git a/jdk/src/share/classes/sun/text/CompactByteArray.java b/jdk/src/java.base/share/classes/sun/text/CompactByteArray.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/CompactByteArray.java
rename to jdk/src/java.base/share/classes/sun/text/CompactByteArray.java
diff --git a/jdk/src/share/classes/sun/text/ComposedCharIter.java b/jdk/src/java.base/share/classes/sun/text/ComposedCharIter.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/ComposedCharIter.java
rename to jdk/src/java.base/share/classes/sun/text/ComposedCharIter.java
diff --git a/jdk/src/share/classes/sun/text/IntHashtable.java b/jdk/src/java.base/share/classes/sun/text/IntHashtable.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/IntHashtable.java
rename to jdk/src/java.base/share/classes/sun/text/IntHashtable.java
diff --git a/jdk/src/share/classes/sun/text/Normalizer.java b/jdk/src/java.base/share/classes/sun/text/Normalizer.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/Normalizer.java
rename to jdk/src/java.base/share/classes/sun/text/Normalizer.java
diff --git a/jdk/src/share/classes/sun/text/SupplementaryCharacterData.java b/jdk/src/java.base/share/classes/sun/text/SupplementaryCharacterData.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/SupplementaryCharacterData.java
rename to jdk/src/java.base/share/classes/sun/text/SupplementaryCharacterData.java
diff --git a/jdk/src/share/classes/sun/text/UCompactIntArray.java b/jdk/src/java.base/share/classes/sun/text/UCompactIntArray.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/UCompactIntArray.java
rename to jdk/src/java.base/share/classes/sun/text/UCompactIntArray.java
diff --git a/jdk/src/share/classes/sun/text/bidi/BidiBase.java b/jdk/src/java.base/share/classes/sun/text/bidi/BidiBase.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/bidi/BidiBase.java
rename to jdk/src/java.base/share/classes/sun/text/bidi/BidiBase.java
diff --git a/jdk/src/share/classes/sun/text/bidi/BidiLine.java b/jdk/src/java.base/share/classes/sun/text/bidi/BidiLine.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/bidi/BidiLine.java
rename to jdk/src/java.base/share/classes/sun/text/bidi/BidiLine.java
diff --git a/jdk/src/share/classes/sun/text/bidi/BidiRun.java b/jdk/src/java.base/share/classes/sun/text/bidi/BidiRun.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/bidi/BidiRun.java
rename to jdk/src/java.base/share/classes/sun/text/bidi/BidiRun.java
diff --git a/jdk/src/share/classes/sun/text/normalizer/CharTrie.java b/jdk/src/java.base/share/classes/sun/text/normalizer/CharTrie.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/normalizer/CharTrie.java
rename to jdk/src/java.base/share/classes/sun/text/normalizer/CharTrie.java
diff --git a/jdk/src/share/classes/sun/text/normalizer/CharacterIteratorWrapper.java b/jdk/src/java.base/share/classes/sun/text/normalizer/CharacterIteratorWrapper.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/normalizer/CharacterIteratorWrapper.java
rename to jdk/src/java.base/share/classes/sun/text/normalizer/CharacterIteratorWrapper.java
diff --git a/jdk/src/share/classes/sun/text/normalizer/ICUBinary.java b/jdk/src/java.base/share/classes/sun/text/normalizer/ICUBinary.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/normalizer/ICUBinary.java
rename to jdk/src/java.base/share/classes/sun/text/normalizer/ICUBinary.java
diff --git a/jdk/src/share/classes/sun/text/normalizer/ICUData.java b/jdk/src/java.base/share/classes/sun/text/normalizer/ICUData.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/normalizer/ICUData.java
rename to jdk/src/java.base/share/classes/sun/text/normalizer/ICUData.java
diff --git a/jdk/src/share/classes/sun/text/normalizer/IntTrie.java b/jdk/src/java.base/share/classes/sun/text/normalizer/IntTrie.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/normalizer/IntTrie.java
rename to jdk/src/java.base/share/classes/sun/text/normalizer/IntTrie.java
diff --git a/jdk/src/share/classes/sun/text/normalizer/NormalizerBase.java b/jdk/src/java.base/share/classes/sun/text/normalizer/NormalizerBase.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/normalizer/NormalizerBase.java
rename to jdk/src/java.base/share/classes/sun/text/normalizer/NormalizerBase.java
diff --git a/jdk/src/share/classes/sun/text/normalizer/NormalizerDataReader.java b/jdk/src/java.base/share/classes/sun/text/normalizer/NormalizerDataReader.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/normalizer/NormalizerDataReader.java
rename to jdk/src/java.base/share/classes/sun/text/normalizer/NormalizerDataReader.java
diff --git a/jdk/src/share/classes/sun/text/normalizer/NormalizerImpl.java b/jdk/src/java.base/share/classes/sun/text/normalizer/NormalizerImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/normalizer/NormalizerImpl.java
rename to jdk/src/java.base/share/classes/sun/text/normalizer/NormalizerImpl.java
diff --git a/jdk/src/share/classes/sun/text/normalizer/RangeValueIterator.java b/jdk/src/java.base/share/classes/sun/text/normalizer/RangeValueIterator.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/normalizer/RangeValueIterator.java
rename to jdk/src/java.base/share/classes/sun/text/normalizer/RangeValueIterator.java
diff --git a/jdk/src/share/classes/sun/text/normalizer/Replaceable.java b/jdk/src/java.base/share/classes/sun/text/normalizer/Replaceable.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/normalizer/Replaceable.java
rename to jdk/src/java.base/share/classes/sun/text/normalizer/Replaceable.java
diff --git a/jdk/src/share/classes/sun/text/normalizer/ReplaceableString.java b/jdk/src/java.base/share/classes/sun/text/normalizer/ReplaceableString.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/normalizer/ReplaceableString.java
rename to jdk/src/java.base/share/classes/sun/text/normalizer/ReplaceableString.java
diff --git a/jdk/src/share/classes/sun/text/normalizer/ReplaceableUCharacterIterator.java b/jdk/src/java.base/share/classes/sun/text/normalizer/ReplaceableUCharacterIterator.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/normalizer/ReplaceableUCharacterIterator.java
rename to jdk/src/java.base/share/classes/sun/text/normalizer/ReplaceableUCharacterIterator.java
diff --git a/jdk/src/share/classes/sun/text/normalizer/RuleCharacterIterator.java b/jdk/src/java.base/share/classes/sun/text/normalizer/RuleCharacterIterator.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/normalizer/RuleCharacterIterator.java
rename to jdk/src/java.base/share/classes/sun/text/normalizer/RuleCharacterIterator.java
diff --git a/jdk/src/share/classes/sun/text/normalizer/SymbolTable.java b/jdk/src/java.base/share/classes/sun/text/normalizer/SymbolTable.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/normalizer/SymbolTable.java
rename to jdk/src/java.base/share/classes/sun/text/normalizer/SymbolTable.java
diff --git a/jdk/src/share/classes/sun/text/normalizer/Trie.java b/jdk/src/java.base/share/classes/sun/text/normalizer/Trie.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/normalizer/Trie.java
rename to jdk/src/java.base/share/classes/sun/text/normalizer/Trie.java
diff --git a/jdk/src/share/classes/sun/text/normalizer/TrieIterator.java b/jdk/src/java.base/share/classes/sun/text/normalizer/TrieIterator.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/normalizer/TrieIterator.java
rename to jdk/src/java.base/share/classes/sun/text/normalizer/TrieIterator.java
diff --git a/jdk/src/share/classes/sun/text/normalizer/UBiDiProps.java b/jdk/src/java.base/share/classes/sun/text/normalizer/UBiDiProps.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/normalizer/UBiDiProps.java
rename to jdk/src/java.base/share/classes/sun/text/normalizer/UBiDiProps.java
diff --git a/jdk/src/share/classes/sun/text/normalizer/UCharacter.java b/jdk/src/java.base/share/classes/sun/text/normalizer/UCharacter.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/normalizer/UCharacter.java
rename to jdk/src/java.base/share/classes/sun/text/normalizer/UCharacter.java
diff --git a/jdk/src/share/classes/sun/text/normalizer/UCharacterIterator.java b/jdk/src/java.base/share/classes/sun/text/normalizer/UCharacterIterator.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/normalizer/UCharacterIterator.java
rename to jdk/src/java.base/share/classes/sun/text/normalizer/UCharacterIterator.java
diff --git a/jdk/src/share/classes/sun/text/normalizer/UCharacterProperty.java b/jdk/src/java.base/share/classes/sun/text/normalizer/UCharacterProperty.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/normalizer/UCharacterProperty.java
rename to jdk/src/java.base/share/classes/sun/text/normalizer/UCharacterProperty.java
diff --git a/jdk/src/share/classes/sun/text/normalizer/UCharacterPropertyReader.java b/jdk/src/java.base/share/classes/sun/text/normalizer/UCharacterPropertyReader.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/normalizer/UCharacterPropertyReader.java
rename to jdk/src/java.base/share/classes/sun/text/normalizer/UCharacterPropertyReader.java
diff --git a/jdk/src/share/classes/sun/text/normalizer/UTF16.java b/jdk/src/java.base/share/classes/sun/text/normalizer/UTF16.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/normalizer/UTF16.java
rename to jdk/src/java.base/share/classes/sun/text/normalizer/UTF16.java
diff --git a/jdk/src/share/classes/sun/text/normalizer/UnicodeMatcher.java b/jdk/src/java.base/share/classes/sun/text/normalizer/UnicodeMatcher.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/normalizer/UnicodeMatcher.java
rename to jdk/src/java.base/share/classes/sun/text/normalizer/UnicodeMatcher.java
diff --git a/jdk/src/share/classes/sun/text/normalizer/UnicodeSet.java b/jdk/src/java.base/share/classes/sun/text/normalizer/UnicodeSet.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/normalizer/UnicodeSet.java
rename to jdk/src/java.base/share/classes/sun/text/normalizer/UnicodeSet.java
diff --git a/jdk/src/share/classes/sun/text/normalizer/UnicodeSetIterator.java b/jdk/src/java.base/share/classes/sun/text/normalizer/UnicodeSetIterator.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/normalizer/UnicodeSetIterator.java
rename to jdk/src/java.base/share/classes/sun/text/normalizer/UnicodeSetIterator.java
diff --git a/jdk/src/share/classes/sun/text/normalizer/Utility.java b/jdk/src/java.base/share/classes/sun/text/normalizer/Utility.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/normalizer/Utility.java
rename to jdk/src/java.base/share/classes/sun/text/normalizer/Utility.java
diff --git a/jdk/src/share/classes/sun/text/normalizer/VersionInfo.java b/jdk/src/java.base/share/classes/sun/text/normalizer/VersionInfo.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/normalizer/VersionInfo.java
rename to jdk/src/java.base/share/classes/sun/text/normalizer/VersionInfo.java
diff --git a/jdk/src/share/classes/sun/text/resources/BreakIteratorInfo.java b/jdk/src/java.base/share/classes/sun/text/resources/BreakIteratorInfo.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/BreakIteratorInfo.java
rename to jdk/src/java.base/share/classes/sun/text/resources/BreakIteratorInfo.java
diff --git a/jdk/src/share/classes/sun/text/resources/BreakIteratorRules.java b/jdk/src/java.base/share/classes/sun/text/resources/BreakIteratorRules.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/BreakIteratorRules.java
rename to jdk/src/java.base/share/classes/sun/text/resources/BreakIteratorRules.java
diff --git a/jdk/src/share/classes/sun/text/resources/CollationData.java b/jdk/src/java.base/share/classes/sun/text/resources/CollationData.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/CollationData.java
rename to jdk/src/java.base/share/classes/sun/text/resources/CollationData.java
diff --git a/jdk/src/share/classes/sun/text/resources/FormatData.java b/jdk/src/java.base/share/classes/sun/text/resources/FormatData.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/FormatData.java
rename to jdk/src/java.base/share/classes/sun/text/resources/FormatData.java
diff --git a/jdk/src/share/classes/sun/text/resources/JavaTimeSupplementary.java b/jdk/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/JavaTimeSupplementary.java
rename to jdk/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary.java
diff --git a/jdk/src/share/classes/sun/text/resources/en/FormatData_en.java b/jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/en/FormatData_en.java
rename to jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en.java
diff --git a/jdk/src/share/classes/sun/text/resources/en/FormatData_en_AU.java b/jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_AU.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/en/FormatData_en_AU.java
rename to jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_AU.java
diff --git a/jdk/src/share/classes/sun/text/resources/en/FormatData_en_CA.java b/jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_CA.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/en/FormatData_en_CA.java
rename to jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_CA.java
diff --git a/jdk/src/share/classes/sun/text/resources/en/FormatData_en_GB.java b/jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_GB.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/en/FormatData_en_GB.java
rename to jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_GB.java
diff --git a/jdk/src/share/classes/sun/text/resources/en/FormatData_en_IE.java b/jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_IE.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/en/FormatData_en_IE.java
rename to jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_IE.java
diff --git a/jdk/src/share/classes/sun/text/resources/en/FormatData_en_IN.java b/jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_IN.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/en/FormatData_en_IN.java
rename to jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_IN.java
diff --git a/jdk/src/share/classes/sun/text/resources/en/FormatData_en_MT.java b/jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_MT.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/en/FormatData_en_MT.java
rename to jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_MT.java
diff --git a/jdk/src/share/classes/sun/text/resources/en/FormatData_en_NZ.java b/jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_NZ.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/en/FormatData_en_NZ.java
rename to jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_NZ.java
diff --git a/jdk/src/share/classes/sun/text/resources/en/FormatData_en_PH.java b/jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_PH.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/en/FormatData_en_PH.java
rename to jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_PH.java
diff --git a/jdk/src/share/classes/sun/text/resources/en/FormatData_en_SG.java b/jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_SG.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/en/FormatData_en_SG.java
rename to jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_SG.java
diff --git a/jdk/src/share/classes/sun/text/resources/en/FormatData_en_US.java b/jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_US.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/en/FormatData_en_US.java
rename to jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_US.java
diff --git a/jdk/src/share/classes/sun/text/resources/en/FormatData_en_ZA.java b/jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_ZA.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/en/FormatData_en_ZA.java
rename to jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_ZA.java
diff --git a/jdk/src/share/classes/sun/text/resources/en/JavaTimeSupplementary_en.java b/jdk/src/java.base/share/classes/sun/text/resources/en/JavaTimeSupplementary_en.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/en/JavaTimeSupplementary_en.java
rename to jdk/src/java.base/share/classes/sun/text/resources/en/JavaTimeSupplementary_en.java
diff --git a/jdk/src/share/classes/sun/text/resources/en/JavaTimeSupplementary_en_GB.java b/jdk/src/java.base/share/classes/sun/text/resources/en/JavaTimeSupplementary_en_GB.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/en/JavaTimeSupplementary_en_GB.java
rename to jdk/src/java.base/share/classes/sun/text/resources/en/JavaTimeSupplementary_en_GB.java
diff --git a/jdk/src/share/classes/sun/text/resources/en/JavaTimeSupplementary_en_SG.java b/jdk/src/java.base/share/classes/sun/text/resources/en/JavaTimeSupplementary_en_SG.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/en/JavaTimeSupplementary_en_SG.java
rename to jdk/src/java.base/share/classes/sun/text/resources/en/JavaTimeSupplementary_en_SG.java
diff --git a/jdk/src/share/classes/sun/text/resources/ubidi.icu b/jdk/src/java.base/share/classes/sun/text/resources/ubidi.icu
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/ubidi.icu
rename to jdk/src/java.base/share/classes/sun/text/resources/ubidi.icu
diff --git a/jdk/src/share/classes/sun/text/resources/unorm.icu b/jdk/src/java.base/share/classes/sun/text/resources/unorm.icu
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/unorm.icu
rename to jdk/src/java.base/share/classes/sun/text/resources/unorm.icu
diff --git a/jdk/src/share/classes/sun/text/resources/uprops.icu b/jdk/src/java.base/share/classes/sun/text/resources/uprops.icu
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/uprops.icu
rename to jdk/src/java.base/share/classes/sun/text/resources/uprops.icu
diff --git a/jdk/src/share/classes/sun/util/BuddhistCalendar.java b/jdk/src/java.base/share/classes/sun/util/BuddhistCalendar.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/BuddhistCalendar.java
rename to jdk/src/java.base/share/classes/sun/util/BuddhistCalendar.java
diff --git a/jdk/src/share/classes/sun/util/CoreResourceBundleControl-XLocales.java.template b/jdk/src/java.base/share/classes/sun/util/CoreResourceBundleControl-XLocales.java.template
similarity index 100%
rename from jdk/src/share/classes/sun/util/CoreResourceBundleControl-XLocales.java.template
rename to jdk/src/java.base/share/classes/sun/util/CoreResourceBundleControl-XLocales.java.template
diff --git a/jdk/src/share/classes/sun/util/PreHashedMap.java b/jdk/src/java.base/share/classes/sun/util/PreHashedMap.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/PreHashedMap.java
rename to jdk/src/java.base/share/classes/sun/util/PreHashedMap.java
diff --git a/jdk/src/share/classes/sun/util/ResourceBundleEnumeration.java b/jdk/src/java.base/share/classes/sun/util/ResourceBundleEnumeration.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/ResourceBundleEnumeration.java
rename to jdk/src/java.base/share/classes/sun/util/ResourceBundleEnumeration.java
diff --git a/jdk/src/share/classes/sun/util/calendar/AbstractCalendar.java b/jdk/src/java.base/share/classes/sun/util/calendar/AbstractCalendar.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/calendar/AbstractCalendar.java
rename to jdk/src/java.base/share/classes/sun/util/calendar/AbstractCalendar.java
diff --git a/jdk/src/share/classes/sun/util/calendar/BaseCalendar.java b/jdk/src/java.base/share/classes/sun/util/calendar/BaseCalendar.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/calendar/BaseCalendar.java
rename to jdk/src/java.base/share/classes/sun/util/calendar/BaseCalendar.java
diff --git a/jdk/src/share/classes/sun/util/calendar/CalendarDate.java b/jdk/src/java.base/share/classes/sun/util/calendar/CalendarDate.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/calendar/CalendarDate.java
rename to jdk/src/java.base/share/classes/sun/util/calendar/CalendarDate.java
diff --git a/jdk/src/share/classes/sun/util/calendar/CalendarSystem.java b/jdk/src/java.base/share/classes/sun/util/calendar/CalendarSystem.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/calendar/CalendarSystem.java
rename to jdk/src/java.base/share/classes/sun/util/calendar/CalendarSystem.java
diff --git a/jdk/src/share/classes/sun/util/calendar/CalendarUtils.java b/jdk/src/java.base/share/classes/sun/util/calendar/CalendarUtils.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/calendar/CalendarUtils.java
rename to jdk/src/java.base/share/classes/sun/util/calendar/CalendarUtils.java
diff --git a/jdk/src/share/classes/sun/util/calendar/Era.java b/jdk/src/java.base/share/classes/sun/util/calendar/Era.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/calendar/Era.java
rename to jdk/src/java.base/share/classes/sun/util/calendar/Era.java
diff --git a/jdk/src/share/classes/sun/util/calendar/Gregorian.java b/jdk/src/java.base/share/classes/sun/util/calendar/Gregorian.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/calendar/Gregorian.java
rename to jdk/src/java.base/share/classes/sun/util/calendar/Gregorian.java
diff --git a/jdk/src/share/classes/sun/util/calendar/ImmutableGregorianDate.java b/jdk/src/java.base/share/classes/sun/util/calendar/ImmutableGregorianDate.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/calendar/ImmutableGregorianDate.java
rename to jdk/src/java.base/share/classes/sun/util/calendar/ImmutableGregorianDate.java
diff --git a/jdk/src/share/classes/sun/util/calendar/JulianCalendar.java b/jdk/src/java.base/share/classes/sun/util/calendar/JulianCalendar.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/calendar/JulianCalendar.java
rename to jdk/src/java.base/share/classes/sun/util/calendar/JulianCalendar.java
diff --git a/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java b/jdk/src/java.base/share/classes/sun/util/calendar/LocalGregorianCalendar.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java
rename to jdk/src/java.base/share/classes/sun/util/calendar/LocalGregorianCalendar.java
diff --git a/jdk/src/share/classes/sun/util/calendar/ZoneInfo.java b/jdk/src/java.base/share/classes/sun/util/calendar/ZoneInfo.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/calendar/ZoneInfo.java
rename to jdk/src/java.base/share/classes/sun/util/calendar/ZoneInfo.java
diff --git a/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java b/jdk/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java
rename to jdk/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java
diff --git a/jdk/src/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java b/jdk/src/java.base/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java
similarity index 95%
rename from jdk/src/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java
rename to jdk/src/java.base/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java
index 77f7b843d64..bda94f63bec 100644
--- a/jdk/src/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java
+++ b/jdk/src/java.base/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@ import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.text.spi.BreakIteratorProvider;
 import java.text.spi.CollatorProvider;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Locale;
 import java.util.ResourceBundle;
@@ -102,6 +103,9 @@ public class CLDRLocaleProviderAdapter extends JRELocaleProviderAdapter {
     @Override
     protected Set createLanguageTagSet(String category) {
         ResourceBundle rb = ResourceBundle.getBundle("sun.util.cldr.CLDRLocaleDataMetaInfo", Locale.ROOT);
+        if (rb.containsKey(category)) {
+            return Collections.emptySet();
+        }
         String supportedLocaleString = rb.getString(category);
         Set tagset = new HashSet<>();
         StringTokenizer tokens = new StringTokenizer(supportedLocaleString);
diff --git a/jdk/src/share/classes/sun/util/locale/BaseLocale.java b/jdk/src/java.base/share/classes/sun/util/locale/BaseLocale.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/BaseLocale.java
rename to jdk/src/java.base/share/classes/sun/util/locale/BaseLocale.java
diff --git a/jdk/src/share/classes/sun/util/locale/Extension.java b/jdk/src/java.base/share/classes/sun/util/locale/Extension.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/Extension.java
rename to jdk/src/java.base/share/classes/sun/util/locale/Extension.java
diff --git a/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java b/jdk/src/java.base/share/classes/sun/util/locale/InternalLocaleBuilder.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java
rename to jdk/src/java.base/share/classes/sun/util/locale/InternalLocaleBuilder.java
diff --git a/jdk/src/share/classes/sun/util/locale/LanguageTag.java b/jdk/src/java.base/share/classes/sun/util/locale/LanguageTag.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/LanguageTag.java
rename to jdk/src/java.base/share/classes/sun/util/locale/LanguageTag.java
diff --git a/jdk/src/share/classes/sun/util/locale/LocaleEquivalentMaps.java b/jdk/src/java.base/share/classes/sun/util/locale/LocaleEquivalentMaps.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/LocaleEquivalentMaps.java
rename to jdk/src/java.base/share/classes/sun/util/locale/LocaleEquivalentMaps.java
diff --git a/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java b/jdk/src/java.base/share/classes/sun/util/locale/LocaleExtensions.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/LocaleExtensions.java
rename to jdk/src/java.base/share/classes/sun/util/locale/LocaleExtensions.java
diff --git a/jdk/src/share/classes/sun/util/locale/LocaleMatcher.java b/jdk/src/java.base/share/classes/sun/util/locale/LocaleMatcher.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/LocaleMatcher.java
rename to jdk/src/java.base/share/classes/sun/util/locale/LocaleMatcher.java
diff --git a/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java b/jdk/src/java.base/share/classes/sun/util/locale/LocaleObjectCache.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java
rename to jdk/src/java.base/share/classes/sun/util/locale/LocaleObjectCache.java
diff --git a/jdk/src/share/classes/sun/util/locale/LocaleSyntaxException.java b/jdk/src/java.base/share/classes/sun/util/locale/LocaleSyntaxException.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/LocaleSyntaxException.java
rename to jdk/src/java.base/share/classes/sun/util/locale/LocaleSyntaxException.java
diff --git a/jdk/src/share/classes/sun/util/locale/LocaleUtils.java b/jdk/src/java.base/share/classes/sun/util/locale/LocaleUtils.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/LocaleUtils.java
rename to jdk/src/java.base/share/classes/sun/util/locale/LocaleUtils.java
diff --git a/jdk/src/share/classes/sun/util/locale/ParseStatus.java b/jdk/src/java.base/share/classes/sun/util/locale/ParseStatus.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/ParseStatus.java
rename to jdk/src/java.base/share/classes/sun/util/locale/ParseStatus.java
diff --git a/jdk/src/share/classes/sun/util/locale/StringTokenIterator.java b/jdk/src/java.base/share/classes/sun/util/locale/StringTokenIterator.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/StringTokenIterator.java
rename to jdk/src/java.base/share/classes/sun/util/locale/StringTokenIterator.java
diff --git a/jdk/src/share/classes/sun/util/locale/UnicodeLocaleExtension.java b/jdk/src/java.base/share/classes/sun/util/locale/UnicodeLocaleExtension.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/UnicodeLocaleExtension.java
rename to jdk/src/java.base/share/classes/sun/util/locale/UnicodeLocaleExtension.java
diff --git a/jdk/src/share/classes/sun/util/locale/provider/AuxLocaleProviderAdapter.java b/jdk/src/java.base/share/classes/sun/util/locale/provider/AuxLocaleProviderAdapter.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/provider/AuxLocaleProviderAdapter.java
rename to jdk/src/java.base/share/classes/sun/util/locale/provider/AuxLocaleProviderAdapter.java
diff --git a/jdk/src/share/classes/sun/util/locale/provider/AvailableLanguageTags.java b/jdk/src/java.base/share/classes/sun/util/locale/provider/AvailableLanguageTags.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/provider/AvailableLanguageTags.java
rename to jdk/src/java.base/share/classes/sun/util/locale/provider/AvailableLanguageTags.java
diff --git a/jdk/src/share/classes/sun/util/locale/provider/BreakDictionary.java b/jdk/src/java.base/share/classes/sun/util/locale/provider/BreakDictionary.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/provider/BreakDictionary.java
rename to jdk/src/java.base/share/classes/sun/util/locale/provider/BreakDictionary.java
diff --git a/jdk/src/share/classes/sun/util/locale/provider/BreakIteratorProviderImpl.java b/jdk/src/java.base/share/classes/sun/util/locale/provider/BreakIteratorProviderImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/provider/BreakIteratorProviderImpl.java
rename to jdk/src/java.base/share/classes/sun/util/locale/provider/BreakIteratorProviderImpl.java
diff --git a/jdk/src/share/classes/sun/util/locale/provider/CalendarDataProviderImpl.java b/jdk/src/java.base/share/classes/sun/util/locale/provider/CalendarDataProviderImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/provider/CalendarDataProviderImpl.java
rename to jdk/src/java.base/share/classes/sun/util/locale/provider/CalendarDataProviderImpl.java
diff --git a/jdk/src/share/classes/sun/util/locale/provider/CalendarDataUtility.java b/jdk/src/java.base/share/classes/sun/util/locale/provider/CalendarDataUtility.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/provider/CalendarDataUtility.java
rename to jdk/src/java.base/share/classes/sun/util/locale/provider/CalendarDataUtility.java
diff --git a/jdk/src/share/classes/sun/util/locale/provider/CalendarNameProviderImpl.java b/jdk/src/java.base/share/classes/sun/util/locale/provider/CalendarNameProviderImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/provider/CalendarNameProviderImpl.java
rename to jdk/src/java.base/share/classes/sun/util/locale/provider/CalendarNameProviderImpl.java
diff --git a/jdk/src/share/classes/sun/util/locale/provider/CalendarProviderImpl.java b/jdk/src/java.base/share/classes/sun/util/locale/provider/CalendarProviderImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/provider/CalendarProviderImpl.java
rename to jdk/src/java.base/share/classes/sun/util/locale/provider/CalendarProviderImpl.java
diff --git a/jdk/src/share/classes/sun/util/locale/provider/CollationRules.java b/jdk/src/java.base/share/classes/sun/util/locale/provider/CollationRules.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/provider/CollationRules.java
rename to jdk/src/java.base/share/classes/sun/util/locale/provider/CollationRules.java
diff --git a/jdk/src/share/classes/sun/util/locale/provider/CollatorProviderImpl.java b/jdk/src/java.base/share/classes/sun/util/locale/provider/CollatorProviderImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/provider/CollatorProviderImpl.java
rename to jdk/src/java.base/share/classes/sun/util/locale/provider/CollatorProviderImpl.java
diff --git a/jdk/src/share/classes/sun/util/locale/provider/CurrencyNameProviderImpl.java b/jdk/src/java.base/share/classes/sun/util/locale/provider/CurrencyNameProviderImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/provider/CurrencyNameProviderImpl.java
rename to jdk/src/java.base/share/classes/sun/util/locale/provider/CurrencyNameProviderImpl.java
diff --git a/jdk/src/share/classes/sun/util/locale/provider/DateFormatProviderImpl.java b/jdk/src/java.base/share/classes/sun/util/locale/provider/DateFormatProviderImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/provider/DateFormatProviderImpl.java
rename to jdk/src/java.base/share/classes/sun/util/locale/provider/DateFormatProviderImpl.java
diff --git a/jdk/src/share/classes/sun/util/locale/provider/DateFormatSymbolsProviderImpl.java b/jdk/src/java.base/share/classes/sun/util/locale/provider/DateFormatSymbolsProviderImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/provider/DateFormatSymbolsProviderImpl.java
rename to jdk/src/java.base/share/classes/sun/util/locale/provider/DateFormatSymbolsProviderImpl.java
diff --git a/jdk/src/share/classes/sun/util/locale/provider/DecimalFormatSymbolsProviderImpl.java b/jdk/src/java.base/share/classes/sun/util/locale/provider/DecimalFormatSymbolsProviderImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/provider/DecimalFormatSymbolsProviderImpl.java
rename to jdk/src/java.base/share/classes/sun/util/locale/provider/DecimalFormatSymbolsProviderImpl.java
diff --git a/jdk/src/share/classes/sun/util/locale/provider/DictionaryBasedBreakIterator.java b/jdk/src/java.base/share/classes/sun/util/locale/provider/DictionaryBasedBreakIterator.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/provider/DictionaryBasedBreakIterator.java
rename to jdk/src/java.base/share/classes/sun/util/locale/provider/DictionaryBasedBreakIterator.java
diff --git a/jdk/src/share/classes/sun/util/locale/provider/FallbackLocaleProviderAdapter.java b/jdk/src/java.base/share/classes/sun/util/locale/provider/FallbackLocaleProviderAdapter.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/provider/FallbackLocaleProviderAdapter.java
rename to jdk/src/java.base/share/classes/sun/util/locale/provider/FallbackLocaleProviderAdapter.java
diff --git a/jdk/src/share/classes/sun/util/locale/provider/HostLocaleProviderAdapter.java b/jdk/src/java.base/share/classes/sun/util/locale/provider/HostLocaleProviderAdapter.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/provider/HostLocaleProviderAdapter.java
rename to jdk/src/java.base/share/classes/sun/util/locale/provider/HostLocaleProviderAdapter.java
diff --git a/jdk/src/share/classes/sun/util/locale/provider/JRELocaleConstants.java b/jdk/src/java.base/share/classes/sun/util/locale/provider/JRELocaleConstants.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/provider/JRELocaleConstants.java
rename to jdk/src/java.base/share/classes/sun/util/locale/provider/JRELocaleConstants.java
diff --git a/jdk/src/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java b/jdk/src/java.base/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java
similarity index 98%
rename from jdk/src/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java
rename to jdk/src/java.base/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java
index 50473cde715..f07d793a88d 100644
--- a/jdk/src/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java
+++ b/jdk/src/java.base/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,7 @@ import java.text.spi.DateFormatProvider;
 import java.text.spi.DateFormatSymbolsProvider;
 import java.text.spi.DecimalFormatSymbolsProvider;
 import java.text.spi.NumberFormatProvider;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Locale;
 import java.util.Set;
@@ -356,6 +357,9 @@ public class JRELocaleProviderAdapter extends LocaleProviderAdapter implements R
 
     protected Set createLanguageTagSet(String category) {
         String supportedLocaleString = LocaleDataMetaInfo.getSupportedLocaleString(category);
+        if (supportedLocaleString == null) {
+            return Collections.emptySet();
+        }
         Set tagset = new HashSet<>();
         StringTokenizer tokens = new StringTokenizer(supportedLocaleString);
         while (tokens.hasMoreTokens()) {
diff --git a/jdk/src/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template b/jdk/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template
similarity index 89%
rename from jdk/src/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template
rename to jdk/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template
index 17d9af65817..52ac29de777 100644
--- a/jdk/src/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template
+++ b/jdk/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -57,6 +57,12 @@ public class LocaleDataMetaInfo {
         resourceNameToLocales.put("CollationData",
                                   " #CollationData_ENLocales# | #CollationData_NonENLocales# ");
 
+        resourceNameToLocales.put("BreakIteratorInfo",
+                                  " #BreakIteratorInfo_ENLocales# | #BreakIteratorInfo_NonENLocales# ");
+
+        resourceNameToLocales.put("BreakIteratorRules",
+                                  " #BreakIteratorRules_ENLocales# | #BreakIteratorRules_NonENLocales# ");
+
         resourceNameToLocales.put("TimeZoneNames",
                                   " #TimeZoneNames_ENLocales# | #TimeZoneNames_NonENLocales# ");
 
diff --git a/jdk/src/share/classes/sun/util/locale/provider/LocaleNameProviderImpl.java b/jdk/src/java.base/share/classes/sun/util/locale/provider/LocaleNameProviderImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/provider/LocaleNameProviderImpl.java
rename to jdk/src/java.base/share/classes/sun/util/locale/provider/LocaleNameProviderImpl.java
diff --git a/jdk/src/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java b/jdk/src/java.base/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java
similarity index 98%
rename from jdk/src/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java
rename to jdk/src/java.base/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java
index b7ba7361d2b..3f7222172d7 100644
--- a/jdk/src/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java
+++ b/jdk/src/java.base/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -295,7 +295,7 @@ public abstract class LocaleProviderAdapter {
      * A utility method for implementing the default LocaleServiceProvider.isSupportedLocale
      * for the JRE, CLDR, and FALLBACK adapters.
      */
-    static boolean isSupportedLocale(Locale locale, LocaleProviderAdapter.Type type, Set langtags) {
+    public static boolean isSupportedLocale(Locale locale, LocaleProviderAdapter.Type type, Set langtags) {
         assert type == Type.JRE || type == Type.CLDR || type == Type.FALLBACK;
         if (Locale.ROOT.equals(locale)) {
             return true;
diff --git a/jdk/src/share/classes/sun/util/locale/provider/LocaleResources.java b/jdk/src/java.base/share/classes/sun/util/locale/provider/LocaleResources.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/provider/LocaleResources.java
rename to jdk/src/java.base/share/classes/sun/util/locale/provider/LocaleResources.java
diff --git a/jdk/src/share/classes/sun/util/locale/provider/LocaleServiceProviderPool.java b/jdk/src/java.base/share/classes/sun/util/locale/provider/LocaleServiceProviderPool.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/provider/LocaleServiceProviderPool.java
rename to jdk/src/java.base/share/classes/sun/util/locale/provider/LocaleServiceProviderPool.java
diff --git a/jdk/src/share/classes/sun/util/locale/provider/NumberFormatProviderImpl.java b/jdk/src/java.base/share/classes/sun/util/locale/provider/NumberFormatProviderImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/provider/NumberFormatProviderImpl.java
rename to jdk/src/java.base/share/classes/sun/util/locale/provider/NumberFormatProviderImpl.java
diff --git a/jdk/src/share/classes/sun/util/locale/provider/ResourceBundleBasedAdapter.java b/jdk/src/java.base/share/classes/sun/util/locale/provider/ResourceBundleBasedAdapter.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/provider/ResourceBundleBasedAdapter.java
rename to jdk/src/java.base/share/classes/sun/util/locale/provider/ResourceBundleBasedAdapter.java
diff --git a/jdk/src/share/classes/sun/util/locale/provider/RuleBasedBreakIterator.java b/jdk/src/java.base/share/classes/sun/util/locale/provider/RuleBasedBreakIterator.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/provider/RuleBasedBreakIterator.java
rename to jdk/src/java.base/share/classes/sun/util/locale/provider/RuleBasedBreakIterator.java
diff --git a/jdk/src/share/classes/sun/util/locale/provider/SPILocaleProviderAdapter.java b/jdk/src/java.base/share/classes/sun/util/locale/provider/SPILocaleProviderAdapter.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/provider/SPILocaleProviderAdapter.java
rename to jdk/src/java.base/share/classes/sun/util/locale/provider/SPILocaleProviderAdapter.java
diff --git a/jdk/src/share/classes/sun/util/locale/provider/TimeZoneNameProviderImpl.java b/jdk/src/java.base/share/classes/sun/util/locale/provider/TimeZoneNameProviderImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/provider/TimeZoneNameProviderImpl.java
rename to jdk/src/java.base/share/classes/sun/util/locale/provider/TimeZoneNameProviderImpl.java
diff --git a/jdk/src/share/classes/sun/util/locale/provider/TimeZoneNameUtility.java b/jdk/src/java.base/share/classes/sun/util/locale/provider/TimeZoneNameUtility.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/locale/provider/TimeZoneNameUtility.java
rename to jdk/src/java.base/share/classes/sun/util/locale/provider/TimeZoneNameUtility.java
diff --git a/jdk/src/share/classes/sun/util/logging/LoggingProxy.java b/jdk/src/java.base/share/classes/sun/util/logging/LoggingProxy.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/logging/LoggingProxy.java
rename to jdk/src/java.base/share/classes/sun/util/logging/LoggingProxy.java
diff --git a/jdk/src/share/classes/sun/util/logging/LoggingSupport.java b/jdk/src/java.base/share/classes/sun/util/logging/LoggingSupport.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/logging/LoggingSupport.java
rename to jdk/src/java.base/share/classes/sun/util/logging/LoggingSupport.java
diff --git a/jdk/src/share/classes/sun/util/logging/PlatformLogger.java b/jdk/src/java.base/share/classes/sun/util/logging/PlatformLogger.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/logging/PlatformLogger.java
rename to jdk/src/java.base/share/classes/sun/util/logging/PlatformLogger.java
diff --git a/jdk/src/share/classes/sun/util/resources/CalendarData.properties b/jdk/src/java.base/share/classes/sun/util/resources/CalendarData.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/CalendarData.properties
rename to jdk/src/java.base/share/classes/sun/util/resources/CalendarData.properties
diff --git a/jdk/src/share/classes/sun/util/resources/CurrencyNames.properties b/jdk/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/CurrencyNames.properties
rename to jdk/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties
diff --git a/jdk/src/share/classes/sun/util/resources/LocaleData.java b/jdk/src/java.base/share/classes/sun/util/resources/LocaleData.java
similarity index 87%
rename from jdk/src/share/classes/sun/util/resources/LocaleData.java
rename to jdk/src/java.base/share/classes/sun/util/resources/LocaleData.java
index 00ba6dec959..679baf6ebbb 100644
--- a/jdk/src/share/classes/sun/util/resources/LocaleData.java
+++ b/jdk/src/java.base/share/classes/sun/util/resources/LocaleData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,8 +48,11 @@ import java.util.List;
 import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
+import java.util.Set;
+import sun.util.locale.provider.JRELocaleProviderAdapter;
 import sun.util.locale.provider.LocaleDataMetaInfo;
 import sun.util.locale.provider.LocaleProviderAdapter;
+import static sun.util.locale.provider.LocaleProviderAdapter.Type.CLDR;
 import static sun.util.locale.provider.LocaleProviderAdapter.Type.JRE;
 
 /**
@@ -204,35 +207,23 @@ public class LocaleData {
         @Override
          public List getCandidateLocales(String baseName, Locale locale) {
             List candidates = super.getCandidateLocales(baseName, locale);
-            /* Get the locale string list from LocaleDataMetaInfo class. */
-            String localeString = LocaleDataMetaInfo.getSupportedLocaleString(baseName);
-
-            if (localeString != null && localeString.length() != 0) {
-                for (Iterator l = candidates.iterator(); l.hasNext();) {
-                    Locale loc = l.next();
-                    String lstr;
-                    if (loc.getScript().length() > 0) {
-                        lstr = loc.toLanguageTag().replace('-', '_');
-                    } else {
-                        lstr = loc.toString();
-                        int idx = lstr.indexOf("_#");
-                        if (idx >= 0) {
-                            lstr = lstr.substring(0, idx);
-                        }
-                    }
-                    /* Every locale string in the locale string list returned from
-                     the above getSupportedLocaleString is enclosed
-                     within two white spaces so that we could check some locale
-                     such as "en".
-                     */
-                    if (lstr.length() != 0 && localeString.indexOf(" " + lstr + " ") == -1) {
-                        l.remove();
+            // Weed out Locales which are known to have no resource bundles
+            int lastDot = baseName.lastIndexOf('.');
+            String category = (lastDot >= 0) ? baseName.substring(lastDot + 1) : baseName;
+            LocaleProviderAdapter.Type type = baseName.contains(DOTCLDR) ? CLDR : JRE;
+            LocaleProviderAdapter adapter = LocaleProviderAdapter.forType(type);
+            Set langtags = ((JRELocaleProviderAdapter)adapter).getLanguageTagSet(category);
+            if (!langtags.isEmpty()) {
+                for (Iterator itr = candidates.iterator(); itr.hasNext();) {
+                    if (!LocaleProviderAdapter.isSupportedLocale(itr.next(), type, langtags)) {
+                        itr.remove();
                     }
                 }
             }
+
             // Force fallback to Locale.ENGLISH for CLDR time zone names support
             if (locale.getLanguage() != "en"
-                    && baseName.contains(CLDR) && baseName.endsWith("TimeZoneNames")) {
+                    && type == CLDR && category.equals("TimeZoneNames")) {
                 candidates.add(candidates.size() - 1, Locale.ENGLISH);
             }
             return candidates;
@@ -254,7 +245,7 @@ public class LocaleData {
             return null;
         }
 
-        private static final String CLDR      = ".cldr";
+        private static final String DOTCLDR      = ".cldr";
 
         /**
          * Changes baseName to its per-language package name and
@@ -275,8 +266,8 @@ public class LocaleData {
                     assert JRE.getUtilResourcesPackage().length()
                         == JRE.getTextResourcesPackage().length();
                     int index = JRE.getUtilResourcesPackage().length();
-                    if (baseName.indexOf(CLDR, index) > 0) {
-                        index += CLDR.length();
+                    if (baseName.indexOf(DOTCLDR, index) > 0) {
+                        index += DOTCLDR.length();
                     }
                     newBaseName = baseName.substring(0, index + 1) + lang
                                       + baseName.substring(index);
diff --git a/jdk/src/share/classes/sun/util/resources/LocaleNames.properties b/jdk/src/java.base/share/classes/sun/util/resources/LocaleNames.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/LocaleNames.properties
rename to jdk/src/java.base/share/classes/sun/util/resources/LocaleNames.properties
diff --git a/jdk/src/share/classes/sun/util/resources/LocaleNamesBundle.java b/jdk/src/java.base/share/classes/sun/util/resources/LocaleNamesBundle.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/LocaleNamesBundle.java
rename to jdk/src/java.base/share/classes/sun/util/resources/LocaleNamesBundle.java
diff --git a/jdk/src/share/classes/sun/util/resources/OpenListResourceBundle.java b/jdk/src/java.base/share/classes/sun/util/resources/OpenListResourceBundle.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/OpenListResourceBundle.java
rename to jdk/src/java.base/share/classes/sun/util/resources/OpenListResourceBundle.java
diff --git a/jdk/src/share/classes/sun/util/resources/ParallelListResourceBundle.java b/jdk/src/java.base/share/classes/sun/util/resources/ParallelListResourceBundle.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ParallelListResourceBundle.java
rename to jdk/src/java.base/share/classes/sun/util/resources/ParallelListResourceBundle.java
diff --git a/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java b/jdk/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/TimeZoneNames.java
rename to jdk/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java
diff --git a/jdk/src/share/classes/sun/util/resources/TimeZoneNamesBundle.java b/jdk/src/java.base/share/classes/sun/util/resources/TimeZoneNamesBundle.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/TimeZoneNamesBundle.java
rename to jdk/src/java.base/share/classes/sun/util/resources/TimeZoneNamesBundle.java
diff --git a/jdk/src/share/classes/sun/util/resources/en/CalendarData_en.properties b/jdk/src/java.base/share/classes/sun/util/resources/en/CalendarData_en.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/en/CalendarData_en.properties
rename to jdk/src/java.base/share/classes/sun/util/resources/en/CalendarData_en.properties
diff --git a/jdk/src/share/classes/sun/util/resources/en/CalendarData_en_GB.properties b/jdk/src/java.base/share/classes/sun/util/resources/en/CalendarData_en_GB.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/en/CalendarData_en_GB.properties
rename to jdk/src/java.base/share/classes/sun/util/resources/en/CalendarData_en_GB.properties
diff --git a/jdk/src/share/classes/sun/util/resources/en/CalendarData_en_IE.properties b/jdk/src/java.base/share/classes/sun/util/resources/en/CalendarData_en_IE.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/en/CalendarData_en_IE.properties
rename to jdk/src/java.base/share/classes/sun/util/resources/en/CalendarData_en_IE.properties
diff --git a/jdk/src/share/classes/sun/util/resources/en/CalendarData_en_MT.properties b/jdk/src/java.base/share/classes/sun/util/resources/en/CalendarData_en_MT.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/en/CalendarData_en_MT.properties
rename to jdk/src/java.base/share/classes/sun/util/resources/en/CalendarData_en_MT.properties
diff --git a/jdk/src/share/classes/sun/util/resources/en/CurrencyNames_en_AU.properties b/jdk/src/java.base/share/classes/sun/util/resources/en/CurrencyNames_en_AU.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/en/CurrencyNames_en_AU.properties
rename to jdk/src/java.base/share/classes/sun/util/resources/en/CurrencyNames_en_AU.properties
diff --git a/jdk/src/share/classes/sun/util/resources/en/CurrencyNames_en_CA.properties b/jdk/src/java.base/share/classes/sun/util/resources/en/CurrencyNames_en_CA.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/en/CurrencyNames_en_CA.properties
rename to jdk/src/java.base/share/classes/sun/util/resources/en/CurrencyNames_en_CA.properties
diff --git a/jdk/src/share/classes/sun/util/resources/en/CurrencyNames_en_GB.properties b/jdk/src/java.base/share/classes/sun/util/resources/en/CurrencyNames_en_GB.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/en/CurrencyNames_en_GB.properties
rename to jdk/src/java.base/share/classes/sun/util/resources/en/CurrencyNames_en_GB.properties
diff --git a/jdk/src/share/classes/sun/util/resources/en/CurrencyNames_en_IE.properties b/jdk/src/java.base/share/classes/sun/util/resources/en/CurrencyNames_en_IE.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/en/CurrencyNames_en_IE.properties
rename to jdk/src/java.base/share/classes/sun/util/resources/en/CurrencyNames_en_IE.properties
diff --git a/jdk/src/share/classes/sun/util/resources/en/CurrencyNames_en_IN.properties b/jdk/src/java.base/share/classes/sun/util/resources/en/CurrencyNames_en_IN.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/en/CurrencyNames_en_IN.properties
rename to jdk/src/java.base/share/classes/sun/util/resources/en/CurrencyNames_en_IN.properties
diff --git a/jdk/src/share/classes/sun/util/resources/en/CurrencyNames_en_MT.properties b/jdk/src/java.base/share/classes/sun/util/resources/en/CurrencyNames_en_MT.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/en/CurrencyNames_en_MT.properties
rename to jdk/src/java.base/share/classes/sun/util/resources/en/CurrencyNames_en_MT.properties
diff --git a/jdk/src/share/classes/sun/util/resources/en/CurrencyNames_en_NZ.properties b/jdk/src/java.base/share/classes/sun/util/resources/en/CurrencyNames_en_NZ.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/en/CurrencyNames_en_NZ.properties
rename to jdk/src/java.base/share/classes/sun/util/resources/en/CurrencyNames_en_NZ.properties
diff --git a/jdk/src/share/classes/sun/util/resources/en/CurrencyNames_en_PH.properties b/jdk/src/java.base/share/classes/sun/util/resources/en/CurrencyNames_en_PH.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/en/CurrencyNames_en_PH.properties
rename to jdk/src/java.base/share/classes/sun/util/resources/en/CurrencyNames_en_PH.properties
diff --git a/jdk/src/share/classes/sun/util/resources/en/CurrencyNames_en_SG.properties b/jdk/src/java.base/share/classes/sun/util/resources/en/CurrencyNames_en_SG.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/en/CurrencyNames_en_SG.properties
rename to jdk/src/java.base/share/classes/sun/util/resources/en/CurrencyNames_en_SG.properties
diff --git a/jdk/src/share/classes/sun/util/resources/en/CurrencyNames_en_US.properties b/jdk/src/java.base/share/classes/sun/util/resources/en/CurrencyNames_en_US.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/en/CurrencyNames_en_US.properties
rename to jdk/src/java.base/share/classes/sun/util/resources/en/CurrencyNames_en_US.properties
diff --git a/jdk/src/share/classes/sun/util/resources/en/CurrencyNames_en_ZA.properties b/jdk/src/java.base/share/classes/sun/util/resources/en/CurrencyNames_en_ZA.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/en/CurrencyNames_en_ZA.properties
rename to jdk/src/java.base/share/classes/sun/util/resources/en/CurrencyNames_en_ZA.properties
diff --git a/jdk/src/share/classes/sun/util/resources/en/LocaleNames_en.properties b/jdk/src/java.base/share/classes/sun/util/resources/en/LocaleNames_en.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/en/LocaleNames_en.properties
rename to jdk/src/java.base/share/classes/sun/util/resources/en/LocaleNames_en.properties
diff --git a/jdk/src/share/classes/sun/util/resources/en/LocaleNames_en_MT.properties b/jdk/src/java.base/share/classes/sun/util/resources/en/LocaleNames_en_MT.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/en/LocaleNames_en_MT.properties
rename to jdk/src/java.base/share/classes/sun/util/resources/en/LocaleNames_en_MT.properties
diff --git a/jdk/src/share/classes/sun/util/resources/en/LocaleNames_en_PH.properties b/jdk/src/java.base/share/classes/sun/util/resources/en/LocaleNames_en_PH.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/en/LocaleNames_en_PH.properties
rename to jdk/src/java.base/share/classes/sun/util/resources/en/LocaleNames_en_PH.properties
diff --git a/jdk/src/share/classes/sun/util/resources/en/LocaleNames_en_SG.properties b/jdk/src/java.base/share/classes/sun/util/resources/en/LocaleNames_en_SG.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/en/LocaleNames_en_SG.properties
rename to jdk/src/java.base/share/classes/sun/util/resources/en/LocaleNames_en_SG.properties
diff --git a/jdk/src/share/classes/sun/util/resources/en/TimeZoneNames_en.java b/jdk/src/java.base/share/classes/sun/util/resources/en/TimeZoneNames_en.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/en/TimeZoneNames_en.java
rename to jdk/src/java.base/share/classes/sun/util/resources/en/TimeZoneNames_en.java
diff --git a/jdk/src/share/classes/sun/util/resources/en/TimeZoneNames_en_CA.java b/jdk/src/java.base/share/classes/sun/util/resources/en/TimeZoneNames_en_CA.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/en/TimeZoneNames_en_CA.java
rename to jdk/src/java.base/share/classes/sun/util/resources/en/TimeZoneNames_en_CA.java
diff --git a/jdk/src/share/classes/sun/util/resources/en/TimeZoneNames_en_GB.java b/jdk/src/java.base/share/classes/sun/util/resources/en/TimeZoneNames_en_GB.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/en/TimeZoneNames_en_GB.java
rename to jdk/src/java.base/share/classes/sun/util/resources/en/TimeZoneNames_en_GB.java
diff --git a/jdk/src/share/classes/sun/util/resources/en/TimeZoneNames_en_IE.java b/jdk/src/java.base/share/classes/sun/util/resources/en/TimeZoneNames_en_IE.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/en/TimeZoneNames_en_IE.java
rename to jdk/src/java.base/share/classes/sun/util/resources/en/TimeZoneNames_en_IE.java
diff --git a/jdk/src/share/classes/sun/util/spi/CalendarProvider.java b/jdk/src/java.base/share/classes/sun/util/spi/CalendarProvider.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/spi/CalendarProvider.java
rename to jdk/src/java.base/share/classes/sun/util/spi/CalendarProvider.java
diff --git a/jdk/src/share/lib/calendars.properties b/jdk/src/java.base/share/conf/calendars.properties
similarity index 100%
rename from jdk/src/share/lib/calendars.properties
rename to jdk/src/java.base/share/conf/calendars.properties
diff --git a/jdk/src/share/lib/hijrah-config-umalqura.properties b/jdk/src/java.base/share/conf/hijrah-config-umalqura.properties
similarity index 100%
rename from jdk/src/share/lib/hijrah-config-umalqura.properties
rename to jdk/src/java.base/share/conf/hijrah-config-umalqura.properties
diff --git a/jdk/src/share/lib/net.properties b/jdk/src/java.base/share/conf/net.properties
similarity index 100%
rename from jdk/src/share/lib/net.properties
rename to jdk/src/java.base/share/conf/net.properties
diff --git a/jdk/src/share/lib/security/cacerts b/jdk/src/java.base/share/conf/security/cacerts
similarity index 100%
rename from jdk/src/share/lib/security/cacerts
rename to jdk/src/java.base/share/conf/security/cacerts
diff --git a/jdk/src/share/lib/security/java.policy b/jdk/src/java.base/share/conf/security/java.policy
similarity index 100%
rename from jdk/src/share/lib/security/java.policy
rename to jdk/src/java.base/share/conf/security/java.policy
diff --git a/jdk/src/share/lib/security/java.security-windows b/jdk/src/java.base/share/conf/security/java.security
similarity index 94%
rename from jdk/src/share/lib/security/java.security-windows
rename to jdk/src/java.base/share/conf/security/java.security
index bd34766c653..7f7bc9c383d 100644
--- a/jdk/src/share/lib/security/java.security-windows
+++ b/jdk/src/java.base/share/conf/security/java.security
@@ -65,16 +65,25 @@
 #
 # List of providers and their preference orders (see above):
 #
-security.provider.1=sun.security.provider.Sun
-security.provider.2=sun.security.rsa.SunRsaSign
-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
+#ifdef solaris
+security.provider.tbd=com.oracle.security.ucrypto.UcryptoProvider ${java.home}/lib/security/ucrypto-solaris.cfg
+security.provider.tbd=sun.security.pkcs11.SunPKCS11 ${java.home}/lib/security/sunpkcs11-solaris.cfg
+#endif
+security.provider.tbd=sun.security.provider.Sun
+security.provider.tbd=sun.security.rsa.SunRsaSign
+security.provider.tbd=sun.security.ec.SunEC
+security.provider.tbd=com.sun.net.ssl.internal.ssl.Provider
+security.provider.tbd=com.sun.crypto.provider.SunJCE
+security.provider.tbd=sun.security.jgss.SunProvider
+security.provider.tbd=com.sun.security.sasl.Provider
+security.provider.tbd=org.jcp.xml.dsig.internal.dom.XMLDSigRI
+security.provider.tbd=sun.security.smartcardio.SunPCSC
+#ifdef windows
+security.provider.tbd=sun.security.mscapi.SunMSCAPI
+#endif
+#ifdef macosx
+security.provider.tbd=apple.security.AppleProvider
+#endif
 
 #
 # Sun Provider SecureRandom seed source.
@@ -127,7 +136,12 @@ securerandom.source=file:/dev/random
 # This is a comma-separated list of algorithm and/or algorithm:provider
 # entries.
 #
+#ifdef windows
 securerandom.strongAlgorithms=Windows-PRNG:SunMSCAPI,SHA1PRNG:SUN
+#endif
+#ifndef windows
+securerandom.strongAlgorithms=NativePRNGBlocking:SUN
+#endif
 
 #
 # Class to instantiate as the javax.security.auth.login.Configuration
@@ -212,7 +226,9 @@ package.access=sun.,\
                jdk.nashorn.internal.,\
                jdk.nashorn.tools.,\
                com.sun.activation.registries.,\
-               com.sun.java.accessibility.
+#ifdef macosx
+               apple.,\
+#endif
 
 #
 # List of comma-separated packages that start with or equal this string
@@ -259,7 +275,9 @@ package.definition=sun.,\
                    jdk.nashorn.internal.,\
                    jdk.nashorn.tools.,\
                    com.sun.activation.registries.,\
-                   com.sun.java.accessibility.
+#ifdef macosx
+                   apple.,\
+#endif
 
 #
 # Determines whether this properties file can be appended to
diff --git a/jdk/src/share/lib/security/sunpkcs11-solaris.cfg b/jdk/src/java.base/share/conf/security/sunpkcs11-solaris.cfg
similarity index 100%
rename from jdk/src/share/lib/security/sunpkcs11-solaris.cfg
rename to jdk/src/java.base/share/conf/security/sunpkcs11-solaris.cfg
diff --git a/jdk/src/share/javavm/export/classfile_constants.h b/jdk/src/java.base/share/native/include/classfile_constants.h
similarity index 100%
rename from jdk/src/share/javavm/export/classfile_constants.h
rename to jdk/src/java.base/share/native/include/classfile_constants.h
diff --git a/jdk/src/share/javavm/export/jni.h b/jdk/src/java.base/share/native/include/jni.h
similarity index 100%
rename from jdk/src/share/javavm/export/jni.h
rename to jdk/src/java.base/share/native/include/jni.h
diff --git a/jdk/src/share/javavm/export/jvm.h b/jdk/src/java.base/share/native/include/jvm.h
similarity index 100%
rename from jdk/src/share/javavm/export/jvm.h
rename to jdk/src/java.base/share/native/include/jvm.h
diff --git a/jdk/src/share/javavm/export/jvmti.h b/jdk/src/java.base/share/native/include/jvmti.h
similarity index 100%
rename from jdk/src/share/javavm/export/jvmti.h
rename to jdk/src/java.base/share/native/include/jvmti.h
diff --git a/jdk/src/share/javavm/export/jvmticmlr.h b/jdk/src/java.base/share/native/include/jvmticmlr.h
similarity index 100%
rename from jdk/src/share/javavm/export/jvmticmlr.h
rename to jdk/src/java.base/share/native/include/jvmticmlr.h
diff --git a/jdk/src/share/bin/defines.h b/jdk/src/java.base/share/native/launcher/defines.h
similarity index 100%
rename from jdk/src/share/bin/defines.h
rename to jdk/src/java.base/share/native/launcher/defines.h
diff --git a/jdk/src/share/bin/main.c b/jdk/src/java.base/share/native/launcher/main.c
similarity index 100%
rename from jdk/src/share/bin/main.c
rename to jdk/src/java.base/share/native/launcher/main.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/e_acos.c b/jdk/src/java.base/share/native/libfdlibm/e_acos.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/e_acos.c
rename to jdk/src/java.base/share/native/libfdlibm/e_acos.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/e_asin.c b/jdk/src/java.base/share/native/libfdlibm/e_asin.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/e_asin.c
rename to jdk/src/java.base/share/native/libfdlibm/e_asin.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/e_atan2.c b/jdk/src/java.base/share/native/libfdlibm/e_atan2.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/e_atan2.c
rename to jdk/src/java.base/share/native/libfdlibm/e_atan2.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/e_atanh.c b/jdk/src/java.base/share/native/libfdlibm/e_atanh.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/e_atanh.c
rename to jdk/src/java.base/share/native/libfdlibm/e_atanh.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/e_cosh.c b/jdk/src/java.base/share/native/libfdlibm/e_cosh.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/e_cosh.c
rename to jdk/src/java.base/share/native/libfdlibm/e_cosh.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/e_exp.c b/jdk/src/java.base/share/native/libfdlibm/e_exp.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/e_exp.c
rename to jdk/src/java.base/share/native/libfdlibm/e_exp.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/e_fmod.c b/jdk/src/java.base/share/native/libfdlibm/e_fmod.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/e_fmod.c
rename to jdk/src/java.base/share/native/libfdlibm/e_fmod.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/e_hypot.c b/jdk/src/java.base/share/native/libfdlibm/e_hypot.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/e_hypot.c
rename to jdk/src/java.base/share/native/libfdlibm/e_hypot.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/e_log.c b/jdk/src/java.base/share/native/libfdlibm/e_log.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/e_log.c
rename to jdk/src/java.base/share/native/libfdlibm/e_log.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/e_log10.c b/jdk/src/java.base/share/native/libfdlibm/e_log10.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/e_log10.c
rename to jdk/src/java.base/share/native/libfdlibm/e_log10.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/e_pow.c b/jdk/src/java.base/share/native/libfdlibm/e_pow.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/e_pow.c
rename to jdk/src/java.base/share/native/libfdlibm/e_pow.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/e_rem_pio2.c b/jdk/src/java.base/share/native/libfdlibm/e_rem_pio2.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/e_rem_pio2.c
rename to jdk/src/java.base/share/native/libfdlibm/e_rem_pio2.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/e_remainder.c b/jdk/src/java.base/share/native/libfdlibm/e_remainder.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/e_remainder.c
rename to jdk/src/java.base/share/native/libfdlibm/e_remainder.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/e_scalb.c b/jdk/src/java.base/share/native/libfdlibm/e_scalb.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/e_scalb.c
rename to jdk/src/java.base/share/native/libfdlibm/e_scalb.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/e_sinh.c b/jdk/src/java.base/share/native/libfdlibm/e_sinh.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/e_sinh.c
rename to jdk/src/java.base/share/native/libfdlibm/e_sinh.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/e_sqrt.c b/jdk/src/java.base/share/native/libfdlibm/e_sqrt.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/e_sqrt.c
rename to jdk/src/java.base/share/native/libfdlibm/e_sqrt.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h b/jdk/src/java.base/share/native/libfdlibm/fdlibm.h
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h
rename to jdk/src/java.base/share/native/libfdlibm/fdlibm.h
diff --git a/jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h b/jdk/src/java.base/share/native/libfdlibm/jfdlibm.h
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h
rename to jdk/src/java.base/share/native/libfdlibm/jfdlibm.h
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/k_cos.c b/jdk/src/java.base/share/native/libfdlibm/k_cos.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/k_cos.c
rename to jdk/src/java.base/share/native/libfdlibm/k_cos.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/k_rem_pio2.c b/jdk/src/java.base/share/native/libfdlibm/k_rem_pio2.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/k_rem_pio2.c
rename to jdk/src/java.base/share/native/libfdlibm/k_rem_pio2.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/k_sin.c b/jdk/src/java.base/share/native/libfdlibm/k_sin.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/k_sin.c
rename to jdk/src/java.base/share/native/libfdlibm/k_sin.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/k_standard.c b/jdk/src/java.base/share/native/libfdlibm/k_standard.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/k_standard.c
rename to jdk/src/java.base/share/native/libfdlibm/k_standard.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/k_tan.c b/jdk/src/java.base/share/native/libfdlibm/k_tan.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/k_tan.c
rename to jdk/src/java.base/share/native/libfdlibm/k_tan.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/s_atan.c b/jdk/src/java.base/share/native/libfdlibm/s_atan.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/s_atan.c
rename to jdk/src/java.base/share/native/libfdlibm/s_atan.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/s_cbrt.c b/jdk/src/java.base/share/native/libfdlibm/s_cbrt.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/s_cbrt.c
rename to jdk/src/java.base/share/native/libfdlibm/s_cbrt.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/s_ceil.c b/jdk/src/java.base/share/native/libfdlibm/s_ceil.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/s_ceil.c
rename to jdk/src/java.base/share/native/libfdlibm/s_ceil.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/s_copysign.c b/jdk/src/java.base/share/native/libfdlibm/s_copysign.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/s_copysign.c
rename to jdk/src/java.base/share/native/libfdlibm/s_copysign.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/s_cos.c b/jdk/src/java.base/share/native/libfdlibm/s_cos.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/s_cos.c
rename to jdk/src/java.base/share/native/libfdlibm/s_cos.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/s_expm1.c b/jdk/src/java.base/share/native/libfdlibm/s_expm1.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/s_expm1.c
rename to jdk/src/java.base/share/native/libfdlibm/s_expm1.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/s_fabs.c b/jdk/src/java.base/share/native/libfdlibm/s_fabs.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/s_fabs.c
rename to jdk/src/java.base/share/native/libfdlibm/s_fabs.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/s_finite.c b/jdk/src/java.base/share/native/libfdlibm/s_finite.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/s_finite.c
rename to jdk/src/java.base/share/native/libfdlibm/s_finite.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/s_floor.c b/jdk/src/java.base/share/native/libfdlibm/s_floor.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/s_floor.c
rename to jdk/src/java.base/share/native/libfdlibm/s_floor.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/s_frexp.c b/jdk/src/java.base/share/native/libfdlibm/s_frexp.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/s_frexp.c
rename to jdk/src/java.base/share/native/libfdlibm/s_frexp.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/s_ilogb.c b/jdk/src/java.base/share/native/libfdlibm/s_ilogb.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/s_ilogb.c
rename to jdk/src/java.base/share/native/libfdlibm/s_ilogb.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/s_isnan.c b/jdk/src/java.base/share/native/libfdlibm/s_isnan.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/s_isnan.c
rename to jdk/src/java.base/share/native/libfdlibm/s_isnan.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/s_ldexp.c b/jdk/src/java.base/share/native/libfdlibm/s_ldexp.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/s_ldexp.c
rename to jdk/src/java.base/share/native/libfdlibm/s_ldexp.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/s_lib_version.c b/jdk/src/java.base/share/native/libfdlibm/s_lib_version.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/s_lib_version.c
rename to jdk/src/java.base/share/native/libfdlibm/s_lib_version.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/s_log1p.c b/jdk/src/java.base/share/native/libfdlibm/s_log1p.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/s_log1p.c
rename to jdk/src/java.base/share/native/libfdlibm/s_log1p.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/s_logb.c b/jdk/src/java.base/share/native/libfdlibm/s_logb.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/s_logb.c
rename to jdk/src/java.base/share/native/libfdlibm/s_logb.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/s_matherr.c b/jdk/src/java.base/share/native/libfdlibm/s_matherr.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/s_matherr.c
rename to jdk/src/java.base/share/native/libfdlibm/s_matherr.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/s_modf.c b/jdk/src/java.base/share/native/libfdlibm/s_modf.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/s_modf.c
rename to jdk/src/java.base/share/native/libfdlibm/s_modf.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/s_nextafter.c b/jdk/src/java.base/share/native/libfdlibm/s_nextafter.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/s_nextafter.c
rename to jdk/src/java.base/share/native/libfdlibm/s_nextafter.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/s_rint.c b/jdk/src/java.base/share/native/libfdlibm/s_rint.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/s_rint.c
rename to jdk/src/java.base/share/native/libfdlibm/s_rint.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/s_scalbn.c b/jdk/src/java.base/share/native/libfdlibm/s_scalbn.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/s_scalbn.c
rename to jdk/src/java.base/share/native/libfdlibm/s_scalbn.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/s_signgam.c b/jdk/src/java.base/share/native/libfdlibm/s_signgam.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/s_signgam.c
rename to jdk/src/java.base/share/native/libfdlibm/s_signgam.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/s_significand.c b/jdk/src/java.base/share/native/libfdlibm/s_significand.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/s_significand.c
rename to jdk/src/java.base/share/native/libfdlibm/s_significand.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/s_sin.c b/jdk/src/java.base/share/native/libfdlibm/s_sin.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/s_sin.c
rename to jdk/src/java.base/share/native/libfdlibm/s_sin.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/s_tan.c b/jdk/src/java.base/share/native/libfdlibm/s_tan.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/s_tan.c
rename to jdk/src/java.base/share/native/libfdlibm/s_tan.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/s_tanh.c b/jdk/src/java.base/share/native/libfdlibm/s_tanh.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/s_tanh.c
rename to jdk/src/java.base/share/native/libfdlibm/s_tanh.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/w_acos.c b/jdk/src/java.base/share/native/libfdlibm/w_acos.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/w_acos.c
rename to jdk/src/java.base/share/native/libfdlibm/w_acos.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/w_asin.c b/jdk/src/java.base/share/native/libfdlibm/w_asin.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/w_asin.c
rename to jdk/src/java.base/share/native/libfdlibm/w_asin.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/w_atan2.c b/jdk/src/java.base/share/native/libfdlibm/w_atan2.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/w_atan2.c
rename to jdk/src/java.base/share/native/libfdlibm/w_atan2.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/w_atanh.c b/jdk/src/java.base/share/native/libfdlibm/w_atanh.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/w_atanh.c
rename to jdk/src/java.base/share/native/libfdlibm/w_atanh.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/w_cosh.c b/jdk/src/java.base/share/native/libfdlibm/w_cosh.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/w_cosh.c
rename to jdk/src/java.base/share/native/libfdlibm/w_cosh.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/w_exp.c b/jdk/src/java.base/share/native/libfdlibm/w_exp.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/w_exp.c
rename to jdk/src/java.base/share/native/libfdlibm/w_exp.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/w_fmod.c b/jdk/src/java.base/share/native/libfdlibm/w_fmod.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/w_fmod.c
rename to jdk/src/java.base/share/native/libfdlibm/w_fmod.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/w_hypot.c b/jdk/src/java.base/share/native/libfdlibm/w_hypot.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/w_hypot.c
rename to jdk/src/java.base/share/native/libfdlibm/w_hypot.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/w_log.c b/jdk/src/java.base/share/native/libfdlibm/w_log.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/w_log.c
rename to jdk/src/java.base/share/native/libfdlibm/w_log.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/w_log10.c b/jdk/src/java.base/share/native/libfdlibm/w_log10.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/w_log10.c
rename to jdk/src/java.base/share/native/libfdlibm/w_log10.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/w_pow.c b/jdk/src/java.base/share/native/libfdlibm/w_pow.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/w_pow.c
rename to jdk/src/java.base/share/native/libfdlibm/w_pow.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/w_remainder.c b/jdk/src/java.base/share/native/libfdlibm/w_remainder.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/w_remainder.c
rename to jdk/src/java.base/share/native/libfdlibm/w_remainder.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/w_scalb.c b/jdk/src/java.base/share/native/libfdlibm/w_scalb.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/w_scalb.c
rename to jdk/src/java.base/share/native/libfdlibm/w_scalb.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/w_sinh.c b/jdk/src/java.base/share/native/libfdlibm/w_sinh.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/w_sinh.c
rename to jdk/src/java.base/share/native/libfdlibm/w_sinh.c
diff --git a/jdk/src/share/native/java/lang/fdlibm/src/w_sqrt.c b/jdk/src/java.base/share/native/libfdlibm/w_sqrt.c
similarity index 100%
rename from jdk/src/share/native/java/lang/fdlibm/src/w_sqrt.c
rename to jdk/src/java.base/share/native/libfdlibm/w_sqrt.c
diff --git a/jdk/src/share/native/java/security/AccessController.c b/jdk/src/java.base/share/native/libjava/AccessController.c
similarity index 100%
rename from jdk/src/share/native/java/security/AccessController.c
rename to jdk/src/java.base/share/native/libjava/AccessController.c
diff --git a/jdk/src/share/native/java/lang/reflect/Array.c b/jdk/src/java.base/share/native/libjava/Array.c
similarity index 100%
rename from jdk/src/share/native/java/lang/reflect/Array.c
rename to jdk/src/java.base/share/native/libjava/Array.c
diff --git a/jdk/src/share/native/java/util/concurrent/atomic/AtomicLong.c b/jdk/src/java.base/share/native/libjava/AtomicLong.c
similarity index 100%
rename from jdk/src/share/native/java/util/concurrent/atomic/AtomicLong.c
rename to jdk/src/java.base/share/native/libjava/AtomicLong.c
diff --git a/jdk/src/share/native/java/nio/Bits.c b/jdk/src/java.base/share/native/libjava/Bits.c
similarity index 100%
rename from jdk/src/share/native/java/nio/Bits.c
rename to jdk/src/java.base/share/native/libjava/Bits.c
diff --git a/jdk/src/share/native/java/lang/Class.c b/jdk/src/java.base/share/native/libjava/Class.c
similarity index 100%
rename from jdk/src/share/native/java/lang/Class.c
rename to jdk/src/java.base/share/native/libjava/Class.c
diff --git a/jdk/src/share/native/java/lang/ClassLoader.c b/jdk/src/java.base/share/native/libjava/ClassLoader.c
similarity index 100%
rename from jdk/src/share/native/java/lang/ClassLoader.c
rename to jdk/src/java.base/share/native/libjava/ClassLoader.c
diff --git a/jdk/src/share/native/java/lang/Compiler.c b/jdk/src/java.base/share/native/libjava/Compiler.c
similarity index 100%
rename from jdk/src/share/native/java/lang/Compiler.c
rename to jdk/src/java.base/share/native/libjava/Compiler.c
diff --git a/jdk/src/share/native/sun/reflect/ConstantPool.c b/jdk/src/java.base/share/native/libjava/ConstantPool.c
similarity index 100%
rename from jdk/src/share/native/sun/reflect/ConstantPool.c
rename to jdk/src/java.base/share/native/libjava/ConstantPool.c
diff --git a/jdk/src/share/native/java/lang/Double.c b/jdk/src/java.base/share/native/libjava/Double.c
similarity index 100%
rename from jdk/src/share/native/java/lang/Double.c
rename to jdk/src/java.base/share/native/libjava/Double.c
diff --git a/jdk/src/share/native/java/lang/reflect/Executable.c b/jdk/src/java.base/share/native/libjava/Executable.c
similarity index 100%
rename from jdk/src/share/native/java/lang/reflect/Executable.c
rename to jdk/src/java.base/share/native/libjava/Executable.c
diff --git a/jdk/src/share/native/java/lang/reflect/Field.c b/jdk/src/java.base/share/native/libjava/Field.c
similarity index 100%
rename from jdk/src/share/native/java/lang/reflect/Field.c
rename to jdk/src/java.base/share/native/libjava/Field.c
diff --git a/jdk/src/share/native/java/io/FileInputStream.c b/jdk/src/java.base/share/native/libjava/FileInputStream.c
similarity index 100%
rename from jdk/src/share/native/java/io/FileInputStream.c
rename to jdk/src/java.base/share/native/libjava/FileInputStream.c
diff --git a/jdk/src/share/native/java/lang/Float.c b/jdk/src/java.base/share/native/libjava/Float.c
similarity index 100%
rename from jdk/src/share/native/java/lang/Float.c
rename to jdk/src/java.base/share/native/libjava/Float.c
diff --git a/jdk/src/share/native/sun/misc/GC.c b/jdk/src/java.base/share/native/libjava/GC.c
similarity index 100%
rename from jdk/src/share/native/sun/misc/GC.c
rename to jdk/src/java.base/share/native/libjava/GC.c
diff --git a/jdk/src/share/native/sun/misc/MessageUtils.c b/jdk/src/java.base/share/native/libjava/MessageUtils.c
similarity index 100%
rename from jdk/src/share/native/sun/misc/MessageUtils.c
rename to jdk/src/java.base/share/native/libjava/MessageUtils.c
diff --git a/jdk/src/share/native/sun/reflect/NativeAccessors.c b/jdk/src/java.base/share/native/libjava/NativeAccessors.c
similarity index 100%
rename from jdk/src/share/native/sun/reflect/NativeAccessors.c
rename to jdk/src/java.base/share/native/libjava/NativeAccessors.c
diff --git a/jdk/src/share/native/sun/misc/NativeSignalHandler.c b/jdk/src/java.base/share/native/libjava/NativeSignalHandler.c
similarity index 100%
rename from jdk/src/share/native/sun/misc/NativeSignalHandler.c
rename to jdk/src/java.base/share/native/libjava/NativeSignalHandler.c
diff --git a/jdk/src/share/native/java/lang/Object.c b/jdk/src/java.base/share/native/libjava/Object.c
similarity index 100%
rename from jdk/src/share/native/java/lang/Object.c
rename to jdk/src/java.base/share/native/libjava/Object.c
diff --git a/jdk/src/share/native/java/io/ObjectInputStream.c b/jdk/src/java.base/share/native/libjava/ObjectInputStream.c
similarity index 100%
rename from jdk/src/share/native/java/io/ObjectInputStream.c
rename to jdk/src/java.base/share/native/libjava/ObjectInputStream.c
diff --git a/jdk/src/share/native/java/io/ObjectOutputStream.c b/jdk/src/java.base/share/native/libjava/ObjectOutputStream.c
similarity index 100%
rename from jdk/src/share/native/java/io/ObjectOutputStream.c
rename to jdk/src/java.base/share/native/libjava/ObjectOutputStream.c
diff --git a/jdk/src/share/native/java/io/ObjectStreamClass.c b/jdk/src/java.base/share/native/libjava/ObjectStreamClass.c
similarity index 100%
rename from jdk/src/share/native/java/io/ObjectStreamClass.c
rename to jdk/src/java.base/share/native/libjava/ObjectStreamClass.c
diff --git a/jdk/src/share/native/java/lang/Package.c b/jdk/src/java.base/share/native/libjava/Package.c
similarity index 100%
rename from jdk/src/share/native/java/lang/Package.c
rename to jdk/src/java.base/share/native/libjava/Package.c
diff --git a/jdk/src/share/native/java/lang/reflect/Proxy.c b/jdk/src/java.base/share/native/libjava/Proxy.c
similarity index 100%
rename from jdk/src/share/native/java/lang/reflect/Proxy.c
rename to jdk/src/java.base/share/native/libjava/Proxy.c
diff --git a/jdk/src/share/native/java/io/RandomAccessFile.c b/jdk/src/java.base/share/native/libjava/RandomAccessFile.c
similarity index 100%
rename from jdk/src/share/native/java/io/RandomAccessFile.c
rename to jdk/src/java.base/share/native/libjava/RandomAccessFile.c
diff --git a/jdk/src/share/native/sun/reflect/Reflection.c b/jdk/src/java.base/share/native/libjava/Reflection.c
similarity index 100%
rename from jdk/src/share/native/sun/reflect/Reflection.c
rename to jdk/src/java.base/share/native/libjava/Reflection.c
diff --git a/jdk/src/share/native/java/lang/Runtime.c b/jdk/src/java.base/share/native/libjava/Runtime.c
similarity index 100%
rename from jdk/src/share/native/java/lang/Runtime.c
rename to jdk/src/java.base/share/native/libjava/Runtime.c
diff --git a/jdk/src/share/native/java/lang/SecurityManager.c b/jdk/src/java.base/share/native/libjava/SecurityManager.c
similarity index 100%
rename from jdk/src/share/native/java/lang/SecurityManager.c
rename to jdk/src/java.base/share/native/libjava/SecurityManager.c
diff --git a/jdk/src/share/native/java/lang/Shutdown.c b/jdk/src/java.base/share/native/libjava/Shutdown.c
similarity index 100%
rename from jdk/src/share/native/java/lang/Shutdown.c
rename to jdk/src/java.base/share/native/libjava/Shutdown.c
diff --git a/jdk/src/share/native/sun/misc/Signal.c b/jdk/src/java.base/share/native/libjava/Signal.c
similarity index 100%
rename from jdk/src/share/native/sun/misc/Signal.c
rename to jdk/src/java.base/share/native/libjava/Signal.c
diff --git a/jdk/src/share/native/java/lang/StrictMath.c b/jdk/src/java.base/share/native/libjava/StrictMath.c
similarity index 100%
rename from jdk/src/share/native/java/lang/StrictMath.c
rename to jdk/src/java.base/share/native/libjava/StrictMath.c
diff --git a/jdk/src/share/native/java/lang/String.c b/jdk/src/java.base/share/native/libjava/String.c
similarity index 100%
rename from jdk/src/share/native/java/lang/String.c
rename to jdk/src/java.base/share/native/libjava/String.c
diff --git a/jdk/src/share/native/java/lang/System.c b/jdk/src/java.base/share/native/libjava/System.c
similarity index 100%
rename from jdk/src/share/native/java/lang/System.c
rename to jdk/src/java.base/share/native/libjava/System.c
diff --git a/jdk/src/share/native/java/lang/Thread.c b/jdk/src/java.base/share/native/libjava/Thread.c
similarity index 100%
rename from jdk/src/share/native/java/lang/Thread.c
rename to jdk/src/java.base/share/native/libjava/Thread.c
diff --git a/jdk/src/share/native/java/lang/Throwable.c b/jdk/src/java.base/share/native/libjava/Throwable.c
similarity index 100%
rename from jdk/src/share/native/java/lang/Throwable.c
rename to jdk/src/java.base/share/native/libjava/Throwable.c
diff --git a/jdk/src/share/native/java/util/TimeZone.c b/jdk/src/java.base/share/native/libjava/TimeZone.c
similarity index 100%
rename from jdk/src/share/native/java/util/TimeZone.c
rename to jdk/src/java.base/share/native/libjava/TimeZone.c
diff --git a/jdk/src/share/native/sun/misc/VM.c b/jdk/src/java.base/share/native/libjava/VM.c
similarity index 100%
rename from jdk/src/share/native/sun/misc/VM.c
rename to jdk/src/java.base/share/native/libjava/VM.c
diff --git a/jdk/src/share/native/sun/misc/VMSupport.c b/jdk/src/java.base/share/native/libjava/VMSupport.c
similarity index 100%
rename from jdk/src/share/native/sun/misc/VMSupport.c
rename to jdk/src/java.base/share/native/libjava/VMSupport.c
diff --git a/jdk/src/share/native/sun/misc/Version.c b/jdk/src/java.base/share/native/libjava/Version.c
similarity index 100%
rename from jdk/src/share/native/sun/misc/Version.c
rename to jdk/src/java.base/share/native/libjava/Version.c
diff --git a/jdk/src/share/native/common/check_version.c b/jdk/src/java.base/share/native/libjava/check_version.c
similarity index 100%
rename from jdk/src/share/native/common/check_version.c
rename to jdk/src/java.base/share/native/libjava/check_version.c
diff --git a/jdk/src/share/native/common/gdefs.h b/jdk/src/java.base/share/native/libjava/gdefs.h
similarity index 100%
rename from jdk/src/share/native/common/gdefs.h
rename to jdk/src/java.base/share/native/libjava/gdefs.h
diff --git a/jdk/src/share/native/java/io/io_util.c b/jdk/src/java.base/share/native/libjava/io_util.c
similarity index 100%
rename from jdk/src/share/native/java/io/io_util.c
rename to jdk/src/java.base/share/native/libjava/io_util.c
diff --git a/jdk/src/share/native/java/io/io_util.h b/jdk/src/java.base/share/native/libjava/io_util.h
similarity index 100%
rename from jdk/src/share/native/java/io/io_util.h
rename to jdk/src/java.base/share/native/libjava/io_util.h
diff --git a/jdk/src/share/native/java/lang/java_props.h b/jdk/src/java.base/share/native/libjava/java_props.h
similarity index 100%
rename from jdk/src/share/native/java/lang/java_props.h
rename to jdk/src/java.base/share/native/libjava/java_props.h
diff --git a/jdk/src/share/native/common/jdk_util.c b/jdk/src/java.base/share/native/libjava/jdk_util.c
similarity index 100%
rename from jdk/src/share/native/common/jdk_util.c
rename to jdk/src/java.base/share/native/libjava/jdk_util.c
diff --git a/jdk/src/share/native/common/jdk_util.h b/jdk/src/java.base/share/native/libjava/jdk_util.h
similarity index 100%
rename from jdk/src/share/native/common/jdk_util.h
rename to jdk/src/java.base/share/native/libjava/jdk_util.h
diff --git a/jdk/src/share/native/common/jio.c b/jdk/src/java.base/share/native/libjava/jio.c
similarity index 100%
rename from jdk/src/share/native/common/jio.c
rename to jdk/src/java.base/share/native/libjava/jio.c
diff --git a/jdk/src/share/native/common/jlong.h b/jdk/src/java.base/share/native/libjava/jlong.h
similarity index 100%
rename from jdk/src/share/native/common/jlong.h
rename to jdk/src/java.base/share/native/libjava/jlong.h
diff --git a/jdk/src/share/native/common/jni_util.c b/jdk/src/java.base/share/native/libjava/jni_util.c
similarity index 100%
rename from jdk/src/share/native/common/jni_util.c
rename to jdk/src/java.base/share/native/libjava/jni_util.c
diff --git a/jdk/src/share/native/common/jni_util.h b/jdk/src/java.base/share/native/libjava/jni_util.h
similarity index 100%
rename from jdk/src/share/native/common/jni_util.h
rename to jdk/src/java.base/share/native/libjava/jni_util.h
diff --git a/jdk/src/share/native/common/sizecalc.h b/jdk/src/java.base/share/native/libjava/sizecalc.h
similarity index 100%
rename from jdk/src/share/native/common/sizecalc.h
rename to jdk/src/java.base/share/native/libjava/sizecalc.h
diff --git a/jdk/src/share/native/common/verify_stub.c b/jdk/src/java.base/share/native/libjava/verify_stub.c
similarity index 100%
rename from jdk/src/share/native/common/verify_stub.c
rename to jdk/src/java.base/share/native/libjava/verify_stub.c
diff --git a/jdk/src/share/bin/emessages.h b/jdk/src/java.base/share/native/libjli/emessages.h
similarity index 100%
rename from jdk/src/share/bin/emessages.h
rename to jdk/src/java.base/share/native/libjli/emessages.h
diff --git a/jdk/src/share/bin/java.c b/jdk/src/java.base/share/native/libjli/java.c
similarity index 100%
rename from jdk/src/share/bin/java.c
rename to jdk/src/java.base/share/native/libjli/java.c
diff --git a/jdk/src/share/bin/java.h b/jdk/src/java.base/share/native/libjli/java.h
similarity index 100%
rename from jdk/src/share/bin/java.h
rename to jdk/src/java.base/share/native/libjli/java.h
diff --git a/jdk/src/share/bin/jli_util.c b/jdk/src/java.base/share/native/libjli/jli_util.c
similarity index 100%
rename from jdk/src/share/bin/jli_util.c
rename to jdk/src/java.base/share/native/libjli/jli_util.c
diff --git a/jdk/src/share/bin/jli_util.h b/jdk/src/java.base/share/native/libjli/jli_util.h
similarity index 100%
rename from jdk/src/share/bin/jli_util.h
rename to jdk/src/java.base/share/native/libjli/jli_util.h
diff --git a/jdk/src/share/bin/manifest_info.h b/jdk/src/java.base/share/native/libjli/manifest_info.h
similarity index 100%
rename from jdk/src/share/bin/manifest_info.h
rename to jdk/src/java.base/share/native/libjli/manifest_info.h
diff --git a/jdk/src/share/bin/parse_manifest.c b/jdk/src/java.base/share/native/libjli/parse_manifest.c
similarity index 100%
rename from jdk/src/share/bin/parse_manifest.c
rename to jdk/src/java.base/share/native/libjli/parse_manifest.c
diff --git a/jdk/src/share/bin/splashscreen.h b/jdk/src/java.base/share/native/libjli/splashscreen.h
similarity index 100%
rename from jdk/src/share/bin/splashscreen.h
rename to jdk/src/java.base/share/native/libjli/splashscreen.h
diff --git a/jdk/src/share/bin/splashscreen_stubs.c b/jdk/src/java.base/share/native/libjli/splashscreen_stubs.c
similarity index 100%
rename from jdk/src/share/bin/splashscreen_stubs.c
rename to jdk/src/java.base/share/native/libjli/splashscreen_stubs.c
diff --git a/jdk/src/share/bin/version_comp.c b/jdk/src/java.base/share/native/libjli/version_comp.c
similarity index 100%
rename from jdk/src/share/bin/version_comp.c
rename to jdk/src/java.base/share/native/libjli/version_comp.c
diff --git a/jdk/src/share/bin/version_comp.h b/jdk/src/java.base/share/native/libjli/version_comp.h
similarity index 100%
rename from jdk/src/share/bin/version_comp.h
rename to jdk/src/java.base/share/native/libjli/version_comp.h
diff --git a/jdk/src/share/bin/wildcard.c b/jdk/src/java.base/share/native/libjli/wildcard.c
similarity index 100%
rename from jdk/src/share/bin/wildcard.c
rename to jdk/src/java.base/share/native/libjli/wildcard.c
diff --git a/jdk/src/share/bin/wildcard.h b/jdk/src/java.base/share/native/libjli/wildcard.h
similarity index 100%
rename from jdk/src/share/bin/wildcard.h
rename to jdk/src/java.base/share/native/libjli/wildcard.h
diff --git a/jdk/src/share/native/java/net/DatagramPacket.c b/jdk/src/java.base/share/native/libnet/DatagramPacket.c
similarity index 100%
rename from jdk/src/share/native/java/net/DatagramPacket.c
rename to jdk/src/java.base/share/native/libnet/DatagramPacket.c
diff --git a/jdk/src/share/native/java/net/Inet4Address.c b/jdk/src/java.base/share/native/libnet/Inet4Address.c
similarity index 100%
rename from jdk/src/share/native/java/net/Inet4Address.c
rename to jdk/src/java.base/share/native/libnet/Inet4Address.c
diff --git a/jdk/src/share/native/java/net/Inet6Address.c b/jdk/src/java.base/share/native/libnet/Inet6Address.c
similarity index 100%
rename from jdk/src/share/native/java/net/Inet6Address.c
rename to jdk/src/java.base/share/native/libnet/Inet6Address.c
diff --git a/jdk/src/share/native/java/net/InetAddress.c b/jdk/src/java.base/share/native/libnet/InetAddress.c
similarity index 100%
rename from jdk/src/share/native/java/net/InetAddress.c
rename to jdk/src/java.base/share/native/libnet/InetAddress.c
diff --git a/jdk/src/share/native/java/net/net_util.c b/jdk/src/java.base/share/native/libnet/net_util.c
similarity index 100%
rename from jdk/src/share/native/java/net/net_util.c
rename to jdk/src/java.base/share/native/libnet/net_util.c
diff --git a/jdk/src/share/native/java/net/net_util.h b/jdk/src/java.base/share/native/libnet/net_util.h
similarity index 100%
rename from jdk/src/share/native/java/net/net_util.h
rename to jdk/src/java.base/share/native/libnet/net_util.h
diff --git a/jdk/src/share/native/sun/nio/ch/nio.h b/jdk/src/java.base/share/native/libnio/ch/nio.h
similarity index 100%
rename from jdk/src/share/native/sun/nio/ch/nio.h
rename to jdk/src/java.base/share/native/libnio/ch/nio.h
diff --git a/jdk/src/share/native/common/check_code.c b/jdk/src/java.base/share/native/libverify/check_code.c
similarity index 100%
rename from jdk/src/share/native/common/check_code.c
rename to jdk/src/java.base/share/native/libverify/check_code.c
diff --git a/jdk/src/share/native/common/check_format.c b/jdk/src/java.base/share/native/libverify/check_format.c
similarity index 100%
rename from jdk/src/share/native/common/check_format.c
rename to jdk/src/java.base/share/native/libverify/check_format.c
diff --git a/jdk/src/share/native/common/opcodes.in_out b/jdk/src/java.base/share/native/libverify/opcodes.in_out
similarity index 100%
rename from jdk/src/share/native/common/opcodes.in_out
rename to jdk/src/java.base/share/native/libverify/opcodes.in_out
diff --git a/jdk/src/share/native/java/util/zip/Adler32.c b/jdk/src/java.base/share/native/libzip/Adler32.c
similarity index 100%
rename from jdk/src/share/native/java/util/zip/Adler32.c
rename to jdk/src/java.base/share/native/libzip/Adler32.c
diff --git a/jdk/src/share/native/java/util/zip/CRC32.c b/jdk/src/java.base/share/native/libzip/CRC32.c
similarity index 100%
rename from jdk/src/share/native/java/util/zip/CRC32.c
rename to jdk/src/java.base/share/native/libzip/CRC32.c
diff --git a/jdk/src/share/native/java/util/zip/Deflater.c b/jdk/src/java.base/share/native/libzip/Deflater.c
similarity index 100%
rename from jdk/src/share/native/java/util/zip/Deflater.c
rename to jdk/src/java.base/share/native/libzip/Deflater.c
diff --git a/jdk/src/share/native/java/util/zip/Inflater.c b/jdk/src/java.base/share/native/libzip/Inflater.c
similarity index 100%
rename from jdk/src/share/native/java/util/zip/Inflater.c
rename to jdk/src/java.base/share/native/libzip/Inflater.c
diff --git a/jdk/src/share/native/java/util/zip/ZipFile.c b/jdk/src/java.base/share/native/libzip/ZipFile.c
similarity index 100%
rename from jdk/src/share/native/java/util/zip/ZipFile.c
rename to jdk/src/java.base/share/native/libzip/ZipFile.c
diff --git a/jdk/src/share/native/java/util/zip/zip_util.c b/jdk/src/java.base/share/native/libzip/zip_util.c
similarity index 100%
rename from jdk/src/share/native/java/util/zip/zip_util.c
rename to jdk/src/java.base/share/native/libzip/zip_util.c
diff --git a/jdk/src/share/native/java/util/zip/zip_util.h b/jdk/src/java.base/share/native/libzip/zip_util.h
similarity index 100%
rename from jdk/src/share/native/java/util/zip/zip_util.h
rename to jdk/src/java.base/share/native/libzip/zip_util.h
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.8/ChangeLog b/jdk/src/java.base/share/native/libzip/zlib-1.2.8/ChangeLog
similarity index 100%
rename from jdk/src/share/native/java/util/zip/zlib-1.2.8/ChangeLog
rename to jdk/src/java.base/share/native/libzip/zlib-1.2.8/ChangeLog
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.8/README b/jdk/src/java.base/share/native/libzip/zlib-1.2.8/README
similarity index 100%
rename from jdk/src/share/native/java/util/zip/zlib-1.2.8/README
rename to jdk/src/java.base/share/native/libzip/zlib-1.2.8/README
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.8/compress.c b/jdk/src/java.base/share/native/libzip/zlib-1.2.8/compress.c
similarity index 100%
rename from jdk/src/share/native/java/util/zip/zlib-1.2.8/compress.c
rename to jdk/src/java.base/share/native/libzip/zlib-1.2.8/compress.c
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.8/crc32.h b/jdk/src/java.base/share/native/libzip/zlib-1.2.8/crc32.h
similarity index 100%
rename from jdk/src/share/native/java/util/zip/zlib-1.2.8/crc32.h
rename to jdk/src/java.base/share/native/libzip/zlib-1.2.8/crc32.h
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.8/deflate.c b/jdk/src/java.base/share/native/libzip/zlib-1.2.8/deflate.c
similarity index 100%
rename from jdk/src/share/native/java/util/zip/zlib-1.2.8/deflate.c
rename to jdk/src/java.base/share/native/libzip/zlib-1.2.8/deflate.c
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.8/deflate.h b/jdk/src/java.base/share/native/libzip/zlib-1.2.8/deflate.h
similarity index 100%
rename from jdk/src/share/native/java/util/zip/zlib-1.2.8/deflate.h
rename to jdk/src/java.base/share/native/libzip/zlib-1.2.8/deflate.h
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.8/gzclose.c b/jdk/src/java.base/share/native/libzip/zlib-1.2.8/gzclose.c
similarity index 100%
rename from jdk/src/share/native/java/util/zip/zlib-1.2.8/gzclose.c
rename to jdk/src/java.base/share/native/libzip/zlib-1.2.8/gzclose.c
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.8/gzguts.h b/jdk/src/java.base/share/native/libzip/zlib-1.2.8/gzguts.h
similarity index 100%
rename from jdk/src/share/native/java/util/zip/zlib-1.2.8/gzguts.h
rename to jdk/src/java.base/share/native/libzip/zlib-1.2.8/gzguts.h
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.8/gzlib.c b/jdk/src/java.base/share/native/libzip/zlib-1.2.8/gzlib.c
similarity index 100%
rename from jdk/src/share/native/java/util/zip/zlib-1.2.8/gzlib.c
rename to jdk/src/java.base/share/native/libzip/zlib-1.2.8/gzlib.c
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.8/gzread.c b/jdk/src/java.base/share/native/libzip/zlib-1.2.8/gzread.c
similarity index 100%
rename from jdk/src/share/native/java/util/zip/zlib-1.2.8/gzread.c
rename to jdk/src/java.base/share/native/libzip/zlib-1.2.8/gzread.c
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.8/gzwrite.c b/jdk/src/java.base/share/native/libzip/zlib-1.2.8/gzwrite.c
similarity index 100%
rename from jdk/src/share/native/java/util/zip/zlib-1.2.8/gzwrite.c
rename to jdk/src/java.base/share/native/libzip/zlib-1.2.8/gzwrite.c
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.8/infback.c b/jdk/src/java.base/share/native/libzip/zlib-1.2.8/infback.c
similarity index 100%
rename from jdk/src/share/native/java/util/zip/zlib-1.2.8/infback.c
rename to jdk/src/java.base/share/native/libzip/zlib-1.2.8/infback.c
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.8/inffast.c b/jdk/src/java.base/share/native/libzip/zlib-1.2.8/inffast.c
similarity index 100%
rename from jdk/src/share/native/java/util/zip/zlib-1.2.8/inffast.c
rename to jdk/src/java.base/share/native/libzip/zlib-1.2.8/inffast.c
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.8/inffast.h b/jdk/src/java.base/share/native/libzip/zlib-1.2.8/inffast.h
similarity index 100%
rename from jdk/src/share/native/java/util/zip/zlib-1.2.8/inffast.h
rename to jdk/src/java.base/share/native/libzip/zlib-1.2.8/inffast.h
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.8/inffixed.h b/jdk/src/java.base/share/native/libzip/zlib-1.2.8/inffixed.h
similarity index 100%
rename from jdk/src/share/native/java/util/zip/zlib-1.2.8/inffixed.h
rename to jdk/src/java.base/share/native/libzip/zlib-1.2.8/inffixed.h
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.8/inflate.c b/jdk/src/java.base/share/native/libzip/zlib-1.2.8/inflate.c
similarity index 100%
rename from jdk/src/share/native/java/util/zip/zlib-1.2.8/inflate.c
rename to jdk/src/java.base/share/native/libzip/zlib-1.2.8/inflate.c
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.8/inflate.h b/jdk/src/java.base/share/native/libzip/zlib-1.2.8/inflate.h
similarity index 100%
rename from jdk/src/share/native/java/util/zip/zlib-1.2.8/inflate.h
rename to jdk/src/java.base/share/native/libzip/zlib-1.2.8/inflate.h
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.8/inftrees.c b/jdk/src/java.base/share/native/libzip/zlib-1.2.8/inftrees.c
similarity index 100%
rename from jdk/src/share/native/java/util/zip/zlib-1.2.8/inftrees.c
rename to jdk/src/java.base/share/native/libzip/zlib-1.2.8/inftrees.c
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.8/inftrees.h b/jdk/src/java.base/share/native/libzip/zlib-1.2.8/inftrees.h
similarity index 100%
rename from jdk/src/share/native/java/util/zip/zlib-1.2.8/inftrees.h
rename to jdk/src/java.base/share/native/libzip/zlib-1.2.8/inftrees.h
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.8/patches/ChangeLog_java b/jdk/src/java.base/share/native/libzip/zlib-1.2.8/patches/ChangeLog_java
similarity index 100%
rename from jdk/src/share/native/java/util/zip/zlib-1.2.8/patches/ChangeLog_java
rename to jdk/src/java.base/share/native/libzip/zlib-1.2.8/patches/ChangeLog_java
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.8/trees.c b/jdk/src/java.base/share/native/libzip/zlib-1.2.8/trees.c
similarity index 100%
rename from jdk/src/share/native/java/util/zip/zlib-1.2.8/trees.c
rename to jdk/src/java.base/share/native/libzip/zlib-1.2.8/trees.c
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.8/trees.h b/jdk/src/java.base/share/native/libzip/zlib-1.2.8/trees.h
similarity index 100%
rename from jdk/src/share/native/java/util/zip/zlib-1.2.8/trees.h
rename to jdk/src/java.base/share/native/libzip/zlib-1.2.8/trees.h
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.8/uncompr.c b/jdk/src/java.base/share/native/libzip/zlib-1.2.8/uncompr.c
similarity index 100%
rename from jdk/src/share/native/java/util/zip/zlib-1.2.8/uncompr.c
rename to jdk/src/java.base/share/native/libzip/zlib-1.2.8/uncompr.c
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.8/zadler32.c b/jdk/src/java.base/share/native/libzip/zlib-1.2.8/zadler32.c
similarity index 100%
rename from jdk/src/share/native/java/util/zip/zlib-1.2.8/zadler32.c
rename to jdk/src/java.base/share/native/libzip/zlib-1.2.8/zadler32.c
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.8/zconf.h b/jdk/src/java.base/share/native/libzip/zlib-1.2.8/zconf.h
similarity index 100%
rename from jdk/src/share/native/java/util/zip/zlib-1.2.8/zconf.h
rename to jdk/src/java.base/share/native/libzip/zlib-1.2.8/zconf.h
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.8/zcrc32.c b/jdk/src/java.base/share/native/libzip/zlib-1.2.8/zcrc32.c
similarity index 100%
rename from jdk/src/share/native/java/util/zip/zlib-1.2.8/zcrc32.c
rename to jdk/src/java.base/share/native/libzip/zlib-1.2.8/zcrc32.c
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.8/zlib.h b/jdk/src/java.base/share/native/libzip/zlib-1.2.8/zlib.h
similarity index 100%
rename from jdk/src/share/native/java/util/zip/zlib-1.2.8/zlib.h
rename to jdk/src/java.base/share/native/libzip/zlib-1.2.8/zlib.h
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.8/zutil.c b/jdk/src/java.base/share/native/libzip/zlib-1.2.8/zutil.c
similarity index 100%
rename from jdk/src/share/native/java/util/zip/zlib-1.2.8/zutil.c
rename to jdk/src/java.base/share/native/libzip/zlib-1.2.8/zutil.c
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.8/zutil.h b/jdk/src/java.base/share/native/libzip/zlib-1.2.8/zutil.h
similarity index 100%
rename from jdk/src/share/native/java/util/zip/zlib-1.2.8/zutil.h
rename to jdk/src/java.base/share/native/libzip/zlib-1.2.8/zutil.h
diff --git a/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java b/jdk/src/java.base/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java
rename to jdk/src/java.base/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java
diff --git a/jdk/src/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java b/jdk/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java
rename to jdk/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java
diff --git a/jdk/src/solaris/classes/sun/nio/ch/DevPollSelectorProvider.java b/jdk/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorProvider.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/ch/DevPollSelectorProvider.java
rename to jdk/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorProvider.java
diff --git a/jdk/src/solaris/classes/sun/nio/ch/EventPortSelectorImpl.java b/jdk/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorImpl.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/ch/EventPortSelectorImpl.java
rename to jdk/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorImpl.java
diff --git a/jdk/src/solaris/classes/sun/nio/ch/EventPortSelectorProvider.java b/jdk/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorProvider.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/ch/EventPortSelectorProvider.java
rename to jdk/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorProvider.java
diff --git a/jdk/src/solaris/classes/sun/nio/ch/EventPortWrapper.java b/jdk/src/java.base/solaris/classes/sun/nio/ch/EventPortWrapper.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/ch/EventPortWrapper.java
rename to jdk/src/java.base/solaris/classes/sun/nio/ch/EventPortWrapper.java
diff --git a/jdk/src/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java b/jdk/src/java.base/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java
rename to jdk/src/java.base/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java
diff --git a/jdk/src/solaris/classes/sun/nio/ch/SolarisEventPort.java b/jdk/src/java.base/solaris/classes/sun/nio/ch/SolarisEventPort.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/ch/SolarisEventPort.java
rename to jdk/src/java.base/solaris/classes/sun/nio/ch/SolarisEventPort.java
diff --git a/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java b/jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java
rename to jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java
diff --git a/jdk/src/solaris/classes/sun/nio/fs/SolarisFileStore.java b/jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisFileStore.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/fs/SolarisFileStore.java
rename to jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisFileStore.java
diff --git a/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java b/jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisFileSystem.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java
rename to jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisFileSystem.java
diff --git a/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java b/jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java
rename to jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java
diff --git a/jdk/src/solaris/classes/sun/nio/fs/SolarisNativeDispatcher.java b/jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisNativeDispatcher.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/fs/SolarisNativeDispatcher.java
rename to jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisNativeDispatcher.java
diff --git a/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java b/jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java
rename to jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java
diff --git a/jdk/src/solaris/classes/sun/nio/fs/SolarisWatchService.java b/jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisWatchService.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/fs/SolarisWatchService.java
rename to jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisWatchService.java
diff --git a/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c b/jdk/src/java.base/solaris/native/libnio/ch/DevPollArrayWrapper.c
similarity index 100%
rename from jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c
rename to jdk/src/java.base/solaris/native/libnio/ch/DevPollArrayWrapper.c
diff --git a/jdk/src/solaris/native/sun/nio/ch/SolarisEventPort.c b/jdk/src/java.base/solaris/native/libnio/ch/SolarisEventPort.c
similarity index 100%
rename from jdk/src/solaris/native/sun/nio/ch/SolarisEventPort.c
rename to jdk/src/java.base/solaris/native/libnio/ch/SolarisEventPort.c
diff --git a/jdk/src/solaris/native/sun/nio/fs/SolarisNativeDispatcher.c b/jdk/src/java.base/solaris/native/libnio/fs/SolarisNativeDispatcher.c
similarity index 100%
rename from jdk/src/solaris/native/sun/nio/fs/SolarisNativeDispatcher.c
rename to jdk/src/java.base/solaris/native/libnio/fs/SolarisNativeDispatcher.c
diff --git a/jdk/src/solaris/native/sun/nio/fs/SolarisWatchService.c b/jdk/src/java.base/solaris/native/libnio/fs/SolarisWatchService.c
similarity index 100%
rename from jdk/src/solaris/native/sun/nio/fs/SolarisWatchService.c
rename to jdk/src/java.base/solaris/native/libnio/fs/SolarisWatchService.c
diff --git a/jdk/src/solaris/classes/java/io/DefaultFileSystem.java b/jdk/src/java.base/unix/classes/java/io/DefaultFileSystem.java
similarity index 100%
rename from jdk/src/solaris/classes/java/io/DefaultFileSystem.java
rename to jdk/src/java.base/unix/classes/java/io/DefaultFileSystem.java
diff --git a/jdk/src/solaris/classes/java/io/FileDescriptor.java b/jdk/src/java.base/unix/classes/java/io/FileDescriptor.java
similarity index 100%
rename from jdk/src/solaris/classes/java/io/FileDescriptor.java
rename to jdk/src/java.base/unix/classes/java/io/FileDescriptor.java
diff --git a/jdk/src/solaris/classes/java/io/UnixFileSystem.java b/jdk/src/java.base/unix/classes/java/io/UnixFileSystem.java
similarity index 100%
rename from jdk/src/solaris/classes/java/io/UnixFileSystem.java
rename to jdk/src/java.base/unix/classes/java/io/UnixFileSystem.java
diff --git a/jdk/src/solaris/classes/java/lang/ClassLoaderHelper.java b/jdk/src/java.base/unix/classes/java/lang/ClassLoaderHelper.java
similarity index 100%
rename from jdk/src/solaris/classes/java/lang/ClassLoaderHelper.java
rename to jdk/src/java.base/unix/classes/java/lang/ClassLoaderHelper.java
diff --git a/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java b/jdk/src/java.base/unix/classes/java/lang/ProcessEnvironment.java
similarity index 100%
rename from jdk/src/solaris/classes/java/lang/ProcessEnvironment.java
rename to jdk/src/java.base/unix/classes/java/lang/ProcessEnvironment.java
diff --git a/jdk/src/solaris/classes/java/lang/ProcessImpl.java b/jdk/src/java.base/unix/classes/java/lang/ProcessImpl.java
similarity index 100%
rename from jdk/src/solaris/classes/java/lang/ProcessImpl.java
rename to jdk/src/java.base/unix/classes/java/lang/ProcessImpl.java
diff --git a/jdk/src/solaris/classes/java/lang/Terminator.java b/jdk/src/java.base/unix/classes/java/lang/Terminator.java
similarity index 100%
rename from jdk/src/solaris/classes/java/lang/Terminator.java
rename to jdk/src/java.base/unix/classes/java/lang/Terminator.java
diff --git a/jdk/src/solaris/classes/java/lang/UNIXProcess.java b/jdk/src/java.base/unix/classes/java/lang/UNIXProcess.java
similarity index 100%
rename from jdk/src/solaris/classes/java/lang/UNIXProcess.java
rename to jdk/src/java.base/unix/classes/java/lang/UNIXProcess.java
diff --git a/jdk/src/solaris/classes/java/net/DefaultDatagramSocketImplFactory.java b/jdk/src/java.base/unix/classes/java/net/DefaultDatagramSocketImplFactory.java
similarity index 100%
rename from jdk/src/solaris/classes/java/net/DefaultDatagramSocketImplFactory.java
rename to jdk/src/java.base/unix/classes/java/net/DefaultDatagramSocketImplFactory.java
diff --git a/jdk/src/solaris/classes/java/net/DefaultInterface.java b/jdk/src/java.base/unix/classes/java/net/DefaultInterface.java
similarity index 100%
rename from jdk/src/solaris/classes/java/net/DefaultInterface.java
rename to jdk/src/java.base/unix/classes/java/net/DefaultInterface.java
diff --git a/jdk/src/solaris/classes/java/net/PlainDatagramSocketImpl.java b/jdk/src/java.base/unix/classes/java/net/PlainDatagramSocketImpl.java
similarity index 100%
rename from jdk/src/solaris/classes/java/net/PlainDatagramSocketImpl.java
rename to jdk/src/java.base/unix/classes/java/net/PlainDatagramSocketImpl.java
diff --git a/jdk/src/solaris/classes/java/net/PlainSocketImpl.java b/jdk/src/java.base/unix/classes/java/net/PlainSocketImpl.java
similarity index 100%
rename from jdk/src/solaris/classes/java/net/PlainSocketImpl.java
rename to jdk/src/java.base/unix/classes/java/net/PlainSocketImpl.java
diff --git a/jdk/src/solaris/classes/sun/misc/FileURLMapper.java b/jdk/src/java.base/unix/classes/sun/misc/FileURLMapper.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/misc/FileURLMapper.java
rename to jdk/src/java.base/unix/classes/sun/misc/FileURLMapper.java
diff --git a/jdk/src/solaris/classes/sun/misc/GThreadHelper.java b/jdk/src/java.base/unix/classes/sun/misc/GThreadHelper.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/misc/GThreadHelper.java
rename to jdk/src/java.base/unix/classes/sun/misc/GThreadHelper.java
diff --git a/jdk/src/solaris/classes/sun/misc/OSEnvironment.java b/jdk/src/java.base/unix/classes/sun/misc/OSEnvironment.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/misc/OSEnvironment.java
rename to jdk/src/java.base/unix/classes/sun/misc/OSEnvironment.java
diff --git a/jdk/src/solaris/classes/sun/net/NetHooks.java b/jdk/src/java.base/unix/classes/sun/net/NetHooks.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/net/NetHooks.java
rename to jdk/src/java.base/unix/classes/sun/net/NetHooks.java
diff --git a/jdk/src/solaris/classes/sun/net/PortConfig.java b/jdk/src/java.base/unix/classes/sun/net/PortConfig.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/net/PortConfig.java
rename to jdk/src/java.base/unix/classes/sun/net/PortConfig.java
diff --git a/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java b/jdk/src/java.base/unix/classes/sun/net/dns/ResolverConfigurationImpl.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java
rename to jdk/src/java.base/unix/classes/sun/net/dns/ResolverConfigurationImpl.java
diff --git a/jdk/src/solaris/classes/sun/net/sdp/SdpProvider.java b/jdk/src/java.base/unix/classes/sun/net/sdp/SdpProvider.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/net/sdp/SdpProvider.java
rename to jdk/src/java.base/unix/classes/sun/net/sdp/SdpProvider.java
diff --git a/jdk/src/solaris/classes/sun/net/www/content-types.properties b/jdk/src/java.base/unix/classes/sun/net/www/content-types.properties
similarity index 100%
rename from jdk/src/solaris/classes/sun/net/www/content-types.properties
rename to jdk/src/java.base/unix/classes/sun/net/www/content-types.properties
diff --git a/jdk/src/solaris/classes/sun/net/www/protocol/file/Handler.java b/jdk/src/java.base/unix/classes/sun/net/www/protocol/file/Handler.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/net/www/protocol/file/Handler.java
rename to jdk/src/java.base/unix/classes/sun/net/www/protocol/file/Handler.java
diff --git a/jdk/src/solaris/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java b/jdk/src/java.base/unix/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java
rename to jdk/src/java.base/unix/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java
diff --git a/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java b/jdk/src/java.base/unix/classes/sun/net/www/protocol/jar/JarFileFactory.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java
rename to jdk/src/java.base/unix/classes/sun/net/www/protocol/jar/JarFileFactory.java
diff --git a/jdk/src/solaris/classes/sun/nio/ch/DatagramDispatcher.java b/jdk/src/java.base/unix/classes/sun/nio/ch/DatagramDispatcher.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/ch/DatagramDispatcher.java
rename to jdk/src/java.base/unix/classes/sun/nio/ch/DatagramDispatcher.java
diff --git a/jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java b/jdk/src/java.base/unix/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java
rename to jdk/src/java.base/unix/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java
diff --git a/jdk/src/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java b/jdk/src/java.base/unix/classes/sun/nio/ch/DefaultSelectorProvider.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java
rename to jdk/src/java.base/unix/classes/sun/nio/ch/DefaultSelectorProvider.java
diff --git a/jdk/src/solaris/classes/sun/nio/ch/FileDispatcherImpl.java b/jdk/src/java.base/unix/classes/sun/nio/ch/FileDispatcherImpl.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/ch/FileDispatcherImpl.java
rename to jdk/src/java.base/unix/classes/sun/nio/ch/FileDispatcherImpl.java
diff --git a/jdk/src/solaris/classes/sun/nio/ch/FileKey.java b/jdk/src/java.base/unix/classes/sun/nio/ch/FileKey.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/ch/FileKey.java
rename to jdk/src/java.base/unix/classes/sun/nio/ch/FileKey.java
diff --git a/jdk/src/solaris/classes/sun/nio/ch/InheritedChannel.java b/jdk/src/java.base/unix/classes/sun/nio/ch/InheritedChannel.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/ch/InheritedChannel.java
rename to jdk/src/java.base/unix/classes/sun/nio/ch/InheritedChannel.java
diff --git a/jdk/src/solaris/classes/sun/nio/ch/NativeThread.java b/jdk/src/java.base/unix/classes/sun/nio/ch/NativeThread.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/ch/NativeThread.java
rename to jdk/src/java.base/unix/classes/sun/nio/ch/NativeThread.java
diff --git a/jdk/src/solaris/classes/sun/nio/ch/PipeImpl.java b/jdk/src/java.base/unix/classes/sun/nio/ch/PipeImpl.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/ch/PipeImpl.java
rename to jdk/src/java.base/unix/classes/sun/nio/ch/PipeImpl.java
diff --git a/jdk/src/solaris/classes/sun/nio/ch/PollArrayWrapper.java b/jdk/src/java.base/unix/classes/sun/nio/ch/PollArrayWrapper.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/ch/PollArrayWrapper.java
rename to jdk/src/java.base/unix/classes/sun/nio/ch/PollArrayWrapper.java
diff --git a/jdk/src/solaris/classes/sun/nio/ch/PollSelectorImpl.java b/jdk/src/java.base/unix/classes/sun/nio/ch/PollSelectorImpl.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/ch/PollSelectorImpl.java
rename to jdk/src/java.base/unix/classes/sun/nio/ch/PollSelectorImpl.java
diff --git a/jdk/src/solaris/classes/sun/nio/ch/Port.java b/jdk/src/java.base/unix/classes/sun/nio/ch/Port.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/ch/Port.java
rename to jdk/src/java.base/unix/classes/sun/nio/ch/Port.java
diff --git a/jdk/src/solaris/classes/sun/nio/ch/SinkChannelImpl.java b/jdk/src/java.base/unix/classes/sun/nio/ch/SinkChannelImpl.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/ch/SinkChannelImpl.java
rename to jdk/src/java.base/unix/classes/sun/nio/ch/SinkChannelImpl.java
diff --git a/jdk/src/solaris/classes/sun/nio/ch/SocketDispatcher.java b/jdk/src/java.base/unix/classes/sun/nio/ch/SocketDispatcher.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/ch/SocketDispatcher.java
rename to jdk/src/java.base/unix/classes/sun/nio/ch/SocketDispatcher.java
diff --git a/jdk/src/solaris/classes/sun/nio/ch/SourceChannelImpl.java b/jdk/src/java.base/unix/classes/sun/nio/ch/SourceChannelImpl.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/ch/SourceChannelImpl.java
rename to jdk/src/java.base/unix/classes/sun/nio/ch/SourceChannelImpl.java
diff --git a/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java b/jdk/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java
rename to jdk/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java
diff --git a/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java b/jdk/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java
rename to jdk/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java
diff --git a/jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java b/jdk/src/java.base/unix/classes/sun/nio/fs/DefaultFileSystemProvider.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java
rename to jdk/src/java.base/unix/classes/sun/nio/fs/DefaultFileSystemProvider.java
diff --git a/jdk/src/solaris/classes/sun/nio/fs/DefaultFileTypeDetector.java b/jdk/src/java.base/unix/classes/sun/nio/fs/DefaultFileTypeDetector.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/fs/DefaultFileTypeDetector.java
rename to jdk/src/java.base/unix/classes/sun/nio/fs/DefaultFileTypeDetector.java
diff --git a/jdk/src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java b/jdk/src/java.base/unix/classes/sun/nio/fs/GnomeFileTypeDetector.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java
rename to jdk/src/java.base/unix/classes/sun/nio/fs/GnomeFileTypeDetector.java
diff --git a/jdk/src/solaris/classes/sun/nio/fs/MimeTypesFileTypeDetector.java b/jdk/src/java.base/unix/classes/sun/nio/fs/MimeTypesFileTypeDetector.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/fs/MimeTypesFileTypeDetector.java
rename to jdk/src/java.base/unix/classes/sun/nio/fs/MimeTypesFileTypeDetector.java
diff --git a/jdk/src/solaris/classes/sun/nio/fs/UnixChannelFactory.java b/jdk/src/java.base/unix/classes/sun/nio/fs/UnixChannelFactory.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/fs/UnixChannelFactory.java
rename to jdk/src/java.base/unix/classes/sun/nio/fs/UnixChannelFactory.java
diff --git a/jdk/src/solaris/classes/sun/nio/fs/UnixCopyFile.java b/jdk/src/java.base/unix/classes/sun/nio/fs/UnixCopyFile.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/fs/UnixCopyFile.java
rename to jdk/src/java.base/unix/classes/sun/nio/fs/UnixCopyFile.java
diff --git a/jdk/src/solaris/classes/sun/nio/fs/UnixDirectoryStream.java b/jdk/src/java.base/unix/classes/sun/nio/fs/UnixDirectoryStream.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/fs/UnixDirectoryStream.java
rename to jdk/src/java.base/unix/classes/sun/nio/fs/UnixDirectoryStream.java
diff --git a/jdk/src/solaris/classes/sun/nio/fs/UnixException.java b/jdk/src/java.base/unix/classes/sun/nio/fs/UnixException.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/fs/UnixException.java
rename to jdk/src/java.base/unix/classes/sun/nio/fs/UnixException.java
diff --git a/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributeViews.java b/jdk/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributeViews.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributeViews.java
rename to jdk/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributeViews.java
diff --git a/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java b/jdk/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributes.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java
rename to jdk/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributes.java
diff --git a/jdk/src/solaris/classes/sun/nio/fs/UnixFileKey.java b/jdk/src/java.base/unix/classes/sun/nio/fs/UnixFileKey.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/fs/UnixFileKey.java
rename to jdk/src/java.base/unix/classes/sun/nio/fs/UnixFileKey.java
diff --git a/jdk/src/solaris/classes/sun/nio/fs/UnixFileModeAttribute.java b/jdk/src/java.base/unix/classes/sun/nio/fs/UnixFileModeAttribute.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/fs/UnixFileModeAttribute.java
rename to jdk/src/java.base/unix/classes/sun/nio/fs/UnixFileModeAttribute.java
diff --git a/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java b/jdk/src/java.base/unix/classes/sun/nio/fs/UnixFileStore.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java
rename to jdk/src/java.base/unix/classes/sun/nio/fs/UnixFileStore.java
diff --git a/jdk/src/solaris/classes/sun/nio/fs/UnixFileStoreAttributes.java b/jdk/src/java.base/unix/classes/sun/nio/fs/UnixFileStoreAttributes.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/fs/UnixFileStoreAttributes.java
rename to jdk/src/java.base/unix/classes/sun/nio/fs/UnixFileStoreAttributes.java
diff --git a/jdk/src/solaris/classes/sun/nio/fs/UnixFileSystem.java b/jdk/src/java.base/unix/classes/sun/nio/fs/UnixFileSystem.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/fs/UnixFileSystem.java
rename to jdk/src/java.base/unix/classes/sun/nio/fs/UnixFileSystem.java
diff --git a/jdk/src/solaris/classes/sun/nio/fs/UnixFileSystemProvider.java b/jdk/src/java.base/unix/classes/sun/nio/fs/UnixFileSystemProvider.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/fs/UnixFileSystemProvider.java
rename to jdk/src/java.base/unix/classes/sun/nio/fs/UnixFileSystemProvider.java
diff --git a/jdk/src/solaris/classes/sun/nio/fs/UnixMountEntry.java b/jdk/src/java.base/unix/classes/sun/nio/fs/UnixMountEntry.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/fs/UnixMountEntry.java
rename to jdk/src/java.base/unix/classes/sun/nio/fs/UnixMountEntry.java
diff --git a/jdk/src/solaris/classes/sun/nio/fs/UnixNativeDispatcher.java b/jdk/src/java.base/unix/classes/sun/nio/fs/UnixNativeDispatcher.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/fs/UnixNativeDispatcher.java
rename to jdk/src/java.base/unix/classes/sun/nio/fs/UnixNativeDispatcher.java
diff --git a/jdk/src/solaris/classes/sun/nio/fs/UnixPath.java b/jdk/src/java.base/unix/classes/sun/nio/fs/UnixPath.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/fs/UnixPath.java
rename to jdk/src/java.base/unix/classes/sun/nio/fs/UnixPath.java
diff --git a/jdk/src/solaris/classes/sun/nio/fs/UnixSecureDirectoryStream.java b/jdk/src/java.base/unix/classes/sun/nio/fs/UnixSecureDirectoryStream.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/fs/UnixSecureDirectoryStream.java
rename to jdk/src/java.base/unix/classes/sun/nio/fs/UnixSecureDirectoryStream.java
diff --git a/jdk/src/solaris/classes/sun/nio/fs/UnixUriUtils.java b/jdk/src/java.base/unix/classes/sun/nio/fs/UnixUriUtils.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/fs/UnixUriUtils.java
rename to jdk/src/java.base/unix/classes/sun/nio/fs/UnixUriUtils.java
diff --git a/jdk/src/solaris/classes/sun/nio/fs/UnixUserPrincipals.java b/jdk/src/java.base/unix/classes/sun/nio/fs/UnixUserPrincipals.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/fs/UnixUserPrincipals.java
rename to jdk/src/java.base/unix/classes/sun/nio/fs/UnixUserPrincipals.java
diff --git a/jdk/src/solaris/classes/sun/security/provider/NativePRNG.java b/jdk/src/java.base/unix/classes/sun/security/provider/NativePRNG.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/security/provider/NativePRNG.java
rename to jdk/src/java.base/unix/classes/sun/security/provider/NativePRNG.java
diff --git a/jdk/src/solaris/classes/sun/security/provider/NativeSeedGenerator.java b/jdk/src/java.base/unix/classes/sun/security/provider/NativeSeedGenerator.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/security/provider/NativeSeedGenerator.java
rename to jdk/src/java.base/unix/classes/sun/security/provider/NativeSeedGenerator.java
diff --git a/jdk/src/solaris/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java b/jdk/src/java.base/unix/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java
rename to jdk/src/java.base/unix/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java
diff --git a/jdk/src/solaris/bin/amd64/jvm.cfg b/jdk/src/java.base/unix/conf/amd64/jvm.cfg
similarity index 100%
rename from jdk/src/solaris/bin/amd64/jvm.cfg
rename to jdk/src/java.base/unix/conf/amd64/jvm.cfg
diff --git a/jdk/src/solaris/bin/arm/jvm.cfg b/jdk/src/java.base/unix/conf/arm/jvm.cfg
similarity index 100%
rename from jdk/src/solaris/bin/arm/jvm.cfg
rename to jdk/src/java.base/unix/conf/arm/jvm.cfg
diff --git a/jdk/src/solaris/bin/i586/jvm.cfg b/jdk/src/java.base/unix/conf/i586/jvm.cfg
similarity index 100%
rename from jdk/src/solaris/bin/i586/jvm.cfg
rename to jdk/src/java.base/unix/conf/i586/jvm.cfg
diff --git a/jdk/src/solaris/bin/ia64/jvm.cfg b/jdk/src/java.base/unix/conf/ia64/jvm.cfg
similarity index 100%
rename from jdk/src/solaris/bin/ia64/jvm.cfg
rename to jdk/src/java.base/unix/conf/ia64/jvm.cfg
diff --git a/jdk/src/solaris/bin/ppc/jvm.cfg b/jdk/src/java.base/unix/conf/ppc/jvm.cfg
similarity index 100%
rename from jdk/src/solaris/bin/ppc/jvm.cfg
rename to jdk/src/java.base/unix/conf/ppc/jvm.cfg
diff --git a/jdk/src/solaris/bin/ppc64/jvm.cfg b/jdk/src/java.base/unix/conf/ppc64/jvm.cfg
similarity index 100%
rename from jdk/src/solaris/bin/ppc64/jvm.cfg
rename to jdk/src/java.base/unix/conf/ppc64/jvm.cfg
diff --git a/jdk/src/solaris/lib/sdp/sdp.conf.template b/jdk/src/java.base/unix/conf/sdp/sdp.conf.template
similarity index 100%
rename from jdk/src/solaris/lib/sdp/sdp.conf.template
rename to jdk/src/java.base/unix/conf/sdp/sdp.conf.template
diff --git a/jdk/src/solaris/bin/sparc/jvm.cfg b/jdk/src/java.base/unix/conf/sparc/jvm.cfg
similarity index 100%
rename from jdk/src/solaris/bin/sparc/jvm.cfg
rename to jdk/src/java.base/unix/conf/sparc/jvm.cfg
diff --git a/jdk/src/solaris/bin/sparcv9/jvm.cfg b/jdk/src/java.base/unix/conf/sparcv9/jvm.cfg
similarity index 100%
rename from jdk/src/solaris/bin/sparcv9/jvm.cfg
rename to jdk/src/java.base/unix/conf/sparcv9/jvm.cfg
diff --git a/jdk/src/solaris/bin/zero/jvm.cfg b/jdk/src/java.base/unix/conf/zero/jvm.cfg
similarity index 100%
rename from jdk/src/solaris/bin/zero/jvm.cfg
rename to jdk/src/java.base/unix/conf/zero/jvm.cfg
diff --git a/jdk/src/solaris/javavm/export/jni_md.h b/jdk/src/java.base/unix/native/include/jni_md.h
similarity index 100%
rename from jdk/src/solaris/javavm/export/jni_md.h
rename to jdk/src/java.base/unix/native/include/jni_md.h
diff --git a/jdk/src/solaris/javavm/export/jvm_md.h b/jdk/src/java.base/unix/native/include/jvm_md.h
similarity index 100%
rename from jdk/src/solaris/javavm/export/jvm_md.h
rename to jdk/src/java.base/unix/native/include/jvm_md.h
diff --git a/jdk/src/solaris/native/java/lang/jspawnhelper.c b/jdk/src/java.base/unix/native/jspawnhelper/jspawnhelper.c
similarity index 100%
rename from jdk/src/solaris/native/java/lang/jspawnhelper.c
rename to jdk/src/java.base/unix/native/jspawnhelper/jspawnhelper.c
diff --git a/jdk/src/solaris/bin/jexec.c b/jdk/src/java.base/unix/native/launcher/jexec.c
similarity index 100%
rename from jdk/src/solaris/bin/jexec.c
rename to jdk/src/java.base/unix/native/launcher/jexec.c
diff --git a/jdk/src/solaris/native/java/io/Console_md.c b/jdk/src/java.base/unix/native/libjava/Console_md.c
similarity index 100%
rename from jdk/src/solaris/native/java/io/Console_md.c
rename to jdk/src/java.base/unix/native/libjava/Console_md.c
diff --git a/jdk/src/solaris/native/java/io/FileDescriptor_md.c b/jdk/src/java.base/unix/native/libjava/FileDescriptor_md.c
similarity index 100%
rename from jdk/src/solaris/native/java/io/FileDescriptor_md.c
rename to jdk/src/java.base/unix/native/libjava/FileDescriptor_md.c
diff --git a/jdk/src/solaris/native/java/io/FileInputStream_md.c b/jdk/src/java.base/unix/native/libjava/FileInputStream_md.c
similarity index 100%
rename from jdk/src/solaris/native/java/io/FileInputStream_md.c
rename to jdk/src/java.base/unix/native/libjava/FileInputStream_md.c
diff --git a/jdk/src/solaris/native/java/io/FileOutputStream_md.c b/jdk/src/java.base/unix/native/libjava/FileOutputStream_md.c
similarity index 100%
rename from jdk/src/solaris/native/java/io/FileOutputStream_md.c
rename to jdk/src/java.base/unix/native/libjava/FileOutputStream_md.c
diff --git a/jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c b/jdk/src/java.base/unix/native/libjava/ProcessEnvironment_md.c
similarity index 100%
rename from jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c
rename to jdk/src/java.base/unix/native/libjava/ProcessEnvironment_md.c
diff --git a/jdk/src/solaris/native/java/io/RandomAccessFile_md.c b/jdk/src/java.base/unix/native/libjava/RandomAccessFile_md.c
similarity index 100%
rename from jdk/src/solaris/native/java/io/RandomAccessFile_md.c
rename to jdk/src/java.base/unix/native/libjava/RandomAccessFile_md.c
diff --git a/jdk/src/solaris/native/java/util/TimeZone_md.c b/jdk/src/java.base/unix/native/libjava/TimeZone_md.c
similarity index 100%
rename from jdk/src/solaris/native/java/util/TimeZone_md.c
rename to jdk/src/java.base/unix/native/libjava/TimeZone_md.c
diff --git a/jdk/src/solaris/native/java/util/TimeZone_md.h b/jdk/src/java.base/unix/native/libjava/TimeZone_md.h
similarity index 100%
rename from jdk/src/solaris/native/java/util/TimeZone_md.h
rename to jdk/src/java.base/unix/native/libjava/TimeZone_md.h
diff --git a/jdk/src/solaris/native/java/lang/UNIXProcess_md.c b/jdk/src/java.base/unix/native/libjava/UNIXProcess_md.c
similarity index 98%
rename from jdk/src/solaris/native/java/lang/UNIXProcess_md.c
rename to jdk/src/java.base/unix/native/libjava/UNIXProcess_md.c
index da5be2257d0..18dee4ddd41 100644
--- a/jdk/src/solaris/native/java/lang/UNIXProcess_md.c
+++ b/jdk/src/java.base/unix/native/libjava/UNIXProcess_md.c
@@ -599,9 +599,9 @@ Java_java_lang_UNIXProcess_forkAndExec(JNIEnv *env,
      */
     assert(prog != NULL && argBlock != NULL);
     if ((phelperpath = getBytes(env, helperpath))   == NULL) goto Catch;
-    if ((pprog     = getBytes(env, prog))       == NULL) goto Catch;
-    if ((pargBlock = getBytes(env, argBlock))   == NULL) goto Catch;
-    if ((c->argv = NEW(const char *, argc + 3)) == NULL) goto Catch;
+    if ((pprog       = getBytes(env, prog))         == NULL) goto Catch;
+    if ((pargBlock   = getBytes(env, argBlock))     == NULL) goto Catch;
+    if ((c->argv     = NEW(const char *, argc + 3)) == NULL) goto Catch;
     c->argv[0] = pprog;
     c->argc = argc + 2;
     initVectorFromBlock(c->argv+1, pargBlock, argc);
@@ -690,10 +690,11 @@ Java_java_lang_UNIXProcess_forkAndExec(JNIEnv *env,
     closeSafely(childenv[0]);
     closeSafely(childenv[1]);
 
-    releaseBytes(env, prog,     pprog);
-    releaseBytes(env, argBlock, pargBlock);
-    releaseBytes(env, envBlock, penvBlock);
-    releaseBytes(env, dir,      c->pdir);
+    releaseBytes(env, helperpath, phelperpath);
+    releaseBytes(env, prog,       pprog);
+    releaseBytes(env, argBlock,   pargBlock);
+    releaseBytes(env, envBlock,   penvBlock);
+    releaseBytes(env, dir,        c->pdir);
 
     free(c->argv);
     free(c->envv);
diff --git a/jdk/src/solaris/native/java/io/UnixFileSystem_md.c b/jdk/src/java.base/unix/native/libjava/UnixFileSystem_md.c
similarity index 100%
rename from jdk/src/solaris/native/java/io/UnixFileSystem_md.c
rename to jdk/src/java.base/unix/native/libjava/UnixFileSystem_md.c
diff --git a/jdk/src/solaris/native/sun/misc/VM_md.c b/jdk/src/java.base/unix/native/libjava/VM_md.c
similarity index 100%
rename from jdk/src/solaris/native/sun/misc/VM_md.c
rename to jdk/src/java.base/unix/native/libjava/VM_md.c
diff --git a/jdk/src/solaris/native/java/io/canonicalize_md.c b/jdk/src/java.base/unix/native/libjava/canonicalize_md.c
similarity index 100%
rename from jdk/src/solaris/native/java/io/canonicalize_md.c
rename to jdk/src/java.base/unix/native/libjava/canonicalize_md.c
diff --git a/jdk/src/solaris/native/java/lang/childproc.c b/jdk/src/java.base/unix/native/libjava/childproc.c
similarity index 100%
rename from jdk/src/solaris/native/java/lang/childproc.c
rename to jdk/src/java.base/unix/native/libjava/childproc.c
diff --git a/jdk/src/solaris/native/java/lang/childproc.h b/jdk/src/java.base/unix/native/libjava/childproc.h
similarity index 100%
rename from jdk/src/solaris/native/java/lang/childproc.h
rename to jdk/src/java.base/unix/native/libjava/childproc.h
diff --git a/jdk/src/solaris/native/common/gdefs_md.h b/jdk/src/java.base/unix/native/libjava/gdefs_md.h
similarity index 100%
rename from jdk/src/solaris/native/common/gdefs_md.h
rename to jdk/src/java.base/unix/native/libjava/gdefs_md.h
diff --git a/jdk/src/solaris/native/java/io/io_util_md.c b/jdk/src/java.base/unix/native/libjava/io_util_md.c
similarity index 100%
rename from jdk/src/solaris/native/java/io/io_util_md.c
rename to jdk/src/java.base/unix/native/libjava/io_util_md.c
diff --git a/jdk/src/solaris/native/java/io/io_util_md.h b/jdk/src/java.base/unix/native/libjava/io_util_md.h
similarity index 100%
rename from jdk/src/solaris/native/java/io/io_util_md.h
rename to jdk/src/java.base/unix/native/libjava/io_util_md.h
diff --git a/jdk/src/solaris/native/java/lang/java_props_macosx.c b/jdk/src/java.base/unix/native/libjava/java_props_macosx.c
similarity index 100%
rename from jdk/src/solaris/native/java/lang/java_props_macosx.c
rename to jdk/src/java.base/unix/native/libjava/java_props_macosx.c
diff --git a/jdk/src/solaris/native/java/lang/java_props_macosx.h b/jdk/src/java.base/unix/native/libjava/java_props_macosx.h
similarity index 100%
rename from jdk/src/solaris/native/java/lang/java_props_macosx.h
rename to jdk/src/java.base/unix/native/libjava/java_props_macosx.h
diff --git a/jdk/src/solaris/native/java/lang/java_props_md.c b/jdk/src/java.base/unix/native/libjava/java_props_md.c
similarity index 100%
rename from jdk/src/solaris/native/java/lang/java_props_md.c
rename to jdk/src/java.base/unix/native/libjava/java_props_md.c
diff --git a/jdk/src/solaris/native/common/jdk_util_md.c b/jdk/src/java.base/unix/native/libjava/jdk_util_md.c
similarity index 100%
rename from jdk/src/solaris/native/common/jdk_util_md.c
rename to jdk/src/java.base/unix/native/libjava/jdk_util_md.c
diff --git a/jdk/src/solaris/native/common/jdk_util_md.h b/jdk/src/java.base/unix/native/libjava/jdk_util_md.h
similarity index 100%
rename from jdk/src/solaris/native/common/jdk_util_md.h
rename to jdk/src/java.base/unix/native/libjava/jdk_util_md.h
diff --git a/jdk/src/solaris/native/common/jlong_md.h b/jdk/src/java.base/unix/native/libjava/jlong_md.h
similarity index 100%
rename from jdk/src/solaris/native/common/jlong_md.h
rename to jdk/src/java.base/unix/native/libjava/jlong_md.h
diff --git a/jdk/src/solaris/native/common/jni_util_md.c b/jdk/src/java.base/unix/native/libjava/jni_util_md.c
similarity index 100%
rename from jdk/src/solaris/native/common/jni_util_md.c
rename to jdk/src/java.base/unix/native/libjava/jni_util_md.c
diff --git a/jdk/src/solaris/native/java/lang/locale_str.h b/jdk/src/java.base/unix/native/libjava/locale_str.h
similarity index 100%
rename from jdk/src/solaris/native/java/lang/locale_str.h
rename to jdk/src/java.base/unix/native/libjava/locale_str.h
diff --git a/jdk/src/solaris/bin/ergo.c b/jdk/src/java.base/unix/native/libjli/ergo.c
similarity index 100%
rename from jdk/src/solaris/bin/ergo.c
rename to jdk/src/java.base/unix/native/libjli/ergo.c
diff --git a/jdk/src/solaris/bin/ergo.h b/jdk/src/java.base/unix/native/libjli/ergo.h
similarity index 100%
rename from jdk/src/solaris/bin/ergo.h
rename to jdk/src/java.base/unix/native/libjli/ergo.h
diff --git a/jdk/src/solaris/bin/ergo_i586.c b/jdk/src/java.base/unix/native/libjli/ergo_i586.c
similarity index 100%
rename from jdk/src/solaris/bin/ergo_i586.c
rename to jdk/src/java.base/unix/native/libjli/ergo_i586.c
diff --git a/jdk/src/solaris/bin/java_md.h b/jdk/src/java.base/unix/native/libjli/java_md.h
similarity index 100%
rename from jdk/src/solaris/bin/java_md.h
rename to jdk/src/java.base/unix/native/libjli/java_md.h
diff --git a/jdk/src/solaris/bin/java_md_common.c b/jdk/src/java.base/unix/native/libjli/java_md_common.c
similarity index 100%
rename from jdk/src/solaris/bin/java_md_common.c
rename to jdk/src/java.base/unix/native/libjli/java_md_common.c
diff --git a/jdk/src/solaris/bin/java_md_solinux.c b/jdk/src/java.base/unix/native/libjli/java_md_solinux.c
similarity index 100%
rename from jdk/src/solaris/bin/java_md_solinux.c
rename to jdk/src/java.base/unix/native/libjli/java_md_solinux.c
diff --git a/jdk/src/solaris/bin/java_md_solinux.h b/jdk/src/java.base/unix/native/libjli/java_md_solinux.h
similarity index 100%
rename from jdk/src/solaris/bin/java_md_solinux.h
rename to jdk/src/java.base/unix/native/libjli/java_md_solinux.h
diff --git a/jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c b/jdk/src/java.base/unix/native/libnet/DefaultProxySelector.c
similarity index 100%
rename from jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c
rename to jdk/src/java.base/unix/native/libnet/DefaultProxySelector.c
diff --git a/jdk/src/solaris/native/java/net/ExtendedOptionsImpl.c b/jdk/src/java.base/unix/native/libnet/ExtendedOptionsImpl.c
similarity index 100%
rename from jdk/src/solaris/native/java/net/ExtendedOptionsImpl.c
rename to jdk/src/java.base/unix/native/libnet/ExtendedOptionsImpl.c
diff --git a/jdk/src/solaris/native/java/net/Inet4AddressImpl.c b/jdk/src/java.base/unix/native/libnet/Inet4AddressImpl.c
similarity index 100%
rename from jdk/src/solaris/native/java/net/Inet4AddressImpl.c
rename to jdk/src/java.base/unix/native/libnet/Inet4AddressImpl.c
diff --git a/jdk/src/solaris/native/java/net/Inet6AddressImpl.c b/jdk/src/java.base/unix/native/libnet/Inet6AddressImpl.c
similarity index 100%
rename from jdk/src/solaris/native/java/net/Inet6AddressImpl.c
rename to jdk/src/java.base/unix/native/libnet/Inet6AddressImpl.c
diff --git a/jdk/src/solaris/native/java/net/InetAddressImplFactory.c b/jdk/src/java.base/unix/native/libnet/InetAddressImplFactory.c
similarity index 100%
rename from jdk/src/solaris/native/java/net/InetAddressImplFactory.c
rename to jdk/src/java.base/unix/native/libnet/InetAddressImplFactory.c
diff --git a/jdk/src/solaris/native/java/net/NetworkInterface.c b/jdk/src/java.base/unix/native/libnet/NetworkInterface.c
similarity index 100%
rename from jdk/src/solaris/native/java/net/NetworkInterface.c
rename to jdk/src/java.base/unix/native/libnet/NetworkInterface.c
diff --git a/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c b/jdk/src/java.base/unix/native/libnet/PlainDatagramSocketImpl.c
similarity index 100%
rename from jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
rename to jdk/src/java.base/unix/native/libnet/PlainDatagramSocketImpl.c
diff --git a/jdk/src/solaris/native/java/net/PlainSocketImpl.c b/jdk/src/java.base/unix/native/libnet/PlainSocketImpl.c
similarity index 100%
rename from jdk/src/solaris/native/java/net/PlainSocketImpl.c
rename to jdk/src/java.base/unix/native/libnet/PlainSocketImpl.c
diff --git a/jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c b/jdk/src/java.base/unix/native/libnet/ResolverConfigurationImpl.c
similarity index 100%
rename from jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c
rename to jdk/src/java.base/unix/native/libnet/ResolverConfigurationImpl.c
diff --git a/jdk/src/solaris/native/sun/net/sdp/SdpSupport.c b/jdk/src/java.base/unix/native/libnet/SdpSupport.c
similarity index 100%
rename from jdk/src/solaris/native/sun/net/sdp/SdpSupport.c
rename to jdk/src/java.base/unix/native/libnet/SdpSupport.c
diff --git a/jdk/src/solaris/native/java/net/SocketInputStream.c b/jdk/src/java.base/unix/native/libnet/SocketInputStream.c
similarity index 100%
rename from jdk/src/solaris/native/java/net/SocketInputStream.c
rename to jdk/src/java.base/unix/native/libnet/SocketInputStream.c
diff --git a/jdk/src/solaris/native/java/net/SocketOutputStream.c b/jdk/src/java.base/unix/native/libnet/SocketOutputStream.c
similarity index 100%
rename from jdk/src/solaris/native/java/net/SocketOutputStream.c
rename to jdk/src/java.base/unix/native/libnet/SocketOutputStream.c
diff --git a/jdk/src/solaris/native/java/net/bsd_close.c b/jdk/src/java.base/unix/native/libnet/bsd_close.c
similarity index 100%
rename from jdk/src/solaris/native/java/net/bsd_close.c
rename to jdk/src/java.base/unix/native/libnet/bsd_close.c
diff --git a/jdk/src/solaris/native/java/net/linux_close.c b/jdk/src/java.base/unix/native/libnet/linux_close.c
similarity index 100%
rename from jdk/src/solaris/native/java/net/linux_close.c
rename to jdk/src/java.base/unix/native/libnet/linux_close.c
diff --git a/jdk/src/solaris/native/java/net/net_util_md.c b/jdk/src/java.base/unix/native/libnet/net_util_md.c
similarity index 100%
rename from jdk/src/solaris/native/java/net/net_util_md.c
rename to jdk/src/java.base/unix/native/libnet/net_util_md.c
diff --git a/jdk/src/solaris/native/java/net/net_util_md.h b/jdk/src/java.base/unix/native/libnet/net_util_md.h
similarity index 100%
rename from jdk/src/solaris/native/java/net/net_util_md.h
rename to jdk/src/java.base/unix/native/libnet/net_util_md.h
diff --git a/jdk/src/solaris/native/sun/net/portconfig.c b/jdk/src/java.base/unix/native/libnet/portconfig.c
similarity index 100%
rename from jdk/src/solaris/native/sun/net/portconfig.c
rename to jdk/src/java.base/unix/native/libnet/portconfig.c
diff --git a/jdk/src/solaris/native/java/net/solaris_close.c b/jdk/src/java.base/unix/native/libnet/solaris_close.c
similarity index 100%
rename from jdk/src/solaris/native/java/net/solaris_close.c
rename to jdk/src/java.base/unix/native/libnet/solaris_close.c
diff --git a/jdk/src/solaris/native/java/nio/MappedByteBuffer.c b/jdk/src/java.base/unix/native/libnio/MappedByteBuffer.c
similarity index 100%
rename from jdk/src/solaris/native/java/nio/MappedByteBuffer.c
rename to jdk/src/java.base/unix/native/libnio/MappedByteBuffer.c
diff --git a/jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c b/jdk/src/java.base/unix/native/libnio/ch/DatagramChannelImpl.c
similarity index 100%
rename from jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c
rename to jdk/src/java.base/unix/native/libnio/ch/DatagramChannelImpl.c
diff --git a/jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c b/jdk/src/java.base/unix/native/libnio/ch/DatagramDispatcher.c
similarity index 100%
rename from jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c
rename to jdk/src/java.base/unix/native/libnio/ch/DatagramDispatcher.c
diff --git a/jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c b/jdk/src/java.base/unix/native/libnio/ch/FileChannelImpl.c
similarity index 100%
rename from jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c
rename to jdk/src/java.base/unix/native/libnio/ch/FileChannelImpl.c
diff --git a/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c b/jdk/src/java.base/unix/native/libnio/ch/FileDispatcherImpl.c
similarity index 100%
rename from jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c
rename to jdk/src/java.base/unix/native/libnio/ch/FileDispatcherImpl.c
diff --git a/jdk/src/solaris/native/sun/nio/ch/FileKey.c b/jdk/src/java.base/unix/native/libnio/ch/FileKey.c
similarity index 100%
rename from jdk/src/solaris/native/sun/nio/ch/FileKey.c
rename to jdk/src/java.base/unix/native/libnio/ch/FileKey.c
diff --git a/jdk/src/solaris/native/sun/nio/ch/IOUtil.c b/jdk/src/java.base/unix/native/libnio/ch/IOUtil.c
similarity index 100%
rename from jdk/src/solaris/native/sun/nio/ch/IOUtil.c
rename to jdk/src/java.base/unix/native/libnio/ch/IOUtil.c
diff --git a/jdk/src/solaris/native/sun/nio/ch/InheritedChannel.c b/jdk/src/java.base/unix/native/libnio/ch/InheritedChannel.c
similarity index 100%
rename from jdk/src/solaris/native/sun/nio/ch/InheritedChannel.c
rename to jdk/src/java.base/unix/native/libnio/ch/InheritedChannel.c
diff --git a/jdk/src/solaris/native/sun/nio/ch/NativeThread.c b/jdk/src/java.base/unix/native/libnio/ch/NativeThread.c
similarity index 100%
rename from jdk/src/solaris/native/sun/nio/ch/NativeThread.c
rename to jdk/src/java.base/unix/native/libnio/ch/NativeThread.c
diff --git a/jdk/src/solaris/native/sun/nio/ch/Net.c b/jdk/src/java.base/unix/native/libnio/ch/Net.c
similarity index 100%
rename from jdk/src/solaris/native/sun/nio/ch/Net.c
rename to jdk/src/java.base/unix/native/libnio/ch/Net.c
diff --git a/jdk/src/solaris/native/sun/nio/ch/PollArrayWrapper.c b/jdk/src/java.base/unix/native/libnio/ch/PollArrayWrapper.c
similarity index 100%
rename from jdk/src/solaris/native/sun/nio/ch/PollArrayWrapper.c
rename to jdk/src/java.base/unix/native/libnio/ch/PollArrayWrapper.c
diff --git a/jdk/src/solaris/native/sun/nio/ch/ServerSocketChannelImpl.c b/jdk/src/java.base/unix/native/libnio/ch/ServerSocketChannelImpl.c
similarity index 100%
rename from jdk/src/solaris/native/sun/nio/ch/ServerSocketChannelImpl.c
rename to jdk/src/java.base/unix/native/libnio/ch/ServerSocketChannelImpl.c
diff --git a/jdk/src/solaris/native/sun/nio/ch/SocketChannelImpl.c b/jdk/src/java.base/unix/native/libnio/ch/SocketChannelImpl.c
similarity index 100%
rename from jdk/src/solaris/native/sun/nio/ch/SocketChannelImpl.c
rename to jdk/src/java.base/unix/native/libnio/ch/SocketChannelImpl.c
diff --git a/jdk/src/solaris/native/sun/nio/ch/SocketDispatcher.c b/jdk/src/java.base/unix/native/libnio/ch/SocketDispatcher.c
similarity index 100%
rename from jdk/src/solaris/native/sun/nio/ch/SocketDispatcher.c
rename to jdk/src/java.base/unix/native/libnio/ch/SocketDispatcher.c
diff --git a/jdk/src/solaris/native/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.c b/jdk/src/java.base/unix/native/libnio/ch/UnixAsynchronousServerSocketChannelImpl.c
similarity index 100%
rename from jdk/src/solaris/native/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.c
rename to jdk/src/java.base/unix/native/libnio/ch/UnixAsynchronousServerSocketChannelImpl.c
diff --git a/jdk/src/solaris/native/sun/nio/ch/UnixAsynchronousSocketChannelImpl.c b/jdk/src/java.base/unix/native/libnio/ch/UnixAsynchronousSocketChannelImpl.c
similarity index 100%
rename from jdk/src/solaris/native/sun/nio/ch/UnixAsynchronousSocketChannelImpl.c
rename to jdk/src/java.base/unix/native/libnio/ch/UnixAsynchronousSocketChannelImpl.c
diff --git a/jdk/src/solaris/native/sun/nio/ch/nio_util.h b/jdk/src/java.base/unix/native/libnio/ch/nio_util.h
similarity index 100%
rename from jdk/src/solaris/native/sun/nio/ch/nio_util.h
rename to jdk/src/java.base/unix/native/libnio/ch/nio_util.h
diff --git a/jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c b/jdk/src/java.base/unix/native/libnio/fs/GnomeFileTypeDetector.c
similarity index 100%
rename from jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c
rename to jdk/src/java.base/unix/native/libnio/fs/GnomeFileTypeDetector.c
diff --git a/jdk/src/solaris/native/sun/nio/fs/UnixCopyFile.c b/jdk/src/java.base/unix/native/libnio/fs/UnixCopyFile.c
similarity index 100%
rename from jdk/src/solaris/native/sun/nio/fs/UnixCopyFile.c
rename to jdk/src/java.base/unix/native/libnio/fs/UnixCopyFile.c
diff --git a/jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c b/jdk/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c
similarity index 100%
rename from jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c
rename to jdk/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c
diff --git a/jdk/src/windows/classes/java/io/DefaultFileSystem.java b/jdk/src/java.base/windows/classes/java/io/DefaultFileSystem.java
similarity index 100%
rename from jdk/src/windows/classes/java/io/DefaultFileSystem.java
rename to jdk/src/java.base/windows/classes/java/io/DefaultFileSystem.java
diff --git a/jdk/src/windows/classes/java/io/FileDescriptor.java b/jdk/src/java.base/windows/classes/java/io/FileDescriptor.java
similarity index 100%
rename from jdk/src/windows/classes/java/io/FileDescriptor.java
rename to jdk/src/java.base/windows/classes/java/io/FileDescriptor.java
diff --git a/jdk/src/windows/classes/java/io/WinNTFileSystem.java b/jdk/src/java.base/windows/classes/java/io/WinNTFileSystem.java
similarity index 100%
rename from jdk/src/windows/classes/java/io/WinNTFileSystem.java
rename to jdk/src/java.base/windows/classes/java/io/WinNTFileSystem.java
diff --git a/jdk/src/windows/classes/java/lang/ClassLoaderHelper.java b/jdk/src/java.base/windows/classes/java/lang/ClassLoaderHelper.java
similarity index 100%
rename from jdk/src/windows/classes/java/lang/ClassLoaderHelper.java
rename to jdk/src/java.base/windows/classes/java/lang/ClassLoaderHelper.java
diff --git a/jdk/src/windows/classes/java/lang/ProcessEnvironment.java b/jdk/src/java.base/windows/classes/java/lang/ProcessEnvironment.java
similarity index 100%
rename from jdk/src/windows/classes/java/lang/ProcessEnvironment.java
rename to jdk/src/java.base/windows/classes/java/lang/ProcessEnvironment.java
diff --git a/jdk/src/windows/classes/java/lang/ProcessImpl.java b/jdk/src/java.base/windows/classes/java/lang/ProcessImpl.java
similarity index 100%
rename from jdk/src/windows/classes/java/lang/ProcessImpl.java
rename to jdk/src/java.base/windows/classes/java/lang/ProcessImpl.java
diff --git a/jdk/src/windows/classes/java/lang/Terminator.java b/jdk/src/java.base/windows/classes/java/lang/Terminator.java
similarity index 100%
rename from jdk/src/windows/classes/java/lang/Terminator.java
rename to jdk/src/java.base/windows/classes/java/lang/Terminator.java
diff --git a/jdk/src/windows/classes/java/net/DefaultDatagramSocketImplFactory.java b/jdk/src/java.base/windows/classes/java/net/DefaultDatagramSocketImplFactory.java
similarity index 100%
rename from jdk/src/windows/classes/java/net/DefaultDatagramSocketImplFactory.java
rename to jdk/src/java.base/windows/classes/java/net/DefaultDatagramSocketImplFactory.java
diff --git a/jdk/src/windows/classes/java/net/DefaultInterface.java b/jdk/src/java.base/windows/classes/java/net/DefaultInterface.java
similarity index 100%
rename from jdk/src/windows/classes/java/net/DefaultInterface.java
rename to jdk/src/java.base/windows/classes/java/net/DefaultInterface.java
diff --git a/jdk/src/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java b/jdk/src/java.base/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java
similarity index 100%
rename from jdk/src/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java
rename to jdk/src/java.base/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java
diff --git a/jdk/src/windows/classes/java/net/DualStackPlainSocketImpl.java b/jdk/src/java.base/windows/classes/java/net/DualStackPlainSocketImpl.java
similarity index 100%
rename from jdk/src/windows/classes/java/net/DualStackPlainSocketImpl.java
rename to jdk/src/java.base/windows/classes/java/net/DualStackPlainSocketImpl.java
diff --git a/jdk/src/windows/classes/java/net/PlainSocketImpl.java b/jdk/src/java.base/windows/classes/java/net/PlainSocketImpl.java
similarity index 100%
rename from jdk/src/windows/classes/java/net/PlainSocketImpl.java
rename to jdk/src/java.base/windows/classes/java/net/PlainSocketImpl.java
diff --git a/jdk/src/windows/classes/java/net/TwoStacksPlainDatagramSocketImpl.java b/jdk/src/java.base/windows/classes/java/net/TwoStacksPlainDatagramSocketImpl.java
similarity index 100%
rename from jdk/src/windows/classes/java/net/TwoStacksPlainDatagramSocketImpl.java
rename to jdk/src/java.base/windows/classes/java/net/TwoStacksPlainDatagramSocketImpl.java
diff --git a/jdk/src/windows/classes/java/net/TwoStacksPlainSocketImpl.java b/jdk/src/java.base/windows/classes/java/net/TwoStacksPlainSocketImpl.java
similarity index 100%
rename from jdk/src/windows/classes/java/net/TwoStacksPlainSocketImpl.java
rename to jdk/src/java.base/windows/classes/java/net/TwoStacksPlainSocketImpl.java
diff --git a/jdk/src/windows/classes/sun/io/Win32ErrorMode.java b/jdk/src/java.base/windows/classes/sun/io/Win32ErrorMode.java
similarity index 100%
rename from jdk/src/windows/classes/sun/io/Win32ErrorMode.java
rename to jdk/src/java.base/windows/classes/sun/io/Win32ErrorMode.java
diff --git a/jdk/src/windows/classes/sun/misc/FileURLMapper.java b/jdk/src/java.base/windows/classes/sun/misc/FileURLMapper.java
similarity index 100%
rename from jdk/src/windows/classes/sun/misc/FileURLMapper.java
rename to jdk/src/java.base/windows/classes/sun/misc/FileURLMapper.java
diff --git a/jdk/src/windows/classes/sun/misc/OSEnvironment.java b/jdk/src/java.base/windows/classes/sun/misc/OSEnvironment.java
similarity index 100%
rename from jdk/src/windows/classes/sun/misc/OSEnvironment.java
rename to jdk/src/java.base/windows/classes/sun/misc/OSEnvironment.java
diff --git a/jdk/src/windows/classes/sun/net/NetHooks.java b/jdk/src/java.base/windows/classes/sun/net/NetHooks.java
similarity index 100%
rename from jdk/src/windows/classes/sun/net/NetHooks.java
rename to jdk/src/java.base/windows/classes/sun/net/NetHooks.java
diff --git a/jdk/src/windows/classes/sun/net/PortConfig.java b/jdk/src/java.base/windows/classes/sun/net/PortConfig.java
similarity index 100%
rename from jdk/src/windows/classes/sun/net/PortConfig.java
rename to jdk/src/java.base/windows/classes/sun/net/PortConfig.java
diff --git a/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java b/jdk/src/java.base/windows/classes/sun/net/dns/ResolverConfigurationImpl.java
similarity index 100%
rename from jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java
rename to jdk/src/java.base/windows/classes/sun/net/dns/ResolverConfigurationImpl.java
diff --git a/jdk/src/windows/classes/sun/net/www/content-types.properties b/jdk/src/java.base/windows/classes/sun/net/www/content-types.properties
similarity index 100%
rename from jdk/src/windows/classes/sun/net/www/content-types.properties
rename to jdk/src/java.base/windows/classes/sun/net/www/content-types.properties
diff --git a/jdk/src/windows/classes/sun/net/www/protocol/file/Handler.java b/jdk/src/java.base/windows/classes/sun/net/www/protocol/file/Handler.java
similarity index 100%
rename from jdk/src/windows/classes/sun/net/www/protocol/file/Handler.java
rename to jdk/src/java.base/windows/classes/sun/net/www/protocol/file/Handler.java
diff --git a/jdk/src/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthSequence.java b/jdk/src/java.base/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthSequence.java
similarity index 100%
rename from jdk/src/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthSequence.java
rename to jdk/src/java.base/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthSequence.java
diff --git a/jdk/src/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java b/jdk/src/java.base/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java
similarity index 100%
rename from jdk/src/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java
rename to jdk/src/java.base/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java
diff --git a/jdk/src/windows/classes/sun/net/www/protocol/jar/JarFileFactory.java b/jdk/src/java.base/windows/classes/sun/net/www/protocol/jar/JarFileFactory.java
similarity index 100%
rename from jdk/src/windows/classes/sun/net/www/protocol/jar/JarFileFactory.java
rename to jdk/src/java.base/windows/classes/sun/net/www/protocol/jar/JarFileFactory.java
diff --git a/jdk/src/windows/classes/sun/nio/ch/DatagramDispatcher.java b/jdk/src/java.base/windows/classes/sun/nio/ch/DatagramDispatcher.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/ch/DatagramDispatcher.java
rename to jdk/src/java.base/windows/classes/sun/nio/ch/DatagramDispatcher.java
diff --git a/jdk/src/windows/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java b/jdk/src/java.base/windows/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java
rename to jdk/src/java.base/windows/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java
diff --git a/jdk/src/windows/classes/sun/nio/ch/DefaultSelectorProvider.java b/jdk/src/java.base/windows/classes/sun/nio/ch/DefaultSelectorProvider.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/ch/DefaultSelectorProvider.java
rename to jdk/src/java.base/windows/classes/sun/nio/ch/DefaultSelectorProvider.java
diff --git a/jdk/src/windows/classes/sun/nio/ch/FileDispatcherImpl.java b/jdk/src/java.base/windows/classes/sun/nio/ch/FileDispatcherImpl.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/ch/FileDispatcherImpl.java
rename to jdk/src/java.base/windows/classes/sun/nio/ch/FileDispatcherImpl.java
diff --git a/jdk/src/windows/classes/sun/nio/ch/FileKey.java b/jdk/src/java.base/windows/classes/sun/nio/ch/FileKey.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/ch/FileKey.java
rename to jdk/src/java.base/windows/classes/sun/nio/ch/FileKey.java
diff --git a/jdk/src/windows/classes/sun/nio/ch/Iocp.java b/jdk/src/java.base/windows/classes/sun/nio/ch/Iocp.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/ch/Iocp.java
rename to jdk/src/java.base/windows/classes/sun/nio/ch/Iocp.java
diff --git a/jdk/src/windows/classes/sun/nio/ch/NativeThread.java b/jdk/src/java.base/windows/classes/sun/nio/ch/NativeThread.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/ch/NativeThread.java
rename to jdk/src/java.base/windows/classes/sun/nio/ch/NativeThread.java
diff --git a/jdk/src/windows/classes/sun/nio/ch/PendingIoCache.java b/jdk/src/java.base/windows/classes/sun/nio/ch/PendingIoCache.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/ch/PendingIoCache.java
rename to jdk/src/java.base/windows/classes/sun/nio/ch/PendingIoCache.java
diff --git a/jdk/src/windows/classes/sun/nio/ch/PipeImpl.java b/jdk/src/java.base/windows/classes/sun/nio/ch/PipeImpl.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/ch/PipeImpl.java
rename to jdk/src/java.base/windows/classes/sun/nio/ch/PipeImpl.java
diff --git a/jdk/src/windows/classes/sun/nio/ch/PollArrayWrapper.java b/jdk/src/java.base/windows/classes/sun/nio/ch/PollArrayWrapper.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/ch/PollArrayWrapper.java
rename to jdk/src/java.base/windows/classes/sun/nio/ch/PollArrayWrapper.java
diff --git a/jdk/src/windows/classes/sun/nio/ch/SinkChannelImpl.java b/jdk/src/java.base/windows/classes/sun/nio/ch/SinkChannelImpl.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/ch/SinkChannelImpl.java
rename to jdk/src/java.base/windows/classes/sun/nio/ch/SinkChannelImpl.java
diff --git a/jdk/src/windows/classes/sun/nio/ch/SocketDispatcher.java b/jdk/src/java.base/windows/classes/sun/nio/ch/SocketDispatcher.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/ch/SocketDispatcher.java
rename to jdk/src/java.base/windows/classes/sun/nio/ch/SocketDispatcher.java
diff --git a/jdk/src/windows/classes/sun/nio/ch/SourceChannelImpl.java b/jdk/src/java.base/windows/classes/sun/nio/ch/SourceChannelImpl.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/ch/SourceChannelImpl.java
rename to jdk/src/java.base/windows/classes/sun/nio/ch/SourceChannelImpl.java
diff --git a/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousChannelProvider.java b/jdk/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousChannelProvider.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousChannelProvider.java
rename to jdk/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousChannelProvider.java
diff --git a/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java b/jdk/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java
rename to jdk/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java
diff --git a/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java b/jdk/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java
rename to jdk/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java
diff --git a/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java b/jdk/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java
rename to jdk/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java
diff --git a/jdk/src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java b/jdk/src/java.base/windows/classes/sun/nio/ch/WindowsSelectorImpl.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java
rename to jdk/src/java.base/windows/classes/sun/nio/ch/WindowsSelectorImpl.java
diff --git a/jdk/src/windows/classes/sun/nio/ch/WindowsSelectorProvider.java b/jdk/src/java.base/windows/classes/sun/nio/ch/WindowsSelectorProvider.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/ch/WindowsSelectorProvider.java
rename to jdk/src/java.base/windows/classes/sun/nio/ch/WindowsSelectorProvider.java
diff --git a/jdk/src/windows/classes/sun/nio/fs/DefaultFileSystemProvider.java b/jdk/src/java.base/windows/classes/sun/nio/fs/DefaultFileSystemProvider.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/fs/DefaultFileSystemProvider.java
rename to jdk/src/java.base/windows/classes/sun/nio/fs/DefaultFileSystemProvider.java
diff --git a/jdk/src/windows/classes/sun/nio/fs/DefaultFileTypeDetector.java b/jdk/src/java.base/windows/classes/sun/nio/fs/DefaultFileTypeDetector.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/fs/DefaultFileTypeDetector.java
rename to jdk/src/java.base/windows/classes/sun/nio/fs/DefaultFileTypeDetector.java
diff --git a/jdk/src/windows/classes/sun/nio/fs/RegistryFileTypeDetector.java b/jdk/src/java.base/windows/classes/sun/nio/fs/RegistryFileTypeDetector.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/fs/RegistryFileTypeDetector.java
rename to jdk/src/java.base/windows/classes/sun/nio/fs/RegistryFileTypeDetector.java
diff --git a/jdk/src/windows/classes/sun/nio/fs/WindowsAclFileAttributeView.java b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsAclFileAttributeView.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/fs/WindowsAclFileAttributeView.java
rename to jdk/src/java.base/windows/classes/sun/nio/fs/WindowsAclFileAttributeView.java
diff --git a/jdk/src/windows/classes/sun/nio/fs/WindowsChannelFactory.java b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsChannelFactory.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/fs/WindowsChannelFactory.java
rename to jdk/src/java.base/windows/classes/sun/nio/fs/WindowsChannelFactory.java
diff --git a/jdk/src/windows/classes/sun/nio/fs/WindowsConstants.java b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsConstants.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/fs/WindowsConstants.java
rename to jdk/src/java.base/windows/classes/sun/nio/fs/WindowsConstants.java
diff --git a/jdk/src/windows/classes/sun/nio/fs/WindowsDirectoryStream.java b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsDirectoryStream.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/fs/WindowsDirectoryStream.java
rename to jdk/src/java.base/windows/classes/sun/nio/fs/WindowsDirectoryStream.java
diff --git a/jdk/src/windows/classes/sun/nio/fs/WindowsException.java b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsException.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/fs/WindowsException.java
rename to jdk/src/java.base/windows/classes/sun/nio/fs/WindowsException.java
diff --git a/jdk/src/windows/classes/sun/nio/fs/WindowsFileAttributeViews.java b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsFileAttributeViews.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/fs/WindowsFileAttributeViews.java
rename to jdk/src/java.base/windows/classes/sun/nio/fs/WindowsFileAttributeViews.java
diff --git a/jdk/src/windows/classes/sun/nio/fs/WindowsFileAttributes.java b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsFileAttributes.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/fs/WindowsFileAttributes.java
rename to jdk/src/java.base/windows/classes/sun/nio/fs/WindowsFileAttributes.java
diff --git a/jdk/src/windows/classes/sun/nio/fs/WindowsFileCopy.java b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsFileCopy.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/fs/WindowsFileCopy.java
rename to jdk/src/java.base/windows/classes/sun/nio/fs/WindowsFileCopy.java
diff --git a/jdk/src/windows/classes/sun/nio/fs/WindowsFileStore.java b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsFileStore.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/fs/WindowsFileStore.java
rename to jdk/src/java.base/windows/classes/sun/nio/fs/WindowsFileStore.java
diff --git a/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsFileSystem.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java
rename to jdk/src/java.base/windows/classes/sun/nio/fs/WindowsFileSystem.java
diff --git a/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystemProvider.java b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsFileSystemProvider.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/fs/WindowsFileSystemProvider.java
rename to jdk/src/java.base/windows/classes/sun/nio/fs/WindowsFileSystemProvider.java
diff --git a/jdk/src/windows/classes/sun/nio/fs/WindowsLinkSupport.java b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsLinkSupport.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/fs/WindowsLinkSupport.java
rename to jdk/src/java.base/windows/classes/sun/nio/fs/WindowsLinkSupport.java
diff --git a/jdk/src/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java
rename to jdk/src/java.base/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java
diff --git a/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsPath.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/fs/WindowsPath.java
rename to jdk/src/java.base/windows/classes/sun/nio/fs/WindowsPath.java
diff --git a/jdk/src/windows/classes/sun/nio/fs/WindowsPathParser.java b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsPathParser.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/fs/WindowsPathParser.java
rename to jdk/src/java.base/windows/classes/sun/nio/fs/WindowsPathParser.java
diff --git a/jdk/src/windows/classes/sun/nio/fs/WindowsPathType.java b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsPathType.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/fs/WindowsPathType.java
rename to jdk/src/java.base/windows/classes/sun/nio/fs/WindowsPathType.java
diff --git a/jdk/src/windows/classes/sun/nio/fs/WindowsSecurity.java b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsSecurity.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/fs/WindowsSecurity.java
rename to jdk/src/java.base/windows/classes/sun/nio/fs/WindowsSecurity.java
diff --git a/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java
rename to jdk/src/java.base/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java
diff --git a/jdk/src/windows/classes/sun/nio/fs/WindowsUriSupport.java b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsUriSupport.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/fs/WindowsUriSupport.java
rename to jdk/src/java.base/windows/classes/sun/nio/fs/WindowsUriSupport.java
diff --git a/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java
rename to jdk/src/java.base/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java
diff --git a/jdk/src/windows/classes/sun/nio/fs/WindowsUserPrincipals.java b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsUserPrincipals.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/fs/WindowsUserPrincipals.java
rename to jdk/src/java.base/windows/classes/sun/nio/fs/WindowsUserPrincipals.java
diff --git a/jdk/src/windows/classes/sun/nio/fs/WindowsWatchService.java b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsWatchService.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/fs/WindowsWatchService.java
rename to jdk/src/java.base/windows/classes/sun/nio/fs/WindowsWatchService.java
diff --git a/jdk/src/windows/classes/sun/security/provider/NativePRNG.java b/jdk/src/java.base/windows/classes/sun/security/provider/NativePRNG.java
similarity index 100%
rename from jdk/src/windows/classes/sun/security/provider/NativePRNG.java
rename to jdk/src/java.base/windows/classes/sun/security/provider/NativePRNG.java
diff --git a/jdk/src/windows/classes/sun/security/provider/NativeSeedGenerator.java b/jdk/src/java.base/windows/classes/sun/security/provider/NativeSeedGenerator.java
similarity index 100%
rename from jdk/src/windows/classes/sun/security/provider/NativeSeedGenerator.java
rename to jdk/src/java.base/windows/classes/sun/security/provider/NativeSeedGenerator.java
diff --git a/jdk/src/windows/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java b/jdk/src/java.base/windows/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java
similarity index 100%
rename from jdk/src/windows/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java
rename to jdk/src/java.base/windows/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java
diff --git a/jdk/src/windows/bin/amd64/jvm.cfg b/jdk/src/java.base/windows/conf/amd64/jvm.cfg
similarity index 100%
rename from jdk/src/windows/bin/amd64/jvm.cfg
rename to jdk/src/java.base/windows/conf/amd64/jvm.cfg
diff --git a/jdk/src/windows/bin/i586/jvm.cfg b/jdk/src/java.base/windows/conf/i586/jvm.cfg
similarity index 100%
rename from jdk/src/windows/bin/i586/jvm.cfg
rename to jdk/src/java.base/windows/conf/i586/jvm.cfg
diff --git a/jdk/src/windows/bin/ia64/jvm.cfg b/jdk/src/java.base/windows/conf/ia64/jvm.cfg
similarity index 100%
rename from jdk/src/windows/bin/ia64/jvm.cfg
rename to jdk/src/java.base/windows/conf/ia64/jvm.cfg
diff --git a/jdk/src/windows/lib/security/java.policy b/jdk/src/java.base/windows/conf/security/java.policy
similarity index 100%
rename from jdk/src/windows/lib/security/java.policy
rename to jdk/src/java.base/windows/conf/security/java.policy
diff --git a/jdk/src/windows/lib/tzmappings b/jdk/src/java.base/windows/conf/tzmappings
similarity index 100%
rename from jdk/src/windows/lib/tzmappings
rename to jdk/src/java.base/windows/conf/tzmappings
diff --git a/jdk/src/windows/resource/version.rc b/jdk/src/java.base/windows/native/common/version.rc
similarity index 100%
rename from jdk/src/windows/resource/version.rc
rename to jdk/src/java.base/windows/native/common/version.rc
diff --git a/jdk/src/windows/javavm/export/jni_md.h b/jdk/src/java.base/windows/native/include/jni_md.h
similarity index 100%
rename from jdk/src/windows/javavm/export/jni_md.h
rename to jdk/src/java.base/windows/native/include/jni_md.h
diff --git a/jdk/src/windows/javavm/export/jvm_md.h b/jdk/src/java.base/windows/native/include/jvm_md.h
similarity index 100%
rename from jdk/src/windows/javavm/export/jvm_md.h
rename to jdk/src/java.base/windows/native/include/jvm_md.h
diff --git a/jdk/src/windows/resource/icons/awt.ico b/jdk/src/java.base/windows/native/launcher/icons/awt.ico
similarity index 100%
rename from jdk/src/windows/resource/icons/awt.ico
rename to jdk/src/java.base/windows/native/launcher/icons/awt.ico
diff --git a/jdk/src/windows/resource/java.manifest b/jdk/src/java.base/windows/native/launcher/java.manifest
similarity index 100%
rename from jdk/src/windows/resource/java.manifest
rename to jdk/src/java.base/windows/native/launcher/java.manifest
diff --git a/jdk/src/windows/resource/java.rc b/jdk/src/java.base/windows/native/launcher/java.rc
similarity index 100%
rename from jdk/src/windows/resource/java.rc
rename to jdk/src/java.base/windows/native/launcher/java.rc
diff --git a/jdk/src/windows/native/java/io/Console_md.c b/jdk/src/java.base/windows/native/libjava/Console_md.c
similarity index 100%
rename from jdk/src/windows/native/java/io/Console_md.c
rename to jdk/src/java.base/windows/native/libjava/Console_md.c
diff --git a/jdk/src/windows/native/java/io/FileDescriptor_md.c b/jdk/src/java.base/windows/native/libjava/FileDescriptor_md.c
similarity index 100%
rename from jdk/src/windows/native/java/io/FileDescriptor_md.c
rename to jdk/src/java.base/windows/native/libjava/FileDescriptor_md.c
diff --git a/jdk/src/windows/native/java/io/FileInputStream_md.c b/jdk/src/java.base/windows/native/libjava/FileInputStream_md.c
similarity index 100%
rename from jdk/src/windows/native/java/io/FileInputStream_md.c
rename to jdk/src/java.base/windows/native/libjava/FileInputStream_md.c
diff --git a/jdk/src/windows/native/java/io/FileOutputStream_md.c b/jdk/src/java.base/windows/native/libjava/FileOutputStream_md.c
similarity index 100%
rename from jdk/src/windows/native/java/io/FileOutputStream_md.c
rename to jdk/src/java.base/windows/native/libjava/FileOutputStream_md.c
diff --git a/jdk/src/windows/native/sun/util/locale/provider/HostLocaleProviderAdapter_md.c b/jdk/src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c
similarity index 100%
rename from jdk/src/windows/native/sun/util/locale/provider/HostLocaleProviderAdapter_md.c
rename to jdk/src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c
diff --git a/jdk/src/windows/native/java/lang/ProcessEnvironment_md.c b/jdk/src/java.base/windows/native/libjava/ProcessEnvironment_md.c
similarity index 100%
rename from jdk/src/windows/native/java/lang/ProcessEnvironment_md.c
rename to jdk/src/java.base/windows/native/libjava/ProcessEnvironment_md.c
diff --git a/jdk/src/windows/native/java/lang/ProcessImpl_md.c b/jdk/src/java.base/windows/native/libjava/ProcessImpl_md.c
similarity index 100%
rename from jdk/src/windows/native/java/lang/ProcessImpl_md.c
rename to jdk/src/java.base/windows/native/libjava/ProcessImpl_md.c
diff --git a/jdk/src/windows/native/java/io/RandomAccessFile_md.c b/jdk/src/java.base/windows/native/libjava/RandomAccessFile_md.c
similarity index 100%
rename from jdk/src/windows/native/java/io/RandomAccessFile_md.c
rename to jdk/src/java.base/windows/native/libjava/RandomAccessFile_md.c
diff --git a/jdk/src/windows/native/java/util/TimeZone_md.c b/jdk/src/java.base/windows/native/libjava/TimeZone_md.c
similarity index 100%
rename from jdk/src/windows/native/java/util/TimeZone_md.c
rename to jdk/src/java.base/windows/native/libjava/TimeZone_md.c
diff --git a/jdk/src/windows/native/java/util/TimeZone_md.h b/jdk/src/java.base/windows/native/libjava/TimeZone_md.h
similarity index 100%
rename from jdk/src/windows/native/java/util/TimeZone_md.h
rename to jdk/src/java.base/windows/native/libjava/TimeZone_md.h
diff --git a/jdk/src/windows/native/sun/misc/VM_md.c b/jdk/src/java.base/windows/native/libjava/VM_md.c
similarity index 100%
rename from jdk/src/windows/native/sun/misc/VM_md.c
rename to jdk/src/java.base/windows/native/libjava/VM_md.c
diff --git a/jdk/src/windows/native/sun/io/Win32ErrorMode.c b/jdk/src/java.base/windows/native/libjava/Win32ErrorMode.c
similarity index 100%
rename from jdk/src/windows/native/sun/io/Win32ErrorMode.c
rename to jdk/src/java.base/windows/native/libjava/Win32ErrorMode.c
diff --git a/jdk/src/windows/native/sun/security/provider/WinCAPISeedGenerator.c b/jdk/src/java.base/windows/native/libjava/WinCAPISeedGenerator.c
similarity index 100%
rename from jdk/src/windows/native/sun/security/provider/WinCAPISeedGenerator.c
rename to jdk/src/java.base/windows/native/libjava/WinCAPISeedGenerator.c
diff --git a/jdk/src/windows/native/java/io/WinNTFileSystem_md.c b/jdk/src/java.base/windows/native/libjava/WinNTFileSystem_md.c
similarity index 100%
rename from jdk/src/windows/native/java/io/WinNTFileSystem_md.c
rename to jdk/src/java.base/windows/native/libjava/WinNTFileSystem_md.c
diff --git a/jdk/src/windows/native/java/io/canonicalize_md.c b/jdk/src/java.base/windows/native/libjava/canonicalize_md.c
similarity index 100%
rename from jdk/src/windows/native/java/io/canonicalize_md.c
rename to jdk/src/java.base/windows/native/libjava/canonicalize_md.c
diff --git a/jdk/src/windows/native/java/io/dirent_md.c b/jdk/src/java.base/windows/native/libjava/dirent_md.c
similarity index 100%
rename from jdk/src/windows/native/java/io/dirent_md.c
rename to jdk/src/java.base/windows/native/libjava/dirent_md.c
diff --git a/jdk/src/windows/native/java/io/dirent_md.h b/jdk/src/java.base/windows/native/libjava/dirent_md.h
similarity index 100%
rename from jdk/src/windows/native/java/io/dirent_md.h
rename to jdk/src/java.base/windows/native/libjava/dirent_md.h
diff --git a/jdk/src/windows/native/common/gdefs_md.h b/jdk/src/java.base/windows/native/libjava/gdefs_md.h
similarity index 100%
rename from jdk/src/windows/native/common/gdefs_md.h
rename to jdk/src/java.base/windows/native/libjava/gdefs_md.h
diff --git a/jdk/src/windows/native/java/io/io_util_md.c b/jdk/src/java.base/windows/native/libjava/io_util_md.c
similarity index 100%
rename from jdk/src/windows/native/java/io/io_util_md.c
rename to jdk/src/java.base/windows/native/libjava/io_util_md.c
diff --git a/jdk/src/windows/native/java/io/io_util_md.h b/jdk/src/java.base/windows/native/libjava/io_util_md.h
similarity index 100%
rename from jdk/src/windows/native/java/io/io_util_md.h
rename to jdk/src/java.base/windows/native/libjava/io_util_md.h
diff --git a/jdk/src/windows/native/common/java_main_md.h b/jdk/src/java.base/windows/native/libjava/java_main_md.h
similarity index 100%
rename from jdk/src/windows/native/common/java_main_md.h
rename to jdk/src/java.base/windows/native/libjava/java_main_md.h
diff --git a/jdk/src/windows/native/java/lang/java_props_md.c b/jdk/src/java.base/windows/native/libjava/java_props_md.c
similarity index 100%
rename from jdk/src/windows/native/java/lang/java_props_md.c
rename to jdk/src/java.base/windows/native/libjava/java_props_md.c
diff --git a/jdk/src/windows/native/common/jdk_util_md.c b/jdk/src/java.base/windows/native/libjava/jdk_util_md.c
similarity index 100%
rename from jdk/src/windows/native/common/jdk_util_md.c
rename to jdk/src/java.base/windows/native/libjava/jdk_util_md.c
diff --git a/jdk/src/windows/native/common/jdk_util_md.h b/jdk/src/java.base/windows/native/libjava/jdk_util_md.h
similarity index 100%
rename from jdk/src/windows/native/common/jdk_util_md.h
rename to jdk/src/java.base/windows/native/libjava/jdk_util_md.h
diff --git a/jdk/src/windows/native/common/jlong_md.h b/jdk/src/java.base/windows/native/libjava/jlong_md.h
similarity index 100%
rename from jdk/src/windows/native/common/jlong_md.h
rename to jdk/src/java.base/windows/native/libjava/jlong_md.h
diff --git a/jdk/src/windows/native/common/jni_util_md.c b/jdk/src/java.base/windows/native/libjava/jni_util_md.c
similarity index 100%
rename from jdk/src/windows/native/common/jni_util_md.c
rename to jdk/src/java.base/windows/native/libjava/jni_util_md.c
diff --git a/jdk/src/windows/native/common/locale_str.h b/jdk/src/java.base/windows/native/libjava/locale_str.h
similarity index 100%
rename from jdk/src/windows/native/common/locale_str.h
rename to jdk/src/java.base/windows/native/libjava/locale_str.h
diff --git a/jdk/src/windows/bin/cmdtoargs.c b/jdk/src/java.base/windows/native/libjli/cmdtoargs.c
similarity index 100%
rename from jdk/src/windows/bin/cmdtoargs.c
rename to jdk/src/java.base/windows/native/libjli/cmdtoargs.c
diff --git a/jdk/src/windows/bin/java_md.c b/jdk/src/java.base/windows/native/libjli/java_md.c
similarity index 100%
rename from jdk/src/windows/bin/java_md.c
rename to jdk/src/java.base/windows/native/libjli/java_md.c
diff --git a/jdk/src/windows/bin/java_md.h b/jdk/src/java.base/windows/native/libjli/java_md.h
similarity index 100%
rename from jdk/src/windows/bin/java_md.h
rename to jdk/src/java.base/windows/native/libjli/java_md.h
diff --git a/jdk/src/windows/native/sun/net/spi/DefaultProxySelector.c b/jdk/src/java.base/windows/native/libnet/DefaultProxySelector.c
similarity index 100%
rename from jdk/src/windows/native/sun/net/spi/DefaultProxySelector.c
rename to jdk/src/java.base/windows/native/libnet/DefaultProxySelector.c
diff --git a/jdk/src/windows/native/java/net/DualStackPlainDatagramSocketImpl.c b/jdk/src/java.base/windows/native/libnet/DualStackPlainDatagramSocketImpl.c
similarity index 100%
rename from jdk/src/windows/native/java/net/DualStackPlainDatagramSocketImpl.c
rename to jdk/src/java.base/windows/native/libnet/DualStackPlainDatagramSocketImpl.c
diff --git a/jdk/src/windows/native/java/net/DualStackPlainSocketImpl.c b/jdk/src/java.base/windows/native/libnet/DualStackPlainSocketImpl.c
similarity index 100%
rename from jdk/src/windows/native/java/net/DualStackPlainSocketImpl.c
rename to jdk/src/java.base/windows/native/libnet/DualStackPlainSocketImpl.c
diff --git a/jdk/src/windows/native/java/net/ExtendedOptionsImpl.c b/jdk/src/java.base/windows/native/libnet/ExtendedOptionsImpl.c
similarity index 100%
rename from jdk/src/windows/native/java/net/ExtendedOptionsImpl.c
rename to jdk/src/java.base/windows/native/libnet/ExtendedOptionsImpl.c
diff --git a/jdk/src/windows/native/java/net/Inet4AddressImpl.c b/jdk/src/java.base/windows/native/libnet/Inet4AddressImpl.c
similarity index 100%
rename from jdk/src/windows/native/java/net/Inet4AddressImpl.c
rename to jdk/src/java.base/windows/native/libnet/Inet4AddressImpl.c
diff --git a/jdk/src/windows/native/java/net/Inet6AddressImpl.c b/jdk/src/java.base/windows/native/libnet/Inet6AddressImpl.c
similarity index 100%
rename from jdk/src/windows/native/java/net/Inet6AddressImpl.c
rename to jdk/src/java.base/windows/native/libnet/Inet6AddressImpl.c
diff --git a/jdk/src/windows/native/java/net/InetAddressImplFactory.c b/jdk/src/java.base/windows/native/libnet/InetAddressImplFactory.c
similarity index 100%
rename from jdk/src/windows/native/java/net/InetAddressImplFactory.c
rename to jdk/src/java.base/windows/native/libnet/InetAddressImplFactory.c
diff --git a/jdk/src/windows/native/sun/net/www/protocol/http/ntlm/NTLMAuthSequence.c b/jdk/src/java.base/windows/native/libnet/NTLMAuthSequence.c
similarity index 100%
rename from jdk/src/windows/native/sun/net/www/protocol/http/ntlm/NTLMAuthSequence.c
rename to jdk/src/java.base/windows/native/libnet/NTLMAuthSequence.c
diff --git a/jdk/src/windows/native/java/net/NetworkInterface.c b/jdk/src/java.base/windows/native/libnet/NetworkInterface.c
similarity index 100%
rename from jdk/src/windows/native/java/net/NetworkInterface.c
rename to jdk/src/java.base/windows/native/libnet/NetworkInterface.c
diff --git a/jdk/src/windows/native/java/net/NetworkInterface.h b/jdk/src/java.base/windows/native/libnet/NetworkInterface.h
similarity index 100%
rename from jdk/src/windows/native/java/net/NetworkInterface.h
rename to jdk/src/java.base/windows/native/libnet/NetworkInterface.h
diff --git a/jdk/src/windows/native/java/net/NetworkInterface_winXP.c b/jdk/src/java.base/windows/native/libnet/NetworkInterface_winXP.c
similarity index 100%
rename from jdk/src/windows/native/java/net/NetworkInterface_winXP.c
rename to jdk/src/java.base/windows/native/libnet/NetworkInterface_winXP.c
diff --git a/jdk/src/windows/native/sun/net/dns/ResolverConfigurationImpl.c b/jdk/src/java.base/windows/native/libnet/ResolverConfigurationImpl.c
similarity index 100%
rename from jdk/src/windows/native/sun/net/dns/ResolverConfigurationImpl.c
rename to jdk/src/java.base/windows/native/libnet/ResolverConfigurationImpl.c
diff --git a/jdk/src/windows/native/java/net/SocketInputStream.c b/jdk/src/java.base/windows/native/libnet/SocketInputStream.c
similarity index 100%
rename from jdk/src/windows/native/java/net/SocketInputStream.c
rename to jdk/src/java.base/windows/native/libnet/SocketInputStream.c
diff --git a/jdk/src/windows/native/java/net/SocketOutputStream.c b/jdk/src/java.base/windows/native/libnet/SocketOutputStream.c
similarity index 100%
rename from jdk/src/windows/native/java/net/SocketOutputStream.c
rename to jdk/src/java.base/windows/native/libnet/SocketOutputStream.c
diff --git a/jdk/src/windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c b/jdk/src/java.base/windows/native/libnet/TwoStacksPlainDatagramSocketImpl.c
similarity index 100%
rename from jdk/src/windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c
rename to jdk/src/java.base/windows/native/libnet/TwoStacksPlainDatagramSocketImpl.c
diff --git a/jdk/src/windows/native/java/net/TwoStacksPlainSocketImpl.c b/jdk/src/java.base/windows/native/libnet/TwoStacksPlainSocketImpl.c
similarity index 100%
rename from jdk/src/windows/native/java/net/TwoStacksPlainSocketImpl.c
rename to jdk/src/java.base/windows/native/libnet/TwoStacksPlainSocketImpl.c
diff --git a/jdk/src/windows/native/java/net/icmp.h b/jdk/src/java.base/windows/native/libnet/icmp.h
similarity index 100%
rename from jdk/src/windows/native/java/net/icmp.h
rename to jdk/src/java.base/windows/native/libnet/icmp.h
diff --git a/jdk/src/windows/native/java/net/net_util_md.c b/jdk/src/java.base/windows/native/libnet/net_util_md.c
similarity index 100%
rename from jdk/src/windows/native/java/net/net_util_md.c
rename to jdk/src/java.base/windows/native/libnet/net_util_md.c
diff --git a/jdk/src/windows/native/java/net/net_util_md.h b/jdk/src/java.base/windows/native/libnet/net_util_md.h
similarity index 100%
rename from jdk/src/windows/native/java/net/net_util_md.h
rename to jdk/src/java.base/windows/native/libnet/net_util_md.h
diff --git a/jdk/src/windows/native/sun/net/portconfig.c b/jdk/src/java.base/windows/native/libnet/portconfig.c
similarity index 100%
rename from jdk/src/windows/native/sun/net/portconfig.c
rename to jdk/src/java.base/windows/native/libnet/portconfig.c
diff --git a/jdk/src/windows/native/java/nio/MappedByteBuffer.c b/jdk/src/java.base/windows/native/libnio/MappedByteBuffer.c
similarity index 100%
rename from jdk/src/windows/native/java/nio/MappedByteBuffer.c
rename to jdk/src/java.base/windows/native/libnio/MappedByteBuffer.c
diff --git a/jdk/src/windows/native/sun/nio/ch/DatagramChannelImpl.c b/jdk/src/java.base/windows/native/libnio/ch/DatagramChannelImpl.c
similarity index 100%
rename from jdk/src/windows/native/sun/nio/ch/DatagramChannelImpl.c
rename to jdk/src/java.base/windows/native/libnio/ch/DatagramChannelImpl.c
diff --git a/jdk/src/windows/native/sun/nio/ch/DatagramDispatcher.c b/jdk/src/java.base/windows/native/libnio/ch/DatagramDispatcher.c
similarity index 100%
rename from jdk/src/windows/native/sun/nio/ch/DatagramDispatcher.c
rename to jdk/src/java.base/windows/native/libnio/ch/DatagramDispatcher.c
diff --git a/jdk/src/windows/native/sun/nio/ch/FileChannelImpl.c b/jdk/src/java.base/windows/native/libnio/ch/FileChannelImpl.c
similarity index 100%
rename from jdk/src/windows/native/sun/nio/ch/FileChannelImpl.c
rename to jdk/src/java.base/windows/native/libnio/ch/FileChannelImpl.c
diff --git a/jdk/src/windows/native/sun/nio/ch/FileDispatcherImpl.c b/jdk/src/java.base/windows/native/libnio/ch/FileDispatcherImpl.c
similarity index 100%
rename from jdk/src/windows/native/sun/nio/ch/FileDispatcherImpl.c
rename to jdk/src/java.base/windows/native/libnio/ch/FileDispatcherImpl.c
diff --git a/jdk/src/windows/native/sun/nio/ch/FileKey.c b/jdk/src/java.base/windows/native/libnio/ch/FileKey.c
similarity index 100%
rename from jdk/src/windows/native/sun/nio/ch/FileKey.c
rename to jdk/src/java.base/windows/native/libnio/ch/FileKey.c
diff --git a/jdk/src/windows/native/sun/nio/ch/IOUtil.c b/jdk/src/java.base/windows/native/libnio/ch/IOUtil.c
similarity index 100%
rename from jdk/src/windows/native/sun/nio/ch/IOUtil.c
rename to jdk/src/java.base/windows/native/libnio/ch/IOUtil.c
diff --git a/jdk/src/windows/native/sun/nio/ch/Iocp.c b/jdk/src/java.base/windows/native/libnio/ch/Iocp.c
similarity index 100%
rename from jdk/src/windows/native/sun/nio/ch/Iocp.c
rename to jdk/src/java.base/windows/native/libnio/ch/Iocp.c
diff --git a/jdk/src/windows/native/sun/nio/ch/Net.c b/jdk/src/java.base/windows/native/libnio/ch/Net.c
similarity index 100%
rename from jdk/src/windows/native/sun/nio/ch/Net.c
rename to jdk/src/java.base/windows/native/libnio/ch/Net.c
diff --git a/jdk/src/windows/native/sun/nio/ch/ServerSocketChannelImpl.c b/jdk/src/java.base/windows/native/libnio/ch/ServerSocketChannelImpl.c
similarity index 100%
rename from jdk/src/windows/native/sun/nio/ch/ServerSocketChannelImpl.c
rename to jdk/src/java.base/windows/native/libnio/ch/ServerSocketChannelImpl.c
diff --git a/jdk/src/windows/native/sun/nio/ch/SocketChannelImpl.c b/jdk/src/java.base/windows/native/libnio/ch/SocketChannelImpl.c
similarity index 100%
rename from jdk/src/windows/native/sun/nio/ch/SocketChannelImpl.c
rename to jdk/src/java.base/windows/native/libnio/ch/SocketChannelImpl.c
diff --git a/jdk/src/windows/native/sun/nio/ch/SocketDispatcher.c b/jdk/src/java.base/windows/native/libnio/ch/SocketDispatcher.c
similarity index 100%
rename from jdk/src/windows/native/sun/nio/ch/SocketDispatcher.c
rename to jdk/src/java.base/windows/native/libnio/ch/SocketDispatcher.c
diff --git a/jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousFileChannelImpl.c b/jdk/src/java.base/windows/native/libnio/ch/WindowsAsynchronousFileChannelImpl.c
similarity index 100%
rename from jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousFileChannelImpl.c
rename to jdk/src/java.base/windows/native/libnio/ch/WindowsAsynchronousFileChannelImpl.c
diff --git a/jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.c b/jdk/src/java.base/windows/native/libnio/ch/WindowsAsynchronousServerSocketChannelImpl.c
similarity index 100%
rename from jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.c
rename to jdk/src/java.base/windows/native/libnio/ch/WindowsAsynchronousServerSocketChannelImpl.c
diff --git a/jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.c b/jdk/src/java.base/windows/native/libnio/ch/WindowsAsynchronousSocketChannelImpl.c
similarity index 100%
rename from jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.c
rename to jdk/src/java.base/windows/native/libnio/ch/WindowsAsynchronousSocketChannelImpl.c
diff --git a/jdk/src/windows/native/sun/nio/ch/WindowsSelectorImpl.c b/jdk/src/java.base/windows/native/libnio/ch/WindowsSelectorImpl.c
similarity index 100%
rename from jdk/src/windows/native/sun/nio/ch/WindowsSelectorImpl.c
rename to jdk/src/java.base/windows/native/libnio/ch/WindowsSelectorImpl.c
diff --git a/jdk/src/windows/native/sun/nio/ch/nio_util.h b/jdk/src/java.base/windows/native/libnio/ch/nio_util.h
similarity index 100%
rename from jdk/src/windows/native/sun/nio/ch/nio_util.h
rename to jdk/src/java.base/windows/native/libnio/ch/nio_util.h
diff --git a/jdk/src/windows/native/sun/nio/fs/RegistryFileTypeDetector.c b/jdk/src/java.base/windows/native/libnio/fs/RegistryFileTypeDetector.c
similarity index 100%
rename from jdk/src/windows/native/sun/nio/fs/RegistryFileTypeDetector.c
rename to jdk/src/java.base/windows/native/libnio/fs/RegistryFileTypeDetector.c
diff --git a/jdk/src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c b/jdk/src/java.base/windows/native/libnio/fs/WindowsNativeDispatcher.c
similarity index 100%
rename from jdk/src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c
rename to jdk/src/java.base/windows/native/libnio/fs/WindowsNativeDispatcher.c
diff --git a/jdk/src/share/classes/com/sun/jndi/cosnaming/CNBindingEnumeration.java b/jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNBindingEnumeration.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/cosnaming/CNBindingEnumeration.java
rename to jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNBindingEnumeration.java
diff --git a/jdk/src/share/classes/com/sun/jndi/cosnaming/CNCtx.java b/jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNCtx.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/cosnaming/CNCtx.java
rename to jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNCtx.java
diff --git a/jdk/src/share/classes/com/sun/jndi/cosnaming/CNCtxFactory.java b/jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNCtxFactory.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/cosnaming/CNCtxFactory.java
rename to jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNCtxFactory.java
diff --git a/jdk/src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java b/jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNNameParser.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java
rename to jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNNameParser.java
diff --git a/jdk/src/share/classes/com/sun/jndi/cosnaming/CorbanameUrl.java b/jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/CorbanameUrl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/cosnaming/CorbanameUrl.java
rename to jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/CorbanameUrl.java
diff --git a/jdk/src/share/classes/com/sun/jndi/cosnaming/ExceptionMapper.java b/jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/ExceptionMapper.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/cosnaming/ExceptionMapper.java
rename to jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/ExceptionMapper.java
diff --git a/jdk/src/share/classes/com/sun/jndi/cosnaming/IiopUrl.java b/jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/IiopUrl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/cosnaming/IiopUrl.java
rename to jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/IiopUrl.java
diff --git a/jdk/src/share/classes/com/sun/jndi/cosnaming/OrbReuseTracker.java b/jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/OrbReuseTracker.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/cosnaming/OrbReuseTracker.java
rename to jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/OrbReuseTracker.java
diff --git a/jdk/src/share/classes/com/sun/jndi/cosnaming/RemoteToCorba.java b/jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/RemoteToCorba.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/cosnaming/RemoteToCorba.java
rename to jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/RemoteToCorba.java
diff --git a/jdk/src/share/classes/com/sun/jndi/cosnaming/jndiprovider.properties b/jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/jndiprovider.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/cosnaming/jndiprovider.properties
rename to jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/jndiprovider.properties
diff --git a/jdk/src/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java b/jdk/src/java.corba/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java
rename to jdk/src/java.corba/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java
diff --git a/jdk/src/share/classes/com/sun/jndi/url/corbaname/corbanameURLContextFactory.java b/jdk/src/java.corba/share/classes/com/sun/jndi/url/corbaname/corbanameURLContextFactory.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/url/corbaname/corbanameURLContextFactory.java
rename to jdk/src/java.corba/share/classes/com/sun/jndi/url/corbaname/corbanameURLContextFactory.java
diff --git a/jdk/src/share/classes/com/sun/jndi/url/iiop/iiopURLContext.java b/jdk/src/java.corba/share/classes/com/sun/jndi/url/iiop/iiopURLContext.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/url/iiop/iiopURLContext.java
rename to jdk/src/java.corba/share/classes/com/sun/jndi/url/iiop/iiopURLContext.java
diff --git a/jdk/src/share/classes/com/sun/jndi/url/iiop/iiopURLContextFactory.java b/jdk/src/java.corba/share/classes/com/sun/jndi/url/iiop/iiopURLContextFactory.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/url/iiop/iiopURLContextFactory.java
rename to jdk/src/java.corba/share/classes/com/sun/jndi/url/iiop/iiopURLContextFactory.java
diff --git a/jdk/src/share/classes/com/sun/jndi/url/iiopname/iiopnameURLContextFactory.java b/jdk/src/java.corba/share/classes/com/sun/jndi/url/iiopname/iiopnameURLContextFactory.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/url/iiopname/iiopnameURLContextFactory.java
rename to jdk/src/java.corba/share/classes/com/sun/jndi/url/iiopname/iiopnameURLContextFactory.java
diff --git a/jdk/src/java.desktop/aix/native/libawt/porting_aix.c b/jdk/src/java.desktop/aix/native/libawt/porting_aix.c
new file mode 100644
index 00000000000..659d9c4c06b
--- /dev/null
+++ b/jdk/src/java.desktop/aix/native/libawt/porting_aix.c
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include 
+#include 
+#include 
+
+#include "porting_aix.h"
+
+static unsigned char dladdr_buffer[0x4000];
+
+static void fill_dll_info(void) {
+  int rc = loadquery(L_GETINFO,dladdr_buffer, sizeof(dladdr_buffer));
+  if (rc == -1) {
+    fprintf(stderr, "loadquery failed (%d %s)", errno, strerror(errno));
+    fflush(stderr);
+  }
+}
+
+static int dladdr_dont_reload(void* addr, Dl_info* info) {
+  const struct ld_info* p = (struct ld_info*) dladdr_buffer;
+  info->dli_fbase = 0; info->dli_fname = 0;
+  info->dli_sname = 0; info->dli_saddr = 0;
+  for (;;) {
+    if (addr >= p->ldinfo_textorg &&
+        addr < (((char*)p->ldinfo_textorg) + p->ldinfo_textsize)) {
+      info->dli_fname = p->ldinfo_filename;
+      info->dli_fbase = p->ldinfo_textorg;
+      return 1; /* [sic] */
+    }
+    if (!p->ldinfo_next) {
+      break;
+    }
+    p = (struct ld_info*)(((char*)p) + p->ldinfo_next);
+  }
+  return 0; /* [sic] */
+}
+
+#ifdef __cplusplus
+extern "C"
+#endif
+int dladdr(void *addr, Dl_info *info) {
+  static int loaded = 0;
+  if (!loaded) {
+    fill_dll_info();
+    loaded = 1;
+  }
+  if (!addr) {
+    return 0;  /* [sic] */
+  }
+  /* Address could be AIX function descriptor? */
+  void* const addr0 = *( (void**) addr );
+  int rc = dladdr_dont_reload(addr, info);
+  if (rc == 0) {
+    rc = dladdr_dont_reload(addr0, info);
+    if (rc == 0) { /* [sic] */
+      fill_dll_info(); /* refill, maybe loadquery info is outdated */
+      rc = dladdr_dont_reload(addr, info);
+      if (rc == 0) {
+        rc = dladdr_dont_reload(addr0, info);
+      }
+    }
+  }
+  return rc;
+}
diff --git a/jdk/src/java.desktop/aix/native/libawt/porting_aix.h b/jdk/src/java.desktop/aix/native/libawt/porting_aix.h
new file mode 100644
index 00000000000..79d1062dd67
--- /dev/null
+++ b/jdk/src/java.desktop/aix/native/libawt/porting_aix.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/*
+ * Header file to contain porting-relevant code which does not have a
+ * home anywhere else.
+ * This is intially based on hotspot/src/os/aix/vm/{loadlib,porting}_aix.{hpp,cpp}
+ */
+
+/*
+ * Aix' own version of dladdr().
+ * This function tries to mimick dladdr(3) on Linux
+ * (see http://linux.die.net/man/3/dladdr)
+ * dladdr(3) is not POSIX but a GNU extension, and is not available on AIX.
+ *
+ * Differences between AIX dladdr and Linux dladdr:
+ *
+ * 1) Dl_info.dli_fbase: can never work, is disabled.
+ *   A loaded image on AIX is divided in multiple segments, at least two
+ *   (text and data) but potentially also far more. This is because the loader may
+ *   load each member into an own segment, as for instance happens with the libC.a
+ * 2) Dl_info.dli_sname: This only works for code symbols (functions); for data, a
+ *   zero-length string is returned ("").
+ * 3) Dl_info.dli_saddr: For code, this will return the entry point of the function,
+ *   not the function descriptor.
+ */
+
+typedef struct {
+  const char *dli_fname; /* file path of loaded library */
+  void *dli_fbase;       /* doesn't make sence on AIX */
+  const char *dli_sname; /* symbol name; "" if not known */
+  void *dli_saddr;       /* address of *entry* of function; not function descriptor; */
+} Dl_info;
+
+#ifdef __cplusplus
+extern "C"
+#endif
+int dladdr(void *addr, Dl_info *info);
diff --git a/jdk/src/solaris/classes/sun/awt/motif/java.oblique-fonts.dir b/jdk/src/java.desktop/linux/conf/oblique-fonts/fonts.dir
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/motif/java.oblique-fonts.dir
rename to jdk/src/java.desktop/linux/conf/oblique-fonts/fonts.dir
diff --git a/jdk/src/macosx/classes/apple/laf/AquaLookAndFeel.java b/jdk/src/java.desktop/macosx/classes/apple/laf/AquaLookAndFeel.java
similarity index 100%
rename from jdk/src/macosx/classes/apple/laf/AquaLookAndFeel.java
rename to jdk/src/java.desktop/macosx/classes/apple/laf/AquaLookAndFeel.java
diff --git a/jdk/src/macosx/classes/apple/laf/JRSUIConstants.java b/jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIConstants.java
similarity index 100%
rename from jdk/src/macosx/classes/apple/laf/JRSUIConstants.java
rename to jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIConstants.java
diff --git a/jdk/src/macosx/classes/apple/laf/JRSUIControl.java b/jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIControl.java
similarity index 100%
rename from jdk/src/macosx/classes/apple/laf/JRSUIControl.java
rename to jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIControl.java
diff --git a/jdk/src/macosx/classes/apple/laf/JRSUIFocus.java b/jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIFocus.java
similarity index 100%
rename from jdk/src/macosx/classes/apple/laf/JRSUIFocus.java
rename to jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIFocus.java
diff --git a/jdk/src/macosx/classes/apple/laf/JRSUIState.java b/jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIState.java
similarity index 100%
rename from jdk/src/macosx/classes/apple/laf/JRSUIState.java
rename to jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIState.java
diff --git a/jdk/src/macosx/classes/apple/laf/JRSUIStateFactory.java b/jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIStateFactory.java
similarity index 100%
rename from jdk/src/macosx/classes/apple/laf/JRSUIStateFactory.java
rename to jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIStateFactory.java
diff --git a/jdk/src/macosx/classes/apple/laf/JRSUIUtils.java b/jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java
similarity index 100%
rename from jdk/src/macosx/classes/apple/laf/JRSUIUtils.java
rename to jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/AboutHandler.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/AboutHandler.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/AboutHandler.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/AboutHandler.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/AppEvent.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/AppEvent.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/AppEvent.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/AppEvent.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/AppEventListener.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/AppEventListener.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/AppEventListener.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/AppEventListener.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/AppForegroundListener.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/AppForegroundListener.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/AppForegroundListener.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/AppForegroundListener.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/AppHiddenListener.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/AppHiddenListener.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/AppHiddenListener.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/AppHiddenListener.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/AppReOpenedListener.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/AppReOpenedListener.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/AppReOpenedListener.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/AppReOpenedListener.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/Application.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/Application.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/Application.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/Application.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/ApplicationAdapter.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/ApplicationAdapter.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/ApplicationAdapter.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/ApplicationAdapter.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/ApplicationBeanInfo.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/ApplicationBeanInfo.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/ApplicationBeanInfo.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/ApplicationBeanInfo.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/ApplicationEvent.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/ApplicationEvent.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/ApplicationEvent.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/ApplicationEvent.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/ApplicationListener.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/ApplicationListener.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/ApplicationListener.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/ApplicationListener.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/FullScreenAdapter.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/FullScreenAdapter.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/FullScreenAdapter.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/FullScreenAdapter.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/FullScreenHandler.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/FullScreenHandler.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/FullScreenHandler.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/FullScreenHandler.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/FullScreenListener.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/FullScreenListener.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/FullScreenListener.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/FullScreenListener.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/FullScreenUtilities.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/FullScreenUtilities.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/FullScreenUtilities.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/FullScreenUtilities.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/OpenFilesHandler.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/OpenFilesHandler.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/OpenFilesHandler.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/OpenFilesHandler.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/OpenURIHandler.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/OpenURIHandler.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/OpenURIHandler.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/OpenURIHandler.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/PreferencesHandler.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/PreferencesHandler.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/PreferencesHandler.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/PreferencesHandler.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/PrintFilesHandler.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/PrintFilesHandler.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/PrintFilesHandler.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/PrintFilesHandler.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/QuitHandler.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/QuitHandler.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/QuitHandler.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/QuitHandler.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/QuitResponse.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/QuitResponse.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/QuitResponse.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/QuitResponse.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/QuitStrategy.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/QuitStrategy.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/QuitStrategy.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/QuitStrategy.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/ScreenSleepListener.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/ScreenSleepListener.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/ScreenSleepListener.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/ScreenSleepListener.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/SystemSleepListener.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/SystemSleepListener.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/SystemSleepListener.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/SystemSleepListener.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/UserSessionListener.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/UserSessionListener.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/UserSessionListener.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/UserSessionListener.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/_AppDockIconHandler.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/_AppDockIconHandler.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/_AppDockIconHandler.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/_AppDockIconHandler.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/_AppEventHandler.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/_AppEventHandler.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/_AppEventHandler.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/_AppEventHandler.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/_AppEventLegacyHandler.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/_AppEventLegacyHandler.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/_AppEventLegacyHandler.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/_AppEventLegacyHandler.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/_AppMenuBarHandler.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/_AppMenuBarHandler.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/_AppMenuBarHandler.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/_AppMenuBarHandler.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/_AppMiscHandlers.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/_AppMiscHandlers.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/_AppMiscHandlers.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/_AppMiscHandlers.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/_OpenAppHandler.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/_OpenAppHandler.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/_OpenAppHandler.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/_OpenAppHandler.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/event/GestureAdapter.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureAdapter.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/event/GestureAdapter.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureAdapter.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/event/GestureEvent.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureEvent.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/event/GestureEvent.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureEvent.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/event/GestureHandler.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureHandler.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/event/GestureHandler.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureHandler.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/event/GestureListener.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureListener.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/event/GestureListener.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureListener.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/event/GesturePhaseEvent.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/GesturePhaseEvent.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/event/GesturePhaseEvent.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/GesturePhaseEvent.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/event/GesturePhaseListener.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/GesturePhaseListener.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/event/GesturePhaseListener.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/GesturePhaseListener.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/event/GestureUtilities.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureUtilities.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/event/GestureUtilities.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureUtilities.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/event/MagnificationEvent.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/MagnificationEvent.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/event/MagnificationEvent.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/MagnificationEvent.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/event/MagnificationListener.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/MagnificationListener.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/event/MagnificationListener.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/MagnificationListener.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/event/RotationEvent.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/RotationEvent.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/event/RotationEvent.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/RotationEvent.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/event/RotationListener.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/RotationListener.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/event/RotationListener.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/RotationListener.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/event/SwipeEvent.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/SwipeEvent.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/event/SwipeEvent.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/SwipeEvent.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/event/SwipeListener.java b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/SwipeListener.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/event/SwipeListener.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/SwipeListener.java
diff --git a/jdk/src/macosx/classes/com/apple/eawt/event/package.html b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/package.html
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/event/package.html
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/package.html
diff --git a/jdk/src/macosx/classes/com/apple/eawt/package.html b/jdk/src/java.desktop/macosx/classes/com/apple/eawt/package.html
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eawt/package.html
rename to jdk/src/java.desktop/macosx/classes/com/apple/eawt/package.html
diff --git a/jdk/src/macosx/classes/com/apple/eio/FileManager.java b/jdk/src/java.desktop/macosx/classes/com/apple/eio/FileManager.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eio/FileManager.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/eio/FileManager.java
diff --git a/jdk/src/macosx/classes/com/apple/eio/package.html b/jdk/src/java.desktop/macosx/classes/com/apple/eio/package.html
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/eio/package.html
rename to jdk/src/java.desktop/macosx/classes/com/apple/eio/package.html
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaBorder.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaBorder.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaBorder.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaBorder.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaButtonBorder.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonBorder.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaButtonBorder.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonBorder.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaButtonCheckBoxUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonCheckBoxUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaButtonCheckBoxUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonCheckBoxUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaButtonExtendedTypes.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonExtendedTypes.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaButtonExtendedTypes.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonExtendedTypes.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaButtonLabeledUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonLabeledUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaButtonLabeledUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonLabeledUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaButtonRadioUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonRadioUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaButtonRadioUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonRadioUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaButtonToggleUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonToggleUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaButtonToggleUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonToggleUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaButtonUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaButtonUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaCaret.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaCaret.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaCaret.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaCaret.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxButton.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxButton.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaComboBoxButton.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxButton.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxPopup.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxPopup.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaComboBoxPopup.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxPopup.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxRenderer.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxRenderer.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaComboBoxRenderer.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxRenderer.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxRendererInternal.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxRendererInternal.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaComboBoxRendererInternal.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxRendererInternal.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaComboBoxUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaEditorPaneUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaEditorPaneUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaEditorPaneUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaEditorPaneUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaFileChooserUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaFileChooserUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaFileChooserUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaFileChooserUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaFileSystemModel.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaFileSystemModel.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaFileSystemModel.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaFileSystemModel.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaFileView.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaFileView.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaFileView.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaFileView.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaFocus.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaFocus.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaFocus.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaFocus.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaFocusHandler.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaFocusHandler.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaFocusHandler.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaFocusHandler.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaFonts.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaFonts.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaFonts.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaFonts.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaGroupBorder.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaGroupBorder.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaGroupBorder.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaGroupBorder.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaHighlighter.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaHighlighter.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaHighlighter.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaHighlighter.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaIcon.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaIcon.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaIcon.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaIcon.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaImageFactory.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaImageFactory.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaImageFactory.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaImageFactory.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaInternalFrameBorder.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameBorder.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaInternalFrameBorder.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameBorder.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaInternalFrameBorderMetrics.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameBorderMetrics.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaInternalFrameBorderMetrics.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameBorderMetrics.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaInternalFrameDockIconUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameDockIconUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaInternalFrameDockIconUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameDockIconUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaInternalFrameManager.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameManager.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaInternalFrameManager.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameManager.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaInternalFramePaneUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFramePaneUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaInternalFramePaneUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFramePaneUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaInternalFrameUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaInternalFrameUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaKeyBindings.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaKeyBindings.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaKeyBindings.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaKeyBindings.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaLabelUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaLabelUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaLabelUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaLabelUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaListUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaListUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaListUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaListUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaLookAndFeel.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaLookAndFeel.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaLookAndFeel.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaLookAndFeel.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaMenuBarBorder.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarBorder.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaMenuBarBorder.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarBorder.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaMenuBarUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaMenuBarUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaMenuBorder.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBorder.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaMenuBorder.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBorder.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaMenuItemUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuItemUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaMenuItemUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuItemUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaMenuPainter.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuPainter.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaMenuPainter.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuPainter.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaMenuUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaMenuUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaMnemonicHandler.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMnemonicHandler.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaMnemonicHandler.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMnemonicHandler.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaNativeResources.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaNativeResources.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaNativeResources.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaNativeResources.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaOptionPaneUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaOptionPaneUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaOptionPaneUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaOptionPaneUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaPainter.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaPainter.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaPainter.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaPainter.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaPanelUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaPanelUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaPanelUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaPanelUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaPopupMenuSeparatorUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaPopupMenuSeparatorUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaPopupMenuSeparatorUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaPopupMenuSeparatorUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaPopupMenuUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaPopupMenuUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaPopupMenuUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaPopupMenuUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaProgressBarUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaProgressBarUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaProgressBarUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaProgressBarUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaRootPaneUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaRootPaneUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaRootPaneUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaRootPaneUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaScrollBarUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollBarUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaScrollBarUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollBarUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaScrollPaneUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollPaneUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaScrollPaneUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollPaneUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaScrollRegionBorder.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollRegionBorder.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaScrollRegionBorder.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollRegionBorder.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaSliderUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaSliderUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaSliderUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaSliderUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaSpinnerUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaSpinnerUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaSpinnerUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaSpinnerUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaSplitPaneDividerUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaSplitPaneDividerUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaSplitPaneDividerUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaSplitPaneDividerUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaSplitPaneUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaSplitPaneUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaSplitPaneUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaSplitPaneUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaTabbedPaneContrastUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneContrastUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaTabbedPaneContrastUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneContrastUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaTabbedPaneTabState.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneTabState.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaTabbedPaneTabState.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneTabState.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaTabbedPaneUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaTabbedPaneUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaTableHeaderBorder.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTableHeaderBorder.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaTableHeaderBorder.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTableHeaderBorder.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaTableHeaderUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTableHeaderUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaTableHeaderUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTableHeaderUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaTableUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTableUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaTableUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTableUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaTextAreaUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTextAreaUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaTextAreaUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTextAreaUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaTextFieldBorder.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldBorder.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaTextFieldBorder.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldBorder.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaTextFieldFormattedUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldFormattedUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaTextFieldFormattedUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldFormattedUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaTextFieldSearch.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldSearch.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaTextFieldSearch.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldSearch.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaTextFieldUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaTextFieldUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaTextPaneUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTextPaneUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaTextPaneUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTextPaneUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaTextPasswordFieldUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTextPasswordFieldUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaTextPasswordFieldUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTextPasswordFieldUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaToolBarSeparatorUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaToolBarSeparatorUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaToolBarSeparatorUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaToolBarSeparatorUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaToolBarUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaToolBarUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaToolBarUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaToolBarUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaToolTipUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaToolTipUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaToolTipUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaToolTipUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaTreeUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTreeUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaTreeUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTreeUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaUtilControlSize.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaUtilControlSize.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaUtilControlSize.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaUtilControlSize.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaUtils.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaUtils.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/AquaUtils.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaUtils.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/ClientPropertyApplicator.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/ClientPropertyApplicator.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/ClientPropertyApplicator.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/ClientPropertyApplicator.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/ScreenMenu.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenu.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/ScreenMenu.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenu.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/ScreenMenuBar.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuBar.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/ScreenMenuBar.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuBar.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/ScreenMenuBarProvider.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuBarProvider.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/ScreenMenuBarProvider.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuBarProvider.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/ScreenMenuItem.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuItem.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/ScreenMenuItem.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuItem.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/ScreenMenuItemCheckbox.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuItemCheckbox.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/ScreenMenuItemCheckbox.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuItemCheckbox.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/ScreenMenuItemUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuItemUI.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/ScreenMenuItemUI.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuItemUI.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/ScreenMenuPropertyHandler.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuPropertyHandler.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/ScreenMenuPropertyHandler.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuPropertyHandler.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/ScreenMenuPropertyListener.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuPropertyListener.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/ScreenMenuPropertyListener.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuPropertyListener.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/ScreenPopupFactory.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenPopupFactory.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/ScreenPopupFactory.java
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenPopupFactory.java
diff --git a/jdk/src/macosx/classes/com/apple/laf/resources/aqua.properties b/jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua.properties
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/resources/aqua.properties
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua.properties
diff --git a/jdk/src/macosx/classes/com/apple/laf/resources/aqua_de.properties b/jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_de.properties
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/resources/aqua_de.properties
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_de.properties
diff --git a/jdk/src/macosx/classes/com/apple/laf/resources/aqua_es.properties b/jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_es.properties
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/resources/aqua_es.properties
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_es.properties
diff --git a/jdk/src/macosx/classes/com/apple/laf/resources/aqua_fr.properties b/jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_fr.properties
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/resources/aqua_fr.properties
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_fr.properties
diff --git a/jdk/src/macosx/classes/com/apple/laf/resources/aqua_it.properties b/jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_it.properties
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/resources/aqua_it.properties
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_it.properties
diff --git a/jdk/src/macosx/classes/com/apple/laf/resources/aqua_ja.properties b/jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_ja.properties
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/resources/aqua_ja.properties
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_ja.properties
diff --git a/jdk/src/macosx/classes/com/apple/laf/resources/aqua_ko.properties b/jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_ko.properties
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/resources/aqua_ko.properties
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_ko.properties
diff --git a/jdk/src/macosx/classes/com/apple/laf/resources/aqua_pt_BR.properties b/jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_pt_BR.properties
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/resources/aqua_pt_BR.properties
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_pt_BR.properties
diff --git a/jdk/src/macosx/classes/com/apple/laf/resources/aqua_sv.properties b/jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_sv.properties
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/resources/aqua_sv.properties
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_sv.properties
diff --git a/jdk/src/macosx/classes/com/apple/laf/resources/aqua_zh_CN.properties b/jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_zh_CN.properties
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/resources/aqua_zh_CN.properties
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_zh_CN.properties
diff --git a/jdk/src/macosx/classes/com/apple/laf/resources/aqua_zh_TW.properties b/jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_zh_TW.properties
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/laf/resources/aqua_zh_TW.properties
rename to jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_zh_TW.properties
diff --git a/jdk/src/macosx/classes/sun/awt/CGraphicsConfig.java b/jdk/src/java.desktop/macosx/classes/sun/awt/CGraphicsConfig.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/awt/CGraphicsConfig.java
rename to jdk/src/java.desktop/macosx/classes/sun/awt/CGraphicsConfig.java
diff --git a/jdk/src/macosx/classes/sun/awt/CGraphicsDevice.java b/jdk/src/java.desktop/macosx/classes/sun/awt/CGraphicsDevice.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/awt/CGraphicsDevice.java
rename to jdk/src/java.desktop/macosx/classes/sun/awt/CGraphicsDevice.java
diff --git a/jdk/src/macosx/classes/sun/awt/CGraphicsEnvironment.java b/jdk/src/java.desktop/macosx/classes/sun/awt/CGraphicsEnvironment.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/awt/CGraphicsEnvironment.java
rename to jdk/src/java.desktop/macosx/classes/sun/awt/CGraphicsEnvironment.java
diff --git a/jdk/src/macosx/classes/sun/awt/FullScreenCapable.java b/jdk/src/java.desktop/macosx/classes/sun/awt/FullScreenCapable.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/awt/FullScreenCapable.java
rename to jdk/src/java.desktop/macosx/classes/sun/awt/FullScreenCapable.java
diff --git a/jdk/src/macosx/classes/sun/datatransfer/resources/flavormap.properties b/jdk/src/java.desktop/macosx/classes/sun/awt/datatransfer/flavormap.properties
similarity index 100%
rename from jdk/src/macosx/classes/sun/datatransfer/resources/flavormap.properties
rename to jdk/src/java.desktop/macosx/classes/sun/awt/datatransfer/flavormap.properties
diff --git a/jdk/src/macosx/classes/sun/awt/resources/awtosx.properties b/jdk/src/java.desktop/macosx/classes/sun/awt/resources/awtosx.properties
similarity index 100%
rename from jdk/src/macosx/classes/sun/awt/resources/awtosx.properties
rename to jdk/src/java.desktop/macosx/classes/sun/awt/resources/awtosx.properties
diff --git a/jdk/src/macosx/classes/sun/font/CCharToGlyphMapper.java b/jdk/src/java.desktop/macosx/classes/sun/font/CCharToGlyphMapper.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/font/CCharToGlyphMapper.java
rename to jdk/src/java.desktop/macosx/classes/sun/font/CCharToGlyphMapper.java
diff --git a/jdk/src/macosx/classes/sun/font/CFont.java b/jdk/src/java.desktop/macosx/classes/sun/font/CFont.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/font/CFont.java
rename to jdk/src/java.desktop/macosx/classes/sun/font/CFont.java
diff --git a/jdk/src/macosx/classes/sun/font/CFontConfiguration.java b/jdk/src/java.desktop/macosx/classes/sun/font/CFontConfiguration.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/font/CFontConfiguration.java
rename to jdk/src/java.desktop/macosx/classes/sun/font/CFontConfiguration.java
diff --git a/jdk/src/macosx/classes/sun/font/CFontManager.java b/jdk/src/java.desktop/macosx/classes/sun/font/CFontManager.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/font/CFontManager.java
rename to jdk/src/java.desktop/macosx/classes/sun/font/CFontManager.java
diff --git a/jdk/src/macosx/classes/sun/font/CStrike.java b/jdk/src/java.desktop/macosx/classes/sun/font/CStrike.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/font/CStrike.java
rename to jdk/src/java.desktop/macosx/classes/sun/font/CStrike.java
diff --git a/jdk/src/macosx/classes/sun/font/CStrikeDisposer.java b/jdk/src/java.desktop/macosx/classes/sun/font/CStrikeDisposer.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/font/CStrikeDisposer.java
rename to jdk/src/java.desktop/macosx/classes/sun/font/CStrikeDisposer.java
diff --git a/jdk/src/macosx/classes/sun/java2d/BackBufferCapsProvider.java b/jdk/src/java.desktop/macosx/classes/sun/java2d/BackBufferCapsProvider.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/java2d/BackBufferCapsProvider.java
rename to jdk/src/java.desktop/macosx/classes/sun/java2d/BackBufferCapsProvider.java
diff --git a/jdk/src/macosx/classes/sun/java2d/CRenderer.java b/jdk/src/java.desktop/macosx/classes/sun/java2d/CRenderer.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/java2d/CRenderer.java
rename to jdk/src/java.desktop/macosx/classes/sun/java2d/CRenderer.java
diff --git a/jdk/src/macosx/classes/sun/java2d/CompositeCRenderer.java b/jdk/src/java.desktop/macosx/classes/sun/java2d/CompositeCRenderer.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/java2d/CompositeCRenderer.java
rename to jdk/src/java.desktop/macosx/classes/sun/java2d/CompositeCRenderer.java
diff --git a/jdk/src/macosx/classes/sun/java2d/DataBufferNIOInt.java b/jdk/src/java.desktop/macosx/classes/sun/java2d/DataBufferNIOInt.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/java2d/DataBufferNIOInt.java
rename to jdk/src/java.desktop/macosx/classes/sun/java2d/DataBufferNIOInt.java
diff --git a/jdk/src/macosx/classes/sun/java2d/IntegerNIORaster.java b/jdk/src/java.desktop/macosx/classes/sun/java2d/IntegerNIORaster.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/java2d/IntegerNIORaster.java
rename to jdk/src/java.desktop/macosx/classes/sun/java2d/IntegerNIORaster.java
diff --git a/jdk/src/macosx/classes/sun/java2d/MacosxSurfaceManagerFactory.java b/jdk/src/java.desktop/macosx/classes/sun/java2d/MacosxSurfaceManagerFactory.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/java2d/MacosxSurfaceManagerFactory.java
rename to jdk/src/java.desktop/macosx/classes/sun/java2d/MacosxSurfaceManagerFactory.java
diff --git a/jdk/src/macosx/classes/sun/java2d/OSXOffScreenSurfaceData.java b/jdk/src/java.desktop/macosx/classes/sun/java2d/OSXOffScreenSurfaceData.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/java2d/OSXOffScreenSurfaceData.java
rename to jdk/src/java.desktop/macosx/classes/sun/java2d/OSXOffScreenSurfaceData.java
diff --git a/jdk/src/macosx/classes/sun/java2d/OSXSurfaceData.java b/jdk/src/java.desktop/macosx/classes/sun/java2d/OSXSurfaceData.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/java2d/OSXSurfaceData.java
rename to jdk/src/java.desktop/macosx/classes/sun/java2d/OSXSurfaceData.java
diff --git a/jdk/src/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java b/jdk/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java
rename to jdk/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java
diff --git a/jdk/src/macosx/classes/sun/java2d/opengl/CGLLayer.java b/jdk/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLLayer.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/java2d/opengl/CGLLayer.java
rename to jdk/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLLayer.java
diff --git a/jdk/src/macosx/classes/sun/java2d/opengl/CGLSurfaceData.java b/jdk/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLSurfaceData.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/java2d/opengl/CGLSurfaceData.java
rename to jdk/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLSurfaceData.java
diff --git a/jdk/src/macosx/classes/sun/java2d/opengl/CGLVolatileSurfaceManager.java b/jdk/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLVolatileSurfaceManager.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/java2d/opengl/CGLVolatileSurfaceManager.java
rename to jdk/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLVolatileSurfaceManager.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/LWButtonPeer.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWButtonPeer.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/LWButtonPeer.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/LWButtonPeer.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/LWCanvasPeer.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWCanvasPeer.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/LWCanvasPeer.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/LWCanvasPeer.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/LWCheckboxPeer.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWCheckboxPeer.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/LWCheckboxPeer.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/LWCheckboxPeer.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/LWChoicePeer.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWChoicePeer.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/LWChoicePeer.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/LWChoicePeer.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/LWComponentPeer.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWComponentPeer.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/LWComponentPeer.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/LWComponentPeer.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/LWContainerPeer.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWContainerPeer.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/LWContainerPeer.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/LWContainerPeer.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/LWCursorManager.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWCursorManager.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/LWCursorManager.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/LWCursorManager.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/LWGraphicsConfig.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWGraphicsConfig.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/LWGraphicsConfig.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/LWGraphicsConfig.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/LWKeyboardFocusManagerPeer.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWKeyboardFocusManagerPeer.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/LWKeyboardFocusManagerPeer.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/LWKeyboardFocusManagerPeer.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/LWLabelPeer.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWLabelPeer.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/LWLabelPeer.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/LWLabelPeer.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/LWLightweightFramePeer.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWLightweightFramePeer.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/LWLightweightFramePeer.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/LWLightweightFramePeer.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/LWListPeer.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWListPeer.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/LWListPeer.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/LWListPeer.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/LWMouseInfoPeer.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWMouseInfoPeer.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/LWMouseInfoPeer.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/LWMouseInfoPeer.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/LWPanelPeer.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWPanelPeer.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/LWPanelPeer.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/LWPanelPeer.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/LWRepaintArea.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWRepaintArea.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/LWRepaintArea.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/LWRepaintArea.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/LWScrollBarPeer.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWScrollBarPeer.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/LWScrollBarPeer.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/LWScrollBarPeer.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/LWScrollPanePeer.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWScrollPanePeer.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/LWScrollPanePeer.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/LWScrollPanePeer.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/LWTextAreaPeer.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWTextAreaPeer.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/LWTextAreaPeer.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/LWTextAreaPeer.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/LWTextComponentPeer.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWTextComponentPeer.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/LWTextComponentPeer.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/LWTextComponentPeer.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/LWTextFieldPeer.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWTextFieldPeer.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/LWTextFieldPeer.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/LWTextFieldPeer.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/LWToolkit.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWToolkit.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/LWToolkit.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/LWToolkit.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/LWWindowPeer.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWWindowPeer.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/LWWindowPeer.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/LWWindowPeer.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/PlatformComponent.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/PlatformComponent.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/PlatformComponent.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/PlatformComponent.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/PlatformDropTarget.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/PlatformDropTarget.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/PlatformDropTarget.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/PlatformDropTarget.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/PlatformEventNotifier.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/PlatformEventNotifier.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/PlatformEventNotifier.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/PlatformEventNotifier.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/PlatformWindow.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/PlatformWindow.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/PlatformWindow.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/PlatformWindow.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/SecurityWarningWindow.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/SecurityWarningWindow.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/SecurityWarningWindow.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/SecurityWarningWindow.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CAccessibility.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibility.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CAccessibility.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibility.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CAccessible.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessible.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CAccessible.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessible.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CAccessibleText.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibleText.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CAccessibleText.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibleText.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CCheckboxMenuItem.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CCheckboxMenuItem.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CCheckboxMenuItem.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CCheckboxMenuItem.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CClipboard.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CClipboard.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CClipboard.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CClipboard.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CCursorManager.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CCursorManager.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CCursorManager.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CCursorManager.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CCustomCursor.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CCustomCursor.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CCustomCursor.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CCustomCursor.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CDataTransferer.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDataTransferer.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CDataTransferer.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDataTransferer.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CDesktopPeer.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDesktopPeer.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CDesktopPeer.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDesktopPeer.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CDragSourceContextPeer.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDragSourceContextPeer.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CDragSourceContextPeer.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDragSourceContextPeer.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CDropTarget.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDropTarget.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CDropTarget.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDropTarget.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CFRetainedResource.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CFRetainedResource.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CFRetainedResource.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CFRetainedResource.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CFileDialog.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CFileDialog.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CFileDialog.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CFileDialog.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CImage.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CImage.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CImage.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CImage.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CInputMethod.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethod.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CInputMethod.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethod.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CInputMethodDescriptor.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethodDescriptor.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CInputMethodDescriptor.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethodDescriptor.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CMenu.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CMenu.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CMenu.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CMenu.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CMenuBar.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CMenuBar.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CMenuBar.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CMenuBar.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CMenuComponent.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CMenuComponent.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CMenuComponent.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CMenuComponent.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CMenuItem.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CMenuItem.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CMenuItem.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CMenuItem.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CMouseDragGestureRecognizer.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CMouseDragGestureRecognizer.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CMouseDragGestureRecognizer.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CMouseDragGestureRecognizer.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformComponent.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformComponent.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformComponent.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformComponent.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformLWComponent.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformLWComponent.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformLWComponent.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformLWComponent.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformLWView.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformLWView.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformLWView.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformLWView.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformLWWindow.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformLWWindow.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformLWWindow.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformLWWindow.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformView.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformView.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformView.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformView.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPopupMenu.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPopupMenu.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CPopupMenu.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPopupMenu.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterDevice.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterDevice.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterDevice.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterDevice.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterDialog.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterDialog.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterDialog.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterDialog.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterDialogPeer.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterDialogPeer.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterDialogPeer.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterDialogPeer.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterGraphics.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterGraphics.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterGraphics.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterGraphics.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterGraphicsConfig.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterGraphicsConfig.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterGraphicsConfig.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterGraphicsConfig.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterJob.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJob.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterJob.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJob.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterJobDialog.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJobDialog.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterJobDialog.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJobDialog.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterPageDialog.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterPageDialog.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterPageDialog.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterPageDialog.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterSurfaceData.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterSurfaceData.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterSurfaceData.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterSurfaceData.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CRobot.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CRobot.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CRobot.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CRobot.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CSystemTray.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CSystemTray.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CSystemTray.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CSystemTray.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CTextPipe.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTextPipe.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CTextPipe.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTextPipe.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CToolkitThreadBlockedHandler.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CToolkitThreadBlockedHandler.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CToolkitThreadBlockedHandler.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CToolkitThreadBlockedHandler.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CTrayIcon.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTrayIcon.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CTrayIcon.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTrayIcon.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CViewEmbeddedFrame.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CViewEmbeddedFrame.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CViewEmbeddedFrame.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CViewEmbeddedFrame.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CViewPlatformEmbeddedFrame.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CViewPlatformEmbeddedFrame.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CViewPlatformEmbeddedFrame.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CViewPlatformEmbeddedFrame.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CWarningWindow.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CWarningWindow.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CWarningWindow.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CWarningWindow.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CWrapper.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CWrapper.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CWrapper.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CWrapper.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CocoaConstants.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CocoaConstants.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/CocoaConstants.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CocoaConstants.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/NSEvent.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/NSEvent.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/NSEvent.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/NSEvent.java
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/NSPrintInfo.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/NSPrintInfo.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/lwawt/macosx/NSPrintInfo.java
rename to jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/NSPrintInfo.java
diff --git a/jdk/src/macosx/javavm/export/jawt_md.h b/jdk/src/java.desktop/macosx/native/include/jawt_md.h
similarity index 100%
rename from jdk/src/macosx/javavm/export/jawt_md.h
rename to jdk/src/java.desktop/macosx/native/include/jawt_md.h
diff --git a/jdk/src/macosx/native/sun/awt/AWTEvent.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTEvent.h
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/AWTEvent.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTEvent.h
diff --git a/jdk/src/macosx/native/sun/awt/AWTEvent.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTEvent.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/AWTEvent.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTEvent.m
diff --git a/jdk/src/macosx/native/sun/awt/AWTSurfaceLayers.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTSurfaceLayers.h
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/AWTSurfaceLayers.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTSurfaceLayers.h
diff --git a/jdk/src/macosx/native/sun/awt/AWTSurfaceLayers.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTSurfaceLayers.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/AWTSurfaceLayers.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTSurfaceLayers.m
diff --git a/jdk/src/macosx/native/sun/awt/AWTView.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTView.h
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/AWTView.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTView.h
diff --git a/jdk/src/macosx/native/sun/awt/AWTView.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTView.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/AWTView.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTView.m
diff --git a/jdk/src/macosx/native/sun/awt/AWTWindow.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTWindow.h
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/AWTWindow.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTWindow.h
diff --git a/jdk/src/macosx/native/sun/awt/AWTWindow.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTWindow.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/AWTWindow.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTWindow.m
diff --git a/jdk/src/macosx/native/sun/awt/ApplicationDelegate.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/ApplicationDelegate.h
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/ApplicationDelegate.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/ApplicationDelegate.h
diff --git a/jdk/src/macosx/native/sun/awt/ApplicationDelegate.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/ApplicationDelegate.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/ApplicationDelegate.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/ApplicationDelegate.m
diff --git a/jdk/src/macosx/native/sun/awt/CClipboard.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CClipboard.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CClipboard.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CClipboard.m
diff --git a/jdk/src/macosx/native/sun/awt/CCursorManager.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CCursorManager.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CCursorManager.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CCursorManager.m
diff --git a/jdk/src/macosx/native/sun/awt/CDataTransferer.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDataTransferer.h
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CDataTransferer.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDataTransferer.h
diff --git a/jdk/src/macosx/native/sun/awt/CDataTransferer.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDataTransferer.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CDataTransferer.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDataTransferer.m
diff --git a/jdk/src/macosx/native/sun/awt/CDesktopPeer.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDesktopPeer.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CDesktopPeer.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDesktopPeer.m
diff --git a/jdk/src/macosx/native/sun/awt/CDragSource.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDragSource.h
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CDragSource.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDragSource.h
diff --git a/jdk/src/macosx/native/sun/awt/CDragSource.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDragSource.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CDragSource.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDragSource.m
diff --git a/jdk/src/macosx/native/sun/awt/CDragSourceContextPeer.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDragSourceContextPeer.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CDragSourceContextPeer.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDragSourceContextPeer.m
diff --git a/jdk/src/macosx/native/sun/awt/CDropTarget.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDropTarget.h
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CDropTarget.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDropTarget.h
diff --git a/jdk/src/macosx/native/sun/awt/CDropTarget.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDropTarget.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CDropTarget.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDropTarget.m
diff --git a/jdk/src/macosx/native/sun/awt/CDropTargetContextPeer.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDropTargetContextPeer.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CDropTargetContextPeer.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDropTargetContextPeer.m
diff --git a/jdk/src/macosx/native/sun/awt/CFRetainedResource.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CFRetainedResource.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CFRetainedResource.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CFRetainedResource.m
diff --git a/jdk/src/macosx/native/sun/awt/CFileDialog.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CFileDialog.h
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CFileDialog.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CFileDialog.h
diff --git a/jdk/src/macosx/native/sun/awt/CFileDialog.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CFileDialog.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CFileDialog.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CFileDialog.m
diff --git a/jdk/src/macosx/native/sun/awt/CGraphicsConfig.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CGraphicsConfig.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CGraphicsConfig.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CGraphicsConfig.m
diff --git a/jdk/src/macosx/native/sun/awt/CGraphicsDevice.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CGraphicsDevice.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CGraphicsDevice.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CGraphicsDevice.m
diff --git a/jdk/src/macosx/native/sun/awt/CGraphicsEnv.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CGraphicsEnv.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CGraphicsEnv.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CGraphicsEnv.m
diff --git a/jdk/src/macosx/native/sun/awt/CImage.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CImage.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CImage.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CImage.m
diff --git a/jdk/src/macosx/native/sun/awt/CInputMethod.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CInputMethod.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CInputMethod.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CInputMethod.m
diff --git a/jdk/src/macosx/native/sun/awt/CMenu.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenu.h
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CMenu.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenu.h
diff --git a/jdk/src/macosx/native/sun/awt/CMenu.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenu.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CMenu.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenu.m
diff --git a/jdk/src/macosx/native/sun/awt/CMenuBar.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuBar.h
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CMenuBar.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuBar.h
diff --git a/jdk/src/macosx/native/sun/awt/CMenuBar.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuBar.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CMenuBar.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuBar.m
diff --git a/jdk/src/macosx/native/sun/awt/CMenuComponent.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuComponent.h
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CMenuComponent.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuComponent.h
diff --git a/jdk/src/macosx/native/sun/awt/CMenuComponent.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuComponent.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CMenuComponent.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuComponent.m
diff --git a/jdk/src/macosx/native/sun/awt/CMenuItem.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuItem.h
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CMenuItem.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuItem.h
diff --git a/jdk/src/macosx/native/sun/awt/CMenuItem.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuItem.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CMenuItem.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuItem.m
diff --git a/jdk/src/macosx/native/sun/awt/CPopupMenu.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CPopupMenu.h
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CPopupMenu.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CPopupMenu.h
diff --git a/jdk/src/macosx/native/sun/awt/CPopupMenu.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CPopupMenu.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CPopupMenu.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CPopupMenu.m
diff --git a/jdk/src/macosx/native/sun/awt/CPrinterJob.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CPrinterJob.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CPrinterJob.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CPrinterJob.m
diff --git a/jdk/src/macosx/native/sun/awt/CRobot.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CRobot.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CRobot.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CRobot.m
diff --git a/jdk/src/macosx/native/sun/awt/CSystemColors.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CSystemColors.h
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CSystemColors.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CSystemColors.h
diff --git a/jdk/src/macosx/native/sun/awt/CSystemColors.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CSystemColors.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CSystemColors.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CSystemColors.m
diff --git a/jdk/src/macosx/native/sun/awt/CTextPipe.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CTextPipe.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CTextPipe.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CTextPipe.m
diff --git a/jdk/src/macosx/native/sun/awt/CTrayIcon.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CTrayIcon.h
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CTrayIcon.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CTrayIcon.h
diff --git a/jdk/src/macosx/native/sun/awt/CTrayIcon.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CTrayIcon.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CTrayIcon.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CTrayIcon.m
diff --git a/jdk/src/macosx/native/sun/awt/CWrapper.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CWrapper.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/CWrapper.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CWrapper.m
diff --git a/jdk/src/macosx/native/sun/awt/DnDUtilities.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/DnDUtilities.h
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/DnDUtilities.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/DnDUtilities.h
diff --git a/jdk/src/macosx/native/sun/awt/DnDUtilities.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/DnDUtilities.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/DnDUtilities.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/DnDUtilities.m
diff --git a/jdk/src/macosx/native/sun/awt/GeomUtilities.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/GeomUtilities.h
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/GeomUtilities.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/GeomUtilities.h
diff --git a/jdk/src/macosx/native/sun/awt/GeomUtilities.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/GeomUtilities.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/GeomUtilities.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/GeomUtilities.m
diff --git a/jdk/src/macosx/native/sun/awt/ImageSurfaceData.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/ImageSurfaceData.h
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/ImageSurfaceData.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/ImageSurfaceData.h
diff --git a/jdk/src/macosx/native/sun/awt/ImageSurfaceData.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/ImageSurfaceData.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/ImageSurfaceData.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/ImageSurfaceData.m
diff --git a/jdk/src/macosx/native/sun/awt/InitIDs.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/InitIDs.h
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/InitIDs.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/InitIDs.h
diff --git a/jdk/src/macosx/native/sun/awt/InitIDs.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/InitIDs.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/InitIDs.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/InitIDs.m
diff --git a/jdk/src/macosx/native/sun/awt/JavaAccessibilityAction.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaAccessibilityAction.h
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/JavaAccessibilityAction.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaAccessibilityAction.h
diff --git a/jdk/src/macosx/native/sun/awt/JavaAccessibilityAction.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaAccessibilityAction.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/JavaAccessibilityAction.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaAccessibilityAction.m
diff --git a/jdk/src/macosx/native/sun/awt/JavaAccessibilityUtilities.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaAccessibilityUtilities.h
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/JavaAccessibilityUtilities.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaAccessibilityUtilities.h
diff --git a/jdk/src/macosx/native/sun/awt/JavaAccessibilityUtilities.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaAccessibilityUtilities.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/JavaAccessibilityUtilities.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaAccessibilityUtilities.m
diff --git a/jdk/src/macosx/native/sun/awt/JavaComponentAccessibility.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaComponentAccessibility.h
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/JavaComponentAccessibility.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaComponentAccessibility.h
diff --git a/jdk/src/macosx/native/sun/awt/JavaComponentAccessibility.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaComponentAccessibility.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/JavaComponentAccessibility.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaComponentAccessibility.m
diff --git a/jdk/src/macosx/native/sun/awt/JavaTextAccessibility.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaTextAccessibility.h
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/JavaTextAccessibility.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaTextAccessibility.h
diff --git a/jdk/src/macosx/native/sun/awt/JavaTextAccessibility.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaTextAccessibility.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/JavaTextAccessibility.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaTextAccessibility.m
diff --git a/jdk/src/macosx/native/sun/awt/LWCToolkit.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/LWCToolkit.h
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/LWCToolkit.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/LWCToolkit.h
diff --git a/jdk/src/macosx/native/sun/awt/LWCToolkit.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/LWCToolkit.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/LWCToolkit.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/LWCToolkit.m
diff --git a/jdk/src/macosx/native/sun/awt/OSVersion.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/OSVersion.h
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/OSVersion.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/OSVersion.h
diff --git a/jdk/src/macosx/native/sun/awt/OSVersion.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/OSVersion.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/OSVersion.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/OSVersion.m
diff --git a/jdk/src/macosx/native/sun/awt/PrintModel.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrintModel.h
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/PrintModel.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrintModel.h
diff --git a/jdk/src/macosx/native/sun/awt/PrintModel.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrintModel.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/PrintModel.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrintModel.m
diff --git a/jdk/src/macosx/native/sun/awt/PrinterSurfaceData.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrinterSurfaceData.h
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/PrinterSurfaceData.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrinterSurfaceData.h
diff --git a/jdk/src/macosx/native/sun/awt/PrinterSurfaceData.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrinterSurfaceData.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/PrinterSurfaceData.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrinterSurfaceData.m
diff --git a/jdk/src/macosx/native/sun/awt/PrinterView.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrinterView.h
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/PrinterView.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrinterView.h
diff --git a/jdk/src/macosx/native/sun/awt/PrinterView.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrinterView.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/PrinterView.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrinterView.m
diff --git a/jdk/src/macosx/native/sun/awt/QuartzRenderer.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/QuartzRenderer.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/QuartzRenderer.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/QuartzRenderer.m
diff --git a/jdk/src/macosx/native/sun/awt/QuartzSurfaceData.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/QuartzSurfaceData.h
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/QuartzSurfaceData.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/QuartzSurfaceData.h
diff --git a/jdk/src/macosx/native/sun/awt/QuartzSurfaceData.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/QuartzSurfaceData.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/QuartzSurfaceData.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/QuartzSurfaceData.m
diff --git a/jdk/src/macosx/native/sun/awt/awt_DrawingSurface.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/awt_DrawingSurface.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/awt_DrawingSurface.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/awt_DrawingSurface.m
diff --git a/jdk/src/macosx/native/sun/font/AWTFont.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/AWTFont.h
similarity index 100%
rename from jdk/src/macosx/native/sun/font/AWTFont.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/AWTFont.h
diff --git a/jdk/src/macosx/native/sun/font/AWTFont.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/AWTFont.m
similarity index 100%
rename from jdk/src/macosx/native/sun/font/AWTFont.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/AWTFont.m
diff --git a/jdk/src/macosx/native/sun/font/AWTStrike.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/AWTStrike.h
similarity index 100%
rename from jdk/src/macosx/native/sun/font/AWTStrike.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/AWTStrike.h
diff --git a/jdk/src/macosx/native/sun/font/AWTStrike.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/AWTStrike.m
similarity index 100%
rename from jdk/src/macosx/native/sun/font/AWTStrike.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/AWTStrike.m
diff --git a/jdk/src/macosx/native/sun/font/CCharToGlyphMapper.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/CCharToGlyphMapper.m
similarity index 100%
rename from jdk/src/macosx/native/sun/font/CCharToGlyphMapper.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/CCharToGlyphMapper.m
diff --git a/jdk/src/macosx/native/sun/font/CGGlyphImages.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/CGGlyphImages.h
similarity index 100%
rename from jdk/src/macosx/native/sun/font/CGGlyphImages.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/CGGlyphImages.h
diff --git a/jdk/src/macosx/native/sun/font/CGGlyphImages.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/CGGlyphImages.m
similarity index 100%
rename from jdk/src/macosx/native/sun/font/CGGlyphImages.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/CGGlyphImages.m
diff --git a/jdk/src/macosx/native/sun/font/CGGlyphOutlines.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/CGGlyphOutlines.h
similarity index 100%
rename from jdk/src/macosx/native/sun/font/CGGlyphOutlines.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/CGGlyphOutlines.h
diff --git a/jdk/src/macosx/native/sun/font/CGGlyphOutlines.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/CGGlyphOutlines.m
similarity index 100%
rename from jdk/src/macosx/native/sun/font/CGGlyphOutlines.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/CGGlyphOutlines.m
diff --git a/jdk/src/macosx/native/sun/font/CoreTextSupport.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/CoreTextSupport.h
similarity index 100%
rename from jdk/src/macosx/native/sun/font/CoreTextSupport.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/CoreTextSupport.h
diff --git a/jdk/src/macosx/native/sun/font/CoreTextSupport.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/CoreTextSupport.m
similarity index 100%
rename from jdk/src/macosx/native/sun/font/CoreTextSupport.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/CoreTextSupport.m
diff --git a/jdk/src/macosx/native/sun/java2d/opengl/CGLGraphicsConfig.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/CGLGraphicsConfig.h
similarity index 100%
rename from jdk/src/macosx/native/sun/java2d/opengl/CGLGraphicsConfig.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/CGLGraphicsConfig.h
diff --git a/jdk/src/macosx/native/sun/java2d/opengl/CGLGraphicsConfig.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/CGLGraphicsConfig.m
similarity index 100%
rename from jdk/src/macosx/native/sun/java2d/opengl/CGLGraphicsConfig.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/CGLGraphicsConfig.m
diff --git a/jdk/src/macosx/native/sun/java2d/opengl/CGLLayer.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/CGLLayer.h
similarity index 100%
rename from jdk/src/macosx/native/sun/java2d/opengl/CGLLayer.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/CGLLayer.h
diff --git a/jdk/src/macosx/native/sun/java2d/opengl/CGLLayer.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/CGLLayer.m
similarity index 100%
rename from jdk/src/macosx/native/sun/java2d/opengl/CGLLayer.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/CGLLayer.m
diff --git a/jdk/src/macosx/native/sun/java2d/opengl/CGLSurfaceData.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/CGLSurfaceData.h
similarity index 100%
rename from jdk/src/macosx/native/sun/java2d/opengl/CGLSurfaceData.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/CGLSurfaceData.h
diff --git a/jdk/src/macosx/native/sun/java2d/opengl/CGLSurfaceData.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/CGLSurfaceData.m
similarity index 100%
rename from jdk/src/macosx/native/sun/java2d/opengl/CGLSurfaceData.m
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/CGLSurfaceData.m
diff --git a/jdk/src/macosx/native/sun/java2d/opengl/J2D_GL/cglext.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/J2D_GL/cglext.h
similarity index 100%
rename from jdk/src/macosx/native/sun/java2d/opengl/J2D_GL/cglext.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/J2D_GL/cglext.h
diff --git a/jdk/src/macosx/native/sun/java2d/opengl/OGLFuncs_md.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/OGLFuncs_md.h
similarity index 100%
rename from jdk/src/macosx/native/sun/java2d/opengl/OGLFuncs_md.h
rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/OGLFuncs_md.h
diff --git a/jdk/src/macosx/native/sun/awt/jawt.m b/jdk/src/java.desktop/macosx/native/libjawt/jawt.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/jawt.m
rename to jdk/src/java.desktop/macosx/native/libjawt/jawt.m
diff --git a/jdk/src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_MidiIn.c b/jdk/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_MidiIn.c
similarity index 100%
rename from jdk/src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_MidiIn.c
rename to jdk/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_MidiIn.c
diff --git a/jdk/src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_MidiOut.c b/jdk/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_MidiOut.c
similarity index 100%
rename from jdk/src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_MidiOut.c
rename to jdk/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_MidiOut.c
diff --git a/jdk/src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_MidiUtils.c b/jdk/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_MidiUtils.c
similarity index 100%
rename from jdk/src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_MidiUtils.c
rename to jdk/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_MidiUtils.c
diff --git a/jdk/src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_MidiUtils.h b/jdk/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_MidiUtils.h
similarity index 100%
rename from jdk/src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_MidiUtils.h
rename to jdk/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_MidiUtils.h
diff --git a/jdk/src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_PCM.cpp b/jdk/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_PCM.cpp
similarity index 100%
rename from jdk/src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_PCM.cpp
rename to jdk/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_PCM.cpp
diff --git a/jdk/src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_Ports.cpp b/jdk/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_Ports.cpp
similarity index 100%
rename from jdk/src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_Ports.cpp
rename to jdk/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_Ports.cpp
diff --git a/jdk/src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_Utils.cpp b/jdk/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_Utils.cpp
similarity index 100%
rename from jdk/src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_Utils.cpp
rename to jdk/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_Utils.cpp
diff --git a/jdk/src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_Utils.h b/jdk/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_Utils.h
similarity index 100%
rename from jdk/src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_Utils.h
rename to jdk/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_Utils.h
diff --git a/jdk/src/macosx/native/sun/osxapp/AWT_debug.h b/jdk/src/java.desktop/macosx/native/libosxapp/AWT_debug.h
similarity index 100%
rename from jdk/src/macosx/native/sun/osxapp/AWT_debug.h
rename to jdk/src/java.desktop/macosx/native/libosxapp/AWT_debug.h
diff --git a/jdk/src/macosx/native/sun/osxapp/AWT_debug.m b/jdk/src/java.desktop/macosx/native/libosxapp/AWT_debug.m
similarity index 100%
rename from jdk/src/macosx/native/sun/osxapp/AWT_debug.m
rename to jdk/src/java.desktop/macosx/native/libosxapp/AWT_debug.m
diff --git a/jdk/src/macosx/native/sun/osxapp/NSApplicationAWT.h b/jdk/src/java.desktop/macosx/native/libosxapp/NSApplicationAWT.h
similarity index 100%
rename from jdk/src/macosx/native/sun/osxapp/NSApplicationAWT.h
rename to jdk/src/java.desktop/macosx/native/libosxapp/NSApplicationAWT.h
diff --git a/jdk/src/macosx/native/sun/osxapp/NSApplicationAWT.m b/jdk/src/java.desktop/macosx/native/libosxapp/NSApplicationAWT.m
similarity index 100%
rename from jdk/src/macosx/native/sun/osxapp/NSApplicationAWT.m
rename to jdk/src/java.desktop/macosx/native/libosxapp/NSApplicationAWT.m
diff --git a/jdk/src/macosx/native/sun/osxapp/PropertiesUtilities.h b/jdk/src/java.desktop/macosx/native/libosxapp/PropertiesUtilities.h
similarity index 100%
rename from jdk/src/macosx/native/sun/osxapp/PropertiesUtilities.h
rename to jdk/src/java.desktop/macosx/native/libosxapp/PropertiesUtilities.h
diff --git a/jdk/src/macosx/native/sun/osxapp/PropertiesUtilities.m b/jdk/src/java.desktop/macosx/native/libosxapp/PropertiesUtilities.m
similarity index 100%
rename from jdk/src/macosx/native/sun/osxapp/PropertiesUtilities.m
rename to jdk/src/java.desktop/macosx/native/libosxapp/PropertiesUtilities.m
diff --git a/jdk/src/macosx/native/sun/osxapp/QueuingApplicationDelegate.h b/jdk/src/java.desktop/macosx/native/libosxapp/QueuingApplicationDelegate.h
similarity index 100%
rename from jdk/src/macosx/native/sun/osxapp/QueuingApplicationDelegate.h
rename to jdk/src/java.desktop/macosx/native/libosxapp/QueuingApplicationDelegate.h
diff --git a/jdk/src/macosx/native/sun/osxapp/QueuingApplicationDelegate.m b/jdk/src/java.desktop/macosx/native/libosxapp/QueuingApplicationDelegate.m
similarity index 100%
rename from jdk/src/macosx/native/sun/osxapp/QueuingApplicationDelegate.m
rename to jdk/src/java.desktop/macosx/native/libosxapp/QueuingApplicationDelegate.m
diff --git a/jdk/src/macosx/native/sun/osxapp/ThreadUtilities.h b/jdk/src/java.desktop/macosx/native/libosxapp/ThreadUtilities.h
similarity index 100%
rename from jdk/src/macosx/native/sun/osxapp/ThreadUtilities.h
rename to jdk/src/java.desktop/macosx/native/libosxapp/ThreadUtilities.h
diff --git a/jdk/src/macosx/native/sun/osxapp/ThreadUtilities.m b/jdk/src/java.desktop/macosx/native/libosxapp/ThreadUtilities.m
similarity index 100%
rename from jdk/src/macosx/native/sun/osxapp/ThreadUtilities.m
rename to jdk/src/java.desktop/macosx/native/libosxapp/ThreadUtilities.m
diff --git a/jdk/src/macosx/native/com/apple/laf/AquaFileView.m b/jdk/src/java.desktop/macosx/native/libosxui/AquaFileView.m
similarity index 100%
rename from jdk/src/macosx/native/com/apple/laf/AquaFileView.m
rename to jdk/src/java.desktop/macosx/native/libosxui/AquaFileView.m
diff --git a/jdk/src/macosx/native/com/apple/laf/AquaLookAndFeel.m b/jdk/src/java.desktop/macosx/native/libosxui/AquaLookAndFeel.m
similarity index 100%
rename from jdk/src/macosx/native/com/apple/laf/AquaLookAndFeel.m
rename to jdk/src/java.desktop/macosx/native/libosxui/AquaLookAndFeel.m
diff --git a/jdk/src/macosx/native/com/apple/laf/AquaNativeResources.m b/jdk/src/java.desktop/macosx/native/libosxui/AquaNativeResources.m
similarity index 100%
rename from jdk/src/macosx/native/com/apple/laf/AquaNativeResources.m
rename to jdk/src/java.desktop/macosx/native/libosxui/AquaNativeResources.m
diff --git a/jdk/src/macosx/native/com/apple/laf/JRSUIConstantSync.h b/jdk/src/java.desktop/macosx/native/libosxui/JRSUIConstantSync.h
similarity index 100%
rename from jdk/src/macosx/native/com/apple/laf/JRSUIConstantSync.h
rename to jdk/src/java.desktop/macosx/native/libosxui/JRSUIConstantSync.h
diff --git a/jdk/src/macosx/native/com/apple/laf/JRSUIConstantSync.m b/jdk/src/java.desktop/macosx/native/libosxui/JRSUIConstantSync.m
similarity index 100%
rename from jdk/src/macosx/native/com/apple/laf/JRSUIConstantSync.m
rename to jdk/src/java.desktop/macosx/native/libosxui/JRSUIConstantSync.m
diff --git a/jdk/src/macosx/native/com/apple/laf/JRSUIController.m b/jdk/src/java.desktop/macosx/native/libosxui/JRSUIController.m
similarity index 100%
rename from jdk/src/macosx/native/com/apple/laf/JRSUIController.m
rename to jdk/src/java.desktop/macosx/native/libosxui/JRSUIController.m
diff --git a/jdk/src/macosx/native/com/apple/laf/JRSUIFocus.m b/jdk/src/java.desktop/macosx/native/libosxui/JRSUIFocus.m
similarity index 100%
rename from jdk/src/macosx/native/com/apple/laf/JRSUIFocus.m
rename to jdk/src/java.desktop/macosx/native/libosxui/JRSUIFocus.m
diff --git a/jdk/src/macosx/native/com/apple/laf/ScreenMenu.h b/jdk/src/java.desktop/macosx/native/libosxui/ScreenMenu.h
similarity index 100%
rename from jdk/src/macosx/native/com/apple/laf/ScreenMenu.h
rename to jdk/src/java.desktop/macosx/native/libosxui/ScreenMenu.h
diff --git a/jdk/src/macosx/native/com/apple/laf/ScreenMenu.m b/jdk/src/java.desktop/macosx/native/libosxui/ScreenMenu.m
similarity index 100%
rename from jdk/src/macosx/native/com/apple/laf/ScreenMenu.m
rename to jdk/src/java.desktop/macosx/native/libosxui/ScreenMenu.m
diff --git a/jdk/src/macosx/native/sun/awt/splashscreen/splashscreen_config.h b/jdk/src/java.desktop/macosx/native/libsplashscreen/splashscreen_config.h
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/splashscreen/splashscreen_config.h
rename to jdk/src/java.desktop/macosx/native/libsplashscreen/splashscreen_config.h
diff --git a/jdk/src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m b/jdk/src/java.desktop/macosx/native/libsplashscreen/splashscreen_sys.m
similarity index 100%
rename from jdk/src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m
rename to jdk/src/java.desktop/macosx/native/libsplashscreen/splashscreen_sys.m
diff --git a/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiDeviceProvider b/jdk/src/java.desktop/share/classes/META-INF/services/javax.sound.midi.spi.MidiDeviceProvider
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiDeviceProvider
rename to jdk/src/java.desktop/share/classes/META-INF/services/javax.sound.midi.spi.MidiDeviceProvider
diff --git a/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileReader b/jdk/src/java.desktop/share/classes/META-INF/services/javax.sound.midi.spi.MidiFileReader
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileReader
rename to jdk/src/java.desktop/share/classes/META-INF/services/javax.sound.midi.spi.MidiFileReader
diff --git a/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileWriter b/jdk/src/java.desktop/share/classes/META-INF/services/javax.sound.midi.spi.MidiFileWriter
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileWriter
rename to jdk/src/java.desktop/share/classes/META-INF/services/javax.sound.midi.spi.MidiFileWriter
diff --git a/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.SoundbankReader b/jdk/src/java.desktop/share/classes/META-INF/services/javax.sound.midi.spi.SoundbankReader
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.SoundbankReader
rename to jdk/src/java.desktop/share/classes/META-INF/services/javax.sound.midi.spi.SoundbankReader
diff --git a/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileReader b/jdk/src/java.desktop/share/classes/META-INF/services/javax.sound.sampled.spi.AudioFileReader
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileReader
rename to jdk/src/java.desktop/share/classes/META-INF/services/javax.sound.sampled.spi.AudioFileReader
diff --git a/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileWriter b/jdk/src/java.desktop/share/classes/META-INF/services/javax.sound.sampled.spi.AudioFileWriter
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileWriter
rename to jdk/src/java.desktop/share/classes/META-INF/services/javax.sound.sampled.spi.AudioFileWriter
diff --git a/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.FormatConversionProvider b/jdk/src/java.desktop/share/classes/META-INF/services/javax.sound.sampled.spi.FormatConversionProvider
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.FormatConversionProvider
rename to jdk/src/java.desktop/share/classes/META-INF/services/javax.sound.sampled.spi.FormatConversionProvider
diff --git a/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider b/jdk/src/java.desktop/share/classes/META-INF/services/javax.sound.sampled.spi.MixerProvider
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider
rename to jdk/src/java.desktop/share/classes/META-INF/services/javax.sound.sampled.spi.MixerProvider
diff --git a/jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility.properties b/jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility.properties
rename to jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility.properties
diff --git a/jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties b/jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties
rename to jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties
diff --git a/jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_en.properties b/jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_en.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_en.properties
rename to jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_en.properties
diff --git a/jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties b/jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties
rename to jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties
diff --git a/jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_fr.properties b/jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_fr.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_fr.properties
rename to jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_fr.properties
diff --git a/jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_it.properties b/jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_it.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_it.properties
rename to jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_it.properties
diff --git a/jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_ja.properties b/jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_ja.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_ja.properties
rename to jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_ja.properties
diff --git a/jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_ko.properties b/jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_ko.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_ko.properties
rename to jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_ko.properties
diff --git a/jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties b/jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties
rename to jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties
diff --git a/jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties b/jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties
rename to jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties
diff --git a/jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_CN.properties b/jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_CN.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_CN.properties
rename to jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_CN.properties
diff --git a/jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_TW.properties b/jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_TW.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_TW.properties
rename to jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_TW.properties
diff --git a/jdk/src/share/classes/com/sun/awt/AWTUtilities.java b/jdk/src/java.desktop/share/classes/com/sun/awt/AWTUtilities.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/awt/AWTUtilities.java
rename to jdk/src/java.desktop/share/classes/com/sun/awt/AWTUtilities.java
diff --git a/jdk/src/share/classes/com/sun/awt/SecurityWarning.java b/jdk/src/java.desktop/share/classes/com/sun/awt/SecurityWarning.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/awt/SecurityWarning.java
rename to jdk/src/java.desktop/share/classes/com/sun/awt/SecurityWarning.java
diff --git a/jdk/src/share/classes/com/sun/beans/TypeResolver.java b/jdk/src/java.desktop/share/classes/com/sun/beans/TypeResolver.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/TypeResolver.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/TypeResolver.java
diff --git a/jdk/src/share/classes/com/sun/beans/WeakCache.java b/jdk/src/java.desktop/share/classes/com/sun/beans/WeakCache.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/WeakCache.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/WeakCache.java
diff --git a/jdk/src/share/classes/com/sun/beans/WildcardTypeImpl.java b/jdk/src/java.desktop/share/classes/com/sun/beans/WildcardTypeImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/WildcardTypeImpl.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/WildcardTypeImpl.java
diff --git a/jdk/src/share/classes/com/sun/beans/decoder/AccessorElementHandler.java b/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/AccessorElementHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/decoder/AccessorElementHandler.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/decoder/AccessorElementHandler.java
diff --git a/jdk/src/share/classes/com/sun/beans/decoder/ArrayElementHandler.java b/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/ArrayElementHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/decoder/ArrayElementHandler.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/decoder/ArrayElementHandler.java
diff --git a/jdk/src/share/classes/com/sun/beans/decoder/BooleanElementHandler.java b/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/BooleanElementHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/decoder/BooleanElementHandler.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/decoder/BooleanElementHandler.java
diff --git a/jdk/src/share/classes/com/sun/beans/decoder/ByteElementHandler.java b/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/ByteElementHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/decoder/ByteElementHandler.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/decoder/ByteElementHandler.java
diff --git a/jdk/src/share/classes/com/sun/beans/decoder/CharElementHandler.java b/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/CharElementHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/decoder/CharElementHandler.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/decoder/CharElementHandler.java
diff --git a/jdk/src/share/classes/com/sun/beans/decoder/ClassElementHandler.java b/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/ClassElementHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/decoder/ClassElementHandler.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/decoder/ClassElementHandler.java
diff --git a/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java b/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/DocumentHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/decoder/DocumentHandler.java
diff --git a/jdk/src/share/classes/com/sun/beans/decoder/DoubleElementHandler.java b/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/DoubleElementHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/decoder/DoubleElementHandler.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/decoder/DoubleElementHandler.java
diff --git a/jdk/src/share/classes/com/sun/beans/decoder/ElementHandler.java b/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/ElementHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/decoder/ElementHandler.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/decoder/ElementHandler.java
diff --git a/jdk/src/share/classes/com/sun/beans/decoder/FalseElementHandler.java b/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/FalseElementHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/decoder/FalseElementHandler.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/decoder/FalseElementHandler.java
diff --git a/jdk/src/share/classes/com/sun/beans/decoder/FieldElementHandler.java b/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/FieldElementHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/decoder/FieldElementHandler.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/decoder/FieldElementHandler.java
diff --git a/jdk/src/share/classes/com/sun/beans/decoder/FloatElementHandler.java b/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/FloatElementHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/decoder/FloatElementHandler.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/decoder/FloatElementHandler.java
diff --git a/jdk/src/share/classes/com/sun/beans/decoder/IntElementHandler.java b/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/IntElementHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/decoder/IntElementHandler.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/decoder/IntElementHandler.java
diff --git a/jdk/src/share/classes/com/sun/beans/decoder/JavaElementHandler.java b/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/JavaElementHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/decoder/JavaElementHandler.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/decoder/JavaElementHandler.java
diff --git a/jdk/src/share/classes/com/sun/beans/decoder/LongElementHandler.java b/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/LongElementHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/decoder/LongElementHandler.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/decoder/LongElementHandler.java
diff --git a/jdk/src/share/classes/com/sun/beans/decoder/MethodElementHandler.java b/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/MethodElementHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/decoder/MethodElementHandler.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/decoder/MethodElementHandler.java
diff --git a/jdk/src/share/classes/com/sun/beans/decoder/NewElementHandler.java b/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/NewElementHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/decoder/NewElementHandler.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/decoder/NewElementHandler.java
diff --git a/jdk/src/share/classes/com/sun/beans/decoder/NullElementHandler.java b/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/NullElementHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/decoder/NullElementHandler.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/decoder/NullElementHandler.java
diff --git a/jdk/src/share/classes/com/sun/beans/decoder/ObjectElementHandler.java b/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/ObjectElementHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/decoder/ObjectElementHandler.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/decoder/ObjectElementHandler.java
diff --git a/jdk/src/share/classes/com/sun/beans/decoder/PropertyElementHandler.java b/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/PropertyElementHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/decoder/PropertyElementHandler.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/decoder/PropertyElementHandler.java
diff --git a/jdk/src/share/classes/com/sun/beans/decoder/ShortElementHandler.java b/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/ShortElementHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/decoder/ShortElementHandler.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/decoder/ShortElementHandler.java
diff --git a/jdk/src/share/classes/com/sun/beans/decoder/StringElementHandler.java b/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/StringElementHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/decoder/StringElementHandler.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/decoder/StringElementHandler.java
diff --git a/jdk/src/share/classes/com/sun/beans/decoder/TrueElementHandler.java b/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/TrueElementHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/decoder/TrueElementHandler.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/decoder/TrueElementHandler.java
diff --git a/jdk/src/share/classes/com/sun/beans/decoder/ValueObject.java b/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/ValueObject.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/decoder/ValueObject.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/decoder/ValueObject.java
diff --git a/jdk/src/share/classes/com/sun/beans/decoder/ValueObjectImpl.java b/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/ValueObjectImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/decoder/ValueObjectImpl.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/decoder/ValueObjectImpl.java
diff --git a/jdk/src/share/classes/com/sun/beans/decoder/VarElementHandler.java b/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/VarElementHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/decoder/VarElementHandler.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/decoder/VarElementHandler.java
diff --git a/jdk/src/share/classes/com/sun/beans/decoder/VoidElementHandler.java b/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/VoidElementHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/decoder/VoidElementHandler.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/decoder/VoidElementHandler.java
diff --git a/jdk/src/share/classes/com/sun/beans/editors/BooleanEditor.java b/jdk/src/java.desktop/share/classes/com/sun/beans/editors/BooleanEditor.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/editors/BooleanEditor.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/editors/BooleanEditor.java
diff --git a/jdk/src/share/classes/com/sun/beans/editors/ByteEditor.java b/jdk/src/java.desktop/share/classes/com/sun/beans/editors/ByteEditor.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/editors/ByteEditor.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/editors/ByteEditor.java
diff --git a/jdk/src/share/classes/com/sun/beans/editors/ColorEditor.java b/jdk/src/java.desktop/share/classes/com/sun/beans/editors/ColorEditor.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/editors/ColorEditor.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/editors/ColorEditor.java
diff --git a/jdk/src/share/classes/com/sun/beans/editors/DoubleEditor.java b/jdk/src/java.desktop/share/classes/com/sun/beans/editors/DoubleEditor.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/editors/DoubleEditor.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/editors/DoubleEditor.java
diff --git a/jdk/src/share/classes/com/sun/beans/editors/EnumEditor.java b/jdk/src/java.desktop/share/classes/com/sun/beans/editors/EnumEditor.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/editors/EnumEditor.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/editors/EnumEditor.java
diff --git a/jdk/src/share/classes/com/sun/beans/editors/FloatEditor.java b/jdk/src/java.desktop/share/classes/com/sun/beans/editors/FloatEditor.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/editors/FloatEditor.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/editors/FloatEditor.java
diff --git a/jdk/src/share/classes/com/sun/beans/editors/FontEditor.java b/jdk/src/java.desktop/share/classes/com/sun/beans/editors/FontEditor.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/editors/FontEditor.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/editors/FontEditor.java
diff --git a/jdk/src/share/classes/com/sun/beans/editors/IntegerEditor.java b/jdk/src/java.desktop/share/classes/com/sun/beans/editors/IntegerEditor.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/editors/IntegerEditor.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/editors/IntegerEditor.java
diff --git a/jdk/src/share/classes/com/sun/beans/editors/LongEditor.java b/jdk/src/java.desktop/share/classes/com/sun/beans/editors/LongEditor.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/editors/LongEditor.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/editors/LongEditor.java
diff --git a/jdk/src/share/classes/com/sun/beans/editors/NumberEditor.java b/jdk/src/java.desktop/share/classes/com/sun/beans/editors/NumberEditor.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/editors/NumberEditor.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/editors/NumberEditor.java
diff --git a/jdk/src/share/classes/com/sun/beans/editors/ShortEditor.java b/jdk/src/java.desktop/share/classes/com/sun/beans/editors/ShortEditor.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/editors/ShortEditor.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/editors/ShortEditor.java
diff --git a/jdk/src/share/classes/com/sun/beans/editors/StringEditor.java b/jdk/src/java.desktop/share/classes/com/sun/beans/editors/StringEditor.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/editors/StringEditor.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/editors/StringEditor.java
diff --git a/jdk/src/share/classes/com/sun/beans/finder/AbstractFinder.java b/jdk/src/java.desktop/share/classes/com/sun/beans/finder/AbstractFinder.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/finder/AbstractFinder.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/finder/AbstractFinder.java
diff --git a/jdk/src/share/classes/com/sun/beans/finder/BeanInfoFinder.java b/jdk/src/java.desktop/share/classes/com/sun/beans/finder/BeanInfoFinder.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/finder/BeanInfoFinder.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/finder/BeanInfoFinder.java
diff --git a/jdk/src/share/classes/com/sun/beans/finder/ClassFinder.java b/jdk/src/java.desktop/share/classes/com/sun/beans/finder/ClassFinder.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/finder/ClassFinder.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/finder/ClassFinder.java
diff --git a/jdk/src/share/classes/com/sun/beans/finder/ConstructorFinder.java b/jdk/src/java.desktop/share/classes/com/sun/beans/finder/ConstructorFinder.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/finder/ConstructorFinder.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/finder/ConstructorFinder.java
diff --git a/jdk/src/share/classes/com/sun/beans/finder/FieldFinder.java b/jdk/src/java.desktop/share/classes/com/sun/beans/finder/FieldFinder.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/finder/FieldFinder.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/finder/FieldFinder.java
diff --git a/jdk/src/share/classes/com/sun/beans/finder/InstanceFinder.java b/jdk/src/java.desktop/share/classes/com/sun/beans/finder/InstanceFinder.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/finder/InstanceFinder.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/finder/InstanceFinder.java
diff --git a/jdk/src/share/classes/com/sun/beans/finder/MethodFinder.java b/jdk/src/java.desktop/share/classes/com/sun/beans/finder/MethodFinder.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/finder/MethodFinder.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/finder/MethodFinder.java
diff --git a/jdk/src/share/classes/com/sun/beans/finder/PersistenceDelegateFinder.java b/jdk/src/java.desktop/share/classes/com/sun/beans/finder/PersistenceDelegateFinder.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/finder/PersistenceDelegateFinder.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/finder/PersistenceDelegateFinder.java
diff --git a/jdk/src/share/classes/com/sun/beans/finder/PrimitiveTypeMap.java b/jdk/src/java.desktop/share/classes/com/sun/beans/finder/PrimitiveTypeMap.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/finder/PrimitiveTypeMap.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/finder/PrimitiveTypeMap.java
diff --git a/jdk/src/share/classes/com/sun/beans/finder/PrimitiveWrapperMap.java b/jdk/src/java.desktop/share/classes/com/sun/beans/finder/PrimitiveWrapperMap.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/finder/PrimitiveWrapperMap.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/finder/PrimitiveWrapperMap.java
diff --git a/jdk/src/share/classes/com/sun/beans/finder/PropertyEditorFinder.java b/jdk/src/java.desktop/share/classes/com/sun/beans/finder/PropertyEditorFinder.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/finder/PropertyEditorFinder.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/finder/PropertyEditorFinder.java
diff --git a/jdk/src/share/classes/com/sun/beans/finder/Signature.java b/jdk/src/java.desktop/share/classes/com/sun/beans/finder/Signature.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/finder/Signature.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/finder/Signature.java
diff --git a/jdk/src/share/classes/com/sun/beans/finder/SignatureException.java b/jdk/src/java.desktop/share/classes/com/sun/beans/finder/SignatureException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/finder/SignatureException.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/finder/SignatureException.java
diff --git a/jdk/src/share/classes/com/sun/beans/infos/ComponentBeanInfo.java b/jdk/src/java.desktop/share/classes/com/sun/beans/infos/ComponentBeanInfo.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/infos/ComponentBeanInfo.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/infos/ComponentBeanInfo.java
diff --git a/jdk/src/share/classes/com/sun/beans/introspect/ClassInfo.java b/jdk/src/java.desktop/share/classes/com/sun/beans/introspect/ClassInfo.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/introspect/ClassInfo.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/introspect/ClassInfo.java
diff --git a/jdk/src/share/classes/com/sun/beans/introspect/EventSetInfo.java b/jdk/src/java.desktop/share/classes/com/sun/beans/introspect/EventSetInfo.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/introspect/EventSetInfo.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/introspect/EventSetInfo.java
diff --git a/jdk/src/share/classes/com/sun/beans/introspect/MethodInfo.java b/jdk/src/java.desktop/share/classes/com/sun/beans/introspect/MethodInfo.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/introspect/MethodInfo.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/introspect/MethodInfo.java
diff --git a/jdk/src/share/classes/com/sun/beans/introspect/PropertyInfo.java b/jdk/src/java.desktop/share/classes/com/sun/beans/introspect/PropertyInfo.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/introspect/PropertyInfo.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/introspect/PropertyInfo.java
diff --git a/jdk/src/share/classes/com/sun/beans/util/Cache.java b/jdk/src/java.desktop/share/classes/com/sun/beans/util/Cache.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/beans/util/Cache.java
rename to jdk/src/java.desktop/share/classes/com/sun/beans/util/Cache.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPCompressionTypes.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPCompressionTypes.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPCompressionTypes.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPCompressionTypes.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPConstants.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPConstants.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPConstants.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPConstants.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriter.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriter.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriter.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriter.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPMetadata.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPMetadata.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPMetadata.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPMetadata.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPMetadataFormat.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPMetadataFormat.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPMetadataFormat.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPMetadataFormat.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPMetadataFormatResources.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPMetadataFormatResources.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPMetadataFormatResources.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPMetadataFormatResources.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/common/BitFile.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/BitFile.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/common/BitFile.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/BitFile.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/common/BogusColorSpace.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/BogusColorSpace.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/common/BogusColorSpace.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/BogusColorSpace.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/common/I18N.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/I18N.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/common/I18N.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/I18N.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/common/I18NImpl.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/I18NImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/common/I18NImpl.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/I18NImpl.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/common/ImageUtil.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/ImageUtil.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/common/ImageUtil.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/ImageUtil.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/common/InputStreamAdapter.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/InputStreamAdapter.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/common/InputStreamAdapter.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/InputStreamAdapter.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/common/LZWCompressor.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/LZWCompressor.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/common/LZWCompressor.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/LZWCompressor.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/common/LZWStringTable.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/LZWStringTable.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/common/LZWStringTable.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/LZWStringTable.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/common/PaletteBuilder.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/PaletteBuilder.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/common/PaletteBuilder.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/PaletteBuilder.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/common/ReaderUtil.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/ReaderUtil.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/common/ReaderUtil.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/ReaderUtil.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/common/StandardMetadataFormat.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/StandardMetadataFormat.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/common/StandardMetadataFormat.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/StandardMetadataFormat.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/common/StandardMetadataFormatResources.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/StandardMetadataFormatResources.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/common/StandardMetadataFormatResources.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/StandardMetadataFormatResources.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/common/SubImageInputStream.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SubImageInputStream.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/common/SubImageInputStream.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SubImageInputStream.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/common/iio-plugin.properties b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/iio-plugin.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/common/iio-plugin.properties
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/iio-plugin.properties
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadata.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadata.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadata.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadata.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormat.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormat.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormat.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormat.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormatResources.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormatResources.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormatResources.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormatResources.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriter.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageWriter.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriter.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageWriter.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFMetadata.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFMetadata.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFMetadata.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFMetadata.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadata.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadata.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadata.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadata.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadataFormat.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadataFormat.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadataFormat.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadataFormat.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadataFormatResources.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadataFormatResources.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadataFormatResources.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadataFormatResources.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFWritableImageMetadata.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFWritableImageMetadata.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFWritableImageMetadata.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFWritableImageMetadata.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFWritableStreamMetadata.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFWritableStreamMetadata.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFWritableStreamMetadata.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFWritableStreamMetadata.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/AdobeMarkerSegment.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/AdobeMarkerSegment.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/jpeg/AdobeMarkerSegment.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/AdobeMarkerSegment.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/COMMarkerSegment.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/COMMarkerSegment.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/jpeg/COMMarkerSegment.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/COMMarkerSegment.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/DHTMarkerSegment.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/DHTMarkerSegment.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/jpeg/DHTMarkerSegment.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/DHTMarkerSegment.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/DQTMarkerSegment.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/DQTMarkerSegment.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/jpeg/DQTMarkerSegment.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/DQTMarkerSegment.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/DRIMarkerSegment.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/DRIMarkerSegment.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/jpeg/DRIMarkerSegment.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/DRIMarkerSegment.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JFIFMarkerSegment.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JFIFMarkerSegment.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JFIFMarkerSegment.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JFIFMarkerSegment.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEG.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEG.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEG.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEG.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGBuffer.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGBuffer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGBuffer.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGBuffer.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageMetadataFormat.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageMetadataFormat.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageMetadataFormat.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageMetadataFormat.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageMetadataFormatResources.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageMetadataFormatResources.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageMetadataFormatResources.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageMetadataFormatResources.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderResources.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderResources.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderResources.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderResources.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderSpi.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderSpi.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderSpi.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderSpi.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterResources.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterResources.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterResources.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterResources.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterSpi.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterSpi.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterSpi.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterSpi.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadataFormat.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadataFormat.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadataFormat.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadataFormat.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadataFormatResources.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadataFormatResources.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadataFormatResources.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadataFormatResources.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGStreamMetadataFormat.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGStreamMetadataFormat.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGStreamMetadataFormat.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGStreamMetadataFormat.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGStreamMetadataFormatResources.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGStreamMetadataFormatResources.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGStreamMetadataFormatResources.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGStreamMetadataFormatResources.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/MarkerSegment.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/MarkerSegment.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/jpeg/MarkerSegment.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/MarkerSegment.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/SOFMarkerSegment.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/SOFMarkerSegment.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/jpeg/SOFMarkerSegment.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/SOFMarkerSegment.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/SOSMarkerSegment.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/SOSMarkerSegment.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/jpeg/SOSMarkerSegment.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/SOSMarkerSegment.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGImageReaderSpi.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageReaderSpi.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/png/PNGImageReaderSpi.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageReaderSpi.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGImageWriter.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageWriter.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/png/PNGImageWriter.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageWriter.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGImageWriterSpi.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageWriterSpi.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/png/PNGImageWriterSpi.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageWriterSpi.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormat.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormat.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormat.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormat.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormatResources.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormatResources.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormatResources.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormatResources.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/png/RowFilter.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/png/RowFilter.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/png/RowFilter.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/png/RowFilter.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReader.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReader.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReader.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReader.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReaderSpi.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReaderSpi.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReaderSpi.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReaderSpi.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriter.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriter.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriter.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriter.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriterSpi.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriterSpi.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriterSpi.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriterSpi.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadata.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadata.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadata.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadata.java
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadataFormat.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadataFormat.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadataFormat.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadataFormat.java
diff --git a/jdk/src/share/classes/com/sun/imageio/spi/FileImageInputStreamSpi.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/spi/FileImageInputStreamSpi.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/spi/FileImageInputStreamSpi.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/spi/FileImageInputStreamSpi.java
diff --git a/jdk/src/share/classes/com/sun/imageio/spi/FileImageOutputStreamSpi.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/spi/FileImageOutputStreamSpi.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/spi/FileImageOutputStreamSpi.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/spi/FileImageOutputStreamSpi.java
diff --git a/jdk/src/share/classes/com/sun/imageio/spi/InputStreamImageInputStreamSpi.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/spi/InputStreamImageInputStreamSpi.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/spi/InputStreamImageInputStreamSpi.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/spi/InputStreamImageInputStreamSpi.java
diff --git a/jdk/src/share/classes/com/sun/imageio/spi/OutputStreamImageOutputStreamSpi.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/spi/OutputStreamImageOutputStreamSpi.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/spi/OutputStreamImageOutputStreamSpi.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/spi/OutputStreamImageOutputStreamSpi.java
diff --git a/jdk/src/share/classes/com/sun/imageio/spi/RAFImageInputStreamSpi.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/spi/RAFImageInputStreamSpi.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/spi/RAFImageInputStreamSpi.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/spi/RAFImageInputStreamSpi.java
diff --git a/jdk/src/share/classes/com/sun/imageio/spi/RAFImageOutputStreamSpi.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/spi/RAFImageOutputStreamSpi.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/spi/RAFImageOutputStreamSpi.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/spi/RAFImageOutputStreamSpi.java
diff --git a/jdk/src/share/classes/com/sun/imageio/stream/CloseableDisposerRecord.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/stream/CloseableDisposerRecord.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/stream/CloseableDisposerRecord.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/stream/CloseableDisposerRecord.java
diff --git a/jdk/src/share/classes/com/sun/imageio/stream/StreamCloser.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/stream/StreamCloser.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/stream/StreamCloser.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/stream/StreamCloser.java
diff --git a/jdk/src/share/classes/com/sun/imageio/stream/StreamFinalizer.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/stream/StreamFinalizer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/imageio/stream/StreamFinalizer.java
rename to jdk/src/java.desktop/share/classes/com/sun/imageio/stream/StreamFinalizer.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/Painter.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/Painter.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/Painter.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/Painter.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/SwingUtilities3.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/SwingUtilities3.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/SwingUtilities3.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/SwingUtilities3.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKColorChooserPanel.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKColorChooserPanel.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKColorChooserPanel.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKColorChooserPanel.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKColorType.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKColorType.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKColorType.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKColorType.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKConstants.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKConstants.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKConstants.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKConstants.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKGraphicsUtils.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKGraphicsUtils.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKGraphicsUtils.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKGraphicsUtils.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKIconFactory.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKIconFactory.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKIconFactory.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKIconFactory.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKRegion.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKRegion.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKRegion.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKRegion.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyleFactory.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyleFactory.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyleFactory.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyleFactory.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/PangoFonts.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/PangoFonts.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/gtk/PangoFonts.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/PangoFonts.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/XColors.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/XColors.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/gtk/XColors.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/XColors.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/icons/Directory.gif b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/icons/Directory.gif
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/gtk/icons/Directory.gif
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/icons/Directory.gif
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/icons/File.gif b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/icons/File.gif
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/gtk/icons/File.gif
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/icons/File.gif
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/icons/image-delayed.png b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/icons/image-delayed.png
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/gtk/icons/image-delayed.png
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/icons/image-delayed.png
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/icons/image-failed.png b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/icons/image-failed.png
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/gtk/icons/image-failed.png
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/icons/image-failed.png
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk.properties b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk.properties
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk.properties
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/metacity/SwingFallbackTheme/metacity-1/metacity-theme-1.xml b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/metacity/SwingFallbackTheme/metacity-1/metacity-theme-1.xml
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/metacity/SwingFallbackTheme/metacity-1/metacity-theme-1.xml
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/metacity/SwingFallbackTheme/metacity-1/metacity-theme-1.xml
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifBorders.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifBorders.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifBorders.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifBorders.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifButtonListener.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifButtonListener.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifButtonListener.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifButtonListener.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifButtonUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifButtonUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifButtonUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifButtonUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxMenuItemUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxMenuItemUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxMenuItemUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxMenuItemUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifComboBoxUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifComboBoxUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifComboBoxUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifComboBoxUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopIconUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopIconUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopIconUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopIconUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopPaneUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopPaneUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopPaneUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifEditorPaneUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifEditorPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifEditorPaneUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifEditorPaneUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifGraphicsUtils.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifGraphicsUtils.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifGraphicsUtils.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifGraphicsUtils.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifIconFactory.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifIconFactory.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifIconFactory.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifIconFactory.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameTitlePane.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameTitlePane.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameTitlePane.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameTitlePane.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifLabelUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLabelUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifLabelUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLabelUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuBarUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuBarUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuBarUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuBarUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuItemUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuItemUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuItemUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuItemUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuMouseListener.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuMouseListener.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuMouseListener.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuMouseListener.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuMouseMotionListener.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuMouseMotionListener.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuMouseMotionListener.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuMouseMotionListener.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifOptionPaneUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifOptionPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifOptionPaneUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifOptionPaneUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifPasswordFieldUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifPasswordFieldUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifPasswordFieldUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifPasswordFieldUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuSeparatorUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuSeparatorUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuSeparatorUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuSeparatorUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifProgressBarUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifProgressBarUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifProgressBarUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifProgressBarUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonMenuItemUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonMenuItemUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonMenuItemUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonMenuItemUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifScrollBarButton.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifScrollBarButton.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifScrollBarButton.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifScrollBarButton.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifScrollBarUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifScrollBarUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifScrollBarUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifScrollBarUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifScrollPaneUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifScrollPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifScrollPaneUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifScrollPaneUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifSeparatorUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSeparatorUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifSeparatorUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSeparatorUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifSliderUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSliderUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifSliderUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSliderUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifSplitPaneDivider.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSplitPaneDivider.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifSplitPaneDivider.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSplitPaneDivider.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifSplitPaneUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSplitPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifSplitPaneUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSplitPaneUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifTabbedPaneUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTabbedPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifTabbedPaneUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTabbedPaneUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifTextAreaUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextAreaUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifTextAreaUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextAreaUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifTextFieldUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextFieldUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifTextFieldUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextFieldUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifTextPaneUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifTextPaneUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextPaneUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifTextUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifTextUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifToggleButtonUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifToggleButtonUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifToggleButtonUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifToggleButtonUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifTreeCellRenderer.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTreeCellRenderer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifTreeCellRenderer.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTreeCellRenderer.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifTreeUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTreeUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifTreeUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTreeUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/icons/DesktopIcon.gif b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/DesktopIcon.gif
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/icons/DesktopIcon.gif
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/DesktopIcon.gif
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/icons/Error.gif b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/Error.gif
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/icons/Error.gif
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/Error.gif
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/icons/Inform.gif b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/Inform.gif
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/icons/Inform.gif
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/Inform.gif
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/icons/Question.gif b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/Question.gif
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/icons/Question.gif
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/Question.gif
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/icons/TreeClosed.gif b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/TreeClosed.gif
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/icons/TreeClosed.gif
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/TreeClosed.gif
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/icons/TreeOpen.gif b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/TreeOpen.gif
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/icons/TreeOpen.gif
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/TreeOpen.gif
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/icons/Warn.gif b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/Warn.gif
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/icons/Warn.gif
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/Warn.gif
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/icons/image-delayed.png b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/image-delayed.png
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/icons/image-delayed.png
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/image-delayed.png
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/icons/image-failed.png b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/image-failed.png
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/icons/image-failed.png
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/image-failed.png
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif.properties b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif.properties
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif.properties
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_de.properties b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_de.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_de.properties
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_de.properties
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_es.properties b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_es.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_es.properties
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_es.properties
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_fr.properties b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_fr.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_fr.properties
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_fr.properties
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_it.properties b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_it.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_it.properties
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_it.properties
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ja.properties b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ja.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ja.properties
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ja.properties
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_pt_BR.properties b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_pt_BR.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_pt_BR.properties
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_pt_BR.properties
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_sv.properties b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_sv.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_sv.properties
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_sv.properties
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.properties b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.properties
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.properties
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_TW.properties b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_TW.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_TW.properties
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_TW.properties
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/nimbus/AbstractRegionPainter.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/nimbus/AbstractRegionPainter.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/nimbus/AbstractRegionPainter.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/nimbus/AbstractRegionPainter.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/AnimationController.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/AnimationController.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/AnimationController.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/AnimationController.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/DesktopProperty.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/DesktopProperty.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/DesktopProperty.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/DesktopProperty.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/TMSchema.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/TMSchema.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/TMSchema.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/TMSchema.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsBorders.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsBorders.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsBorders.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsBorders.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsButtonListener.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsButtonListener.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsButtonListener.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsButtonListener.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsButtonUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsButtonUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsButtonUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsButtonUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxMenuItemUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxMenuItemUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxMenuItemUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxMenuItemUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsClassicLookAndFeel.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsClassicLookAndFeel.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsClassicLookAndFeel.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsClassicLookAndFeel.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopIconUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopIconUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopIconUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopIconUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopManager.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopManager.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopManager.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopManager.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopPaneUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopPaneUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopPaneUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsEditorPaneUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsEditorPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsEditorPaneUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsEditorPaneUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsGraphicsUtils.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsGraphicsUtils.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsGraphicsUtils.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsGraphicsUtils.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameTitlePane.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameTitlePane.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameTitlePane.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameTitlePane.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUIAccessor.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUIAccessor.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUIAccessor.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUIAccessor.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsOptionPaneUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsOptionPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsOptionPaneUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsOptionPaneUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsPasswordFieldUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsPasswordFieldUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsPasswordFieldUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsPasswordFieldUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuSeparatorUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuSeparatorUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuSeparatorUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuSeparatorUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupWindow.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupWindow.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupWindow.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupWindow.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsProgressBarUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsProgressBarUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsProgressBarUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsProgressBarUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonMenuItemUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonMenuItemUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonMenuItemUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonMenuItemUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsScrollBarUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsScrollBarUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsScrollBarUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsScrollBarUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsScrollPaneUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsScrollPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsScrollPaneUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsScrollPaneUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSeparatorUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSeparatorUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSeparatorUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSeparatorUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSliderUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSliderUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSliderUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSliderUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSpinnerUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSpinnerUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSpinnerUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSpinnerUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneDivider.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneDivider.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneDivider.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneDivider.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTabbedPaneUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTabbedPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTabbedPaneUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTabbedPaneUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTableHeaderUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTableHeaderUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTableHeaderUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTableHeaderUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTextAreaUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTextAreaUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTextAreaUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTextAreaUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTextFieldUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTextFieldUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTextFieldUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTextFieldUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTextPaneUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTextPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTextPaneUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTextPaneUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTextUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTextUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTextUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTextUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsToggleButtonUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsToggleButtonUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsToggleButtonUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsToggleButtonUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsToolBarSeparatorUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsToolBarSeparatorUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsToolBarSeparatorUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsToolBarSeparatorUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsToolBarUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsToolBarUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsToolBarUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsToolBarUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTreeUI.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTreeUI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTreeUI.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTreeUI.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/XPStyle.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/XPStyle.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/XPStyle.java
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/XPStyle.java
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/Computer.gif b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Computer.gif
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/Computer.gif
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Computer.gif
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/DetailsView.gif b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/DetailsView.gif
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/DetailsView.gif
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/DetailsView.gif
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/Directory.gif b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Directory.gif
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/Directory.gif
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Directory.gif
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/Error.gif b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Error.gif
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/Error.gif
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Error.gif
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/File.gif b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/File.gif
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/File.gif
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/File.gif
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/FloppyDrive.gif b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/FloppyDrive.gif
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/FloppyDrive.gif
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/FloppyDrive.gif
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/HardDrive.gif b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/HardDrive.gif
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/HardDrive.gif
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/HardDrive.gif
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/HomeFolder.gif b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/HomeFolder.gif
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/HomeFolder.gif
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/HomeFolder.gif
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/Inform.gif b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Inform.gif
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/Inform.gif
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Inform.gif
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/JavaCup32.png b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/JavaCup32.png
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/JavaCup32.png
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/JavaCup32.png
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/ListView.gif b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/ListView.gif
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/ListView.gif
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/ListView.gif
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/NewFolder.gif b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/NewFolder.gif
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/NewFolder.gif
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/NewFolder.gif
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/Question.gif b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Question.gif
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/Question.gif
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Question.gif
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/TreeClosed.gif b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/TreeClosed.gif
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/TreeClosed.gif
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/TreeClosed.gif
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/TreeLeaf.gif b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/TreeLeaf.gif
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/TreeLeaf.gif
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/TreeLeaf.gif
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/TreeOpen.gif b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/TreeOpen.gif
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/TreeOpen.gif
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/TreeOpen.gif
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/UpFolder.gif b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/UpFolder.gif
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/UpFolder.gif
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/UpFolder.gif
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/Warn.gif b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Warn.gif
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/Warn.gif
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Warn.gif
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/image-delayed.png b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/image-delayed.png
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/image-delayed.png
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/image-delayed.png
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/image-failed.png b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/image-failed.png
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/icons/image-failed.png
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/image-failed.png
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows.properties b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows.properties
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows.properties
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_de.properties b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_de.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_de.properties
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_de.properties
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_es.properties b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_es.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_es.properties
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_es.properties
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_it.properties b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_it.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_it.properties
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_it.properties
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ja.properties b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ja.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ja.properties
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ja.properties
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ko.properties b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ko.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ko.properties
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ko.properties
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_pt_BR.properties b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_pt_BR.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_pt_BR.properties
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_pt_BR.properties
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.properties b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.properties
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.properties
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.properties b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.properties
rename to jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.properties
diff --git a/jdk/src/share/classes/com/sun/media/sound/AbstractDataLine.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AbstractDataLine.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/AbstractDataLine.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/AbstractDataLine.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AbstractLine.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/AbstractLine.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/AbstractLine.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AbstractMidiDevice.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/AbstractMidiDevice.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDeviceProvider.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AbstractMidiDeviceProvider.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/AbstractMidiDeviceProvider.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/AbstractMidiDeviceProvider.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/AbstractMixer.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AbstractMixer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/AbstractMixer.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/AbstractMixer.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/AiffFileFormat.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AiffFileFormat.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/AiffFileFormat.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/AiffFileFormat.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/AiffFileReader.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AiffFileReader.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/AiffFileReader.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/AiffFileReader.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/AiffFileWriter.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AiffFileWriter.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/AiffFileWriter.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/AiffFileWriter.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/AlawCodec.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AlawCodec.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/AlawCodec.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/AlawCodec.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/AuFileFormat.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AuFileFormat.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/AuFileFormat.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/AuFileFormat.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/AuFileReader.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AuFileReader.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/AuFileReader.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/AuFileReader.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/AuFileWriter.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AuFileWriter.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/AuFileWriter.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/AuFileWriter.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/AudioFloatConverter.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AudioFloatConverter.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/AudioFloatConverter.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/AudioFloatConverter.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/AudioFloatInputStream.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AudioFloatInputStream.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/AudioFloatInputStream.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/AudioFloatInputStream.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/AudioSynthesizer.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AudioSynthesizer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/AudioSynthesizer.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/AudioSynthesizer.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/AutoClosingClip.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AutoClosingClip.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/AutoClosingClip.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/AutoClosingClip.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/AutoConnectSequencer.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AutoConnectSequencer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/AutoConnectSequencer.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/AutoConnectSequencer.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/DLSInfo.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSInfo.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/DLSInfo.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSInfo.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/DLSInstrument.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSInstrument.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/DLSInstrument.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSInstrument.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/DLSModulator.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSModulator.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/DLSModulator.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSModulator.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/DLSRegion.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSRegion.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/DLSRegion.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSRegion.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/DLSSample.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSSample.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/DLSSample.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSSample.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/DLSSampleLoop.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSSampleLoop.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/DLSSampleLoop.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSSampleLoop.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/DLSSampleOptions.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSSampleOptions.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/DLSSampleOptions.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSSampleOptions.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/DLSSoundbank.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSSoundbank.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/DLSSoundbank.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSSoundbank.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSSoundbankReader.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSSoundbankReader.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/DataPusher.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/DataPusher.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/DataPusher.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/DataPusher.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/DirectAudioDevice.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/DirectAudioDevice.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/DirectAudioDevice.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/DirectAudioDevice.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/DirectAudioDeviceProvider.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/DirectAudioDeviceProvider.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/DirectAudioDeviceProvider.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/DirectAudioDeviceProvider.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/EmergencySoundbank.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/EmergencySoundbank.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/EmergencySoundbank.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/EmergencySoundbank.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/EventDispatcher.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/EventDispatcher.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/EventDispatcher.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/EventDispatcher.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/FFT.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/FFT.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/FFT.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/FFT.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/FastShortMessage.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/FastShortMessage.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/FastShortMessage.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/FastShortMessage.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/FastSysexMessage.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/FastSysexMessage.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/FastSysexMessage.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/FastSysexMessage.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/InvalidDataException.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/InvalidDataException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/InvalidDataException.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/InvalidDataException.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/InvalidFormatException.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/InvalidFormatException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/InvalidFormatException.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/InvalidFormatException.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/JARSoundbankReader.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/JARSoundbankReader.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/JARSoundbankReader.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/JARSoundbankReader.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/JDK13Services.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/JDK13Services.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/JDK13Services.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/JSSecurityManager.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/JSSecurityManager.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/JSSecurityManager.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/JSSecurityManager.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/JavaSoundAudioClip.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/JavaSoundAudioClip.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/JavaSoundAudioClip.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/JavaSoundAudioClip.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/MidiDeviceReceiverEnvelope.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiDeviceReceiverEnvelope.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/MidiDeviceReceiverEnvelope.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiDeviceReceiverEnvelope.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/MidiDeviceTransmitterEnvelope.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiDeviceTransmitterEnvelope.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/MidiDeviceTransmitterEnvelope.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiDeviceTransmitterEnvelope.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/MidiInDevice.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiInDevice.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/MidiInDevice.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiInDevice.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/MidiInDeviceProvider.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiInDeviceProvider.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/MidiInDeviceProvider.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiInDeviceProvider.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/MidiOutDevice.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiOutDevice.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/MidiOutDevice.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiOutDevice.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/MidiOutDeviceProvider.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiOutDeviceProvider.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/MidiOutDeviceProvider.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiOutDeviceProvider.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/MidiUtils.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiUtils.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/MidiUtils.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiUtils.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/ModelAbstractChannelMixer.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelAbstractChannelMixer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/ModelAbstractChannelMixer.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelAbstractChannelMixer.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/ModelAbstractOscillator.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelAbstractOscillator.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/ModelAbstractOscillator.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelAbstractOscillator.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/ModelByteBuffer.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelByteBuffer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/ModelByteBuffer.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelByteBuffer.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/ModelChannelMixer.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelChannelMixer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/ModelChannelMixer.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelChannelMixer.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/ModelConnectionBlock.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelConnectionBlock.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/ModelConnectionBlock.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelConnectionBlock.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/ModelDestination.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelDestination.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/ModelDestination.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelDestination.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/ModelDirectedPlayer.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelDirectedPlayer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/ModelDirectedPlayer.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelDirectedPlayer.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/ModelDirector.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelDirector.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/ModelDirector.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelDirector.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/ModelIdentifier.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelIdentifier.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/ModelIdentifier.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelIdentifier.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/ModelInstrument.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelInstrument.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/ModelInstrument.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelInstrument.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/ModelInstrumentComparator.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelInstrumentComparator.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/ModelInstrumentComparator.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelInstrumentComparator.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/ModelMappedInstrument.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelMappedInstrument.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/ModelMappedInstrument.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelMappedInstrument.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/ModelOscillator.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelOscillator.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/ModelOscillator.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelOscillator.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/ModelOscillatorStream.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelOscillatorStream.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/ModelOscillatorStream.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelOscillatorStream.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/ModelPatch.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelPatch.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/ModelPatch.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelPatch.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/ModelPerformer.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelPerformer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/ModelPerformer.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelPerformer.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/ModelSource.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelSource.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/ModelSource.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelSource.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/ModelStandardDirector.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelStandardDirector.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/ModelStandardDirector.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelStandardDirector.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/ModelStandardIndexedDirector.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelStandardIndexedDirector.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/ModelStandardIndexedDirector.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelStandardIndexedDirector.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/ModelStandardTransform.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelStandardTransform.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/ModelStandardTransform.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelStandardTransform.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/ModelTransform.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelTransform.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/ModelTransform.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelTransform.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/ModelWavetable.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelWavetable.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/ModelWavetable.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelWavetable.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/PCMtoPCMCodec.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/PCMtoPCMCodec.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/PCMtoPCMCodec.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/PCMtoPCMCodec.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/Platform.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/Platform.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/Platform.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/Platform.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/PortMixer.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/PortMixer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/PortMixer.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/PortMixer.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/PortMixerProvider.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/PortMixerProvider.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/PortMixerProvider.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/PortMixerProvider.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/Printer.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/Printer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/Printer.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/Printer.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/RIFFInvalidDataException.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/RIFFInvalidDataException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/RIFFInvalidDataException.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/RIFFInvalidDataException.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/RIFFInvalidFormatException.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/RIFFInvalidFormatException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/RIFFInvalidFormatException.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/RIFFInvalidFormatException.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/RIFFReader.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/RIFFReader.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/RIFFReader.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/RIFFReader.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/RIFFWriter.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/RIFFWriter.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/RIFFWriter.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/RIFFWriter.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/RealTimeSequencer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/RealTimeSequencer.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencerProvider.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/RealTimeSequencerProvider.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/RealTimeSequencerProvider.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/RealTimeSequencerProvider.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/ReferenceCountingDevice.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/ReferenceCountingDevice.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/ReferenceCountingDevice.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/ReferenceCountingDevice.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SF2GlobalRegion.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2GlobalRegion.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SF2GlobalRegion.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2GlobalRegion.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SF2Instrument.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Instrument.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SF2Instrument.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Instrument.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SF2InstrumentRegion.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2InstrumentRegion.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SF2InstrumentRegion.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2InstrumentRegion.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SF2Layer.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Layer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SF2Layer.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Layer.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SF2LayerRegion.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2LayerRegion.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SF2LayerRegion.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2LayerRegion.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SF2Modulator.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Modulator.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SF2Modulator.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Modulator.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SF2Region.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Region.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SF2Region.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Region.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SF2Sample.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Sample.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SF2Sample.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Sample.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SF2Soundbank.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Soundbank.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SF2Soundbank.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Soundbank.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SF2SoundbankReader.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2SoundbankReader.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SF2SoundbankReader.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2SoundbankReader.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SimpleInstrument.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SimpleInstrument.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SimpleInstrument.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SimpleInstrument.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SimpleSoundbank.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SimpleSoundbank.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SimpleSoundbank.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SimpleSoundbank.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftAbstractResampler.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftAbstractResampler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftAbstractResampler.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftAbstractResampler.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftAudioBuffer.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftAudioBuffer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftAudioBuffer.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftAudioBuffer.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftAudioProcessor.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftAudioProcessor.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftAudioProcessor.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftAudioProcessor.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftAudioPusher.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftAudioPusher.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftAudioPusher.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftAudioPusher.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftChannel.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftChannel.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftChannel.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftChannelProxy.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftChannelProxy.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftChannelProxy.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftChannelProxy.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftChorus.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftChorus.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftChorus.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftChorus.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftControl.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftControl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftControl.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftControl.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftCubicResampler.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftCubicResampler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftCubicResampler.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftCubicResampler.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftEnvelopeGenerator.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftEnvelopeGenerator.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftEnvelopeGenerator.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftEnvelopeGenerator.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftFilter.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftFilter.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftFilter.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftInstrument.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftInstrument.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftInstrument.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftInstrument.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftJitterCorrector.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftJitterCorrector.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftLanczosResampler.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftLanczosResampler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftLanczosResampler.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftLanczosResampler.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftLimiter.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftLimiter.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftLimiter.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftLimiter.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftLinearResampler.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftLinearResampler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftLinearResampler.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftLinearResampler.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftLinearResampler2.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftLinearResampler2.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftLinearResampler2.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftLinearResampler2.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMainMixer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMainMixer.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftMidiAudioFileReader.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMidiAudioFileReader.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftMidiAudioFileReader.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMidiAudioFileReader.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftMixingClip.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMixingClip.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftMixingClip.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMixingClip.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftMixingDataLine.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMixingDataLine.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftMixingDataLine.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMixingDataLine.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftMixingMainMixer.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMixingMainMixer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftMixingMainMixer.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMixingMainMixer.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftMixingMixer.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMixingMixer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftMixingMixer.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMixingMixer.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftMixingMixerProvider.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMixingMixerProvider.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftMixingMixerProvider.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMixingMixerProvider.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftMixingSourceDataLine.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMixingSourceDataLine.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftMixingSourceDataLine.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMixingSourceDataLine.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftPerformer.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftPerformer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftPerformer.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftPerformer.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftPointResampler.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftPointResampler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftPointResampler.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftPointResampler.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftProcess.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftProcess.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftProcess.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftProcess.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftProvider.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftProvider.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftProvider.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftProvider.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftReceiver.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftReceiver.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftReceiver.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftReceiver.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftResampler.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftResampler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftResampler.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftResampler.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftResamplerStreamer.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftResamplerStreamer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftResamplerStreamer.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftResamplerStreamer.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftReverb.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftReverb.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftReverb.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftReverb.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftShortMessage.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftShortMessage.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftShortMessage.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftShortMessage.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftSincResampler.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftSincResampler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftSincResampler.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftSincResampler.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftSynthesizer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftSynthesizer.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftTuning.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftTuning.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftTuning.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftTuning.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftVoice.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SoftVoice.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftVoice.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/StandardMidiFileReader.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileReader.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/StandardMidiFileReader.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileReader.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/StandardMidiFileWriter.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileWriter.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/StandardMidiFileWriter.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileWriter.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SunCodec.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SunCodec.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SunCodec.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SunCodec.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SunFileReader.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SunFileReader.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SunFileReader.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SunFileReader.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/SunFileWriter.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SunFileWriter.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/SunFileWriter.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/SunFileWriter.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/Toolkit.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/Toolkit.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/Toolkit.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/Toolkit.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/UlawCodec.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/UlawCodec.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/UlawCodec.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/UlawCodec.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/WaveFileFormat.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFileFormat.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/WaveFileFormat.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFileFormat.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/WaveFileReader.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFileReader.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/WaveFileReader.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFileReader.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/WaveFileWriter.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFileWriter.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/WaveFileWriter.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFileWriter.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/WaveFloatFileReader.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFloatFileReader.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/WaveFloatFileReader.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFloatFileReader.java
diff --git a/jdk/src/share/classes/com/sun/media/sound/WaveFloatFileWriter.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFloatFileWriter.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/media/sound/WaveFloatFileWriter.java
rename to jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFloatFileWriter.java
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties b/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties
rename to jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties b/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties
rename to jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties b/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties
rename to jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties b/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties
rename to jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties b/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties
rename to jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties b/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties
rename to jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties b/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties
rename to jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties b/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties
rename to jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties b/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties
rename to jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties b/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties
rename to jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties b/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties
rename to jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal.properties b/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal.properties
rename to jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal.properties
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties b/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties
rename to jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties b/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties
rename to jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties b/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties
rename to jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties b/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties
rename to jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties b/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties
rename to jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties b/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties
rename to jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties b/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties
rename to jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties b/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties
rename to jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties b/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties
rename to jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties b/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties
rename to jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth.properties b/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth.properties
rename to jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth.properties
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_de.properties b/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_de.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_de.properties
rename to jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_de.properties
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_es.properties b/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_es.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_es.properties
rename to jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_es.properties
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties b/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties
rename to jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_it.properties b/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_it.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_it.properties
rename to jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_it.properties
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ja.properties b/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ja.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ja.properties
rename to jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ja.properties
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ko.properties b/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ko.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ko.properties
rename to jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ko.properties
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_pt_BR.properties b/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_pt_BR.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_pt_BR.properties
rename to jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_pt_BR.properties
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties b/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties
rename to jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.properties b/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.properties
rename to jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.properties
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.properties b/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.properties
rename to jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.properties
diff --git a/jdk/src/share/classes/java/applet/Applet.java b/jdk/src/java.desktop/share/classes/java/applet/Applet.java
similarity index 100%
rename from jdk/src/share/classes/java/applet/Applet.java
rename to jdk/src/java.desktop/share/classes/java/applet/Applet.java
diff --git a/jdk/src/share/classes/java/applet/AppletContext.java b/jdk/src/java.desktop/share/classes/java/applet/AppletContext.java
similarity index 100%
rename from jdk/src/share/classes/java/applet/AppletContext.java
rename to jdk/src/java.desktop/share/classes/java/applet/AppletContext.java
diff --git a/jdk/src/share/classes/java/applet/AppletStub.java b/jdk/src/java.desktop/share/classes/java/applet/AppletStub.java
similarity index 100%
rename from jdk/src/share/classes/java/applet/AppletStub.java
rename to jdk/src/java.desktop/share/classes/java/applet/AppletStub.java
diff --git a/jdk/src/share/classes/java/applet/AudioClip.java b/jdk/src/java.desktop/share/classes/java/applet/AudioClip.java
similarity index 100%
rename from jdk/src/share/classes/java/applet/AudioClip.java
rename to jdk/src/java.desktop/share/classes/java/applet/AudioClip.java
diff --git a/jdk/src/share/classes/java/applet/package.html b/jdk/src/java.desktop/share/classes/java/applet/package.html
similarity index 100%
rename from jdk/src/share/classes/java/applet/package.html
rename to jdk/src/java.desktop/share/classes/java/applet/package.html
diff --git a/jdk/src/share/classes/java/awt/AWTError.java b/jdk/src/java.desktop/share/classes/java/awt/AWTError.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/AWTError.java
rename to jdk/src/java.desktop/share/classes/java/awt/AWTError.java
diff --git a/jdk/src/share/classes/java/awt/AWTEvent.java b/jdk/src/java.desktop/share/classes/java/awt/AWTEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/AWTEvent.java
rename to jdk/src/java.desktop/share/classes/java/awt/AWTEvent.java
diff --git a/jdk/src/share/classes/java/awt/AWTEventMulticaster.java b/jdk/src/java.desktop/share/classes/java/awt/AWTEventMulticaster.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/AWTEventMulticaster.java
rename to jdk/src/java.desktop/share/classes/java/awt/AWTEventMulticaster.java
diff --git a/jdk/src/share/classes/java/awt/AWTException.java b/jdk/src/java.desktop/share/classes/java/awt/AWTException.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/AWTException.java
rename to jdk/src/java.desktop/share/classes/java/awt/AWTException.java
diff --git a/jdk/src/share/classes/java/awt/AWTKeyStroke.java b/jdk/src/java.desktop/share/classes/java/awt/AWTKeyStroke.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/AWTKeyStroke.java
rename to jdk/src/java.desktop/share/classes/java/awt/AWTKeyStroke.java
diff --git a/jdk/src/share/classes/java/awt/AWTPermission.java b/jdk/src/java.desktop/share/classes/java/awt/AWTPermission.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/AWTPermission.java
rename to jdk/src/java.desktop/share/classes/java/awt/AWTPermission.java
diff --git a/jdk/src/share/classes/java/awt/ActiveEvent.java b/jdk/src/java.desktop/share/classes/java/awt/ActiveEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/ActiveEvent.java
rename to jdk/src/java.desktop/share/classes/java/awt/ActiveEvent.java
diff --git a/jdk/src/share/classes/java/awt/Adjustable.java b/jdk/src/java.desktop/share/classes/java/awt/Adjustable.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/Adjustable.java
rename to jdk/src/java.desktop/share/classes/java/awt/Adjustable.java
diff --git a/jdk/src/share/classes/java/awt/AlphaComposite.java b/jdk/src/java.desktop/share/classes/java/awt/AlphaComposite.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/AlphaComposite.java
rename to jdk/src/java.desktop/share/classes/java/awt/AlphaComposite.java
diff --git a/jdk/src/share/classes/java/awt/AttributeValue.java b/jdk/src/java.desktop/share/classes/java/awt/AttributeValue.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/AttributeValue.java
rename to jdk/src/java.desktop/share/classes/java/awt/AttributeValue.java
diff --git a/jdk/src/share/classes/java/awt/BasicStroke.java b/jdk/src/java.desktop/share/classes/java/awt/BasicStroke.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/BasicStroke.java
rename to jdk/src/java.desktop/share/classes/java/awt/BasicStroke.java
diff --git a/jdk/src/share/classes/java/awt/BorderLayout.java b/jdk/src/java.desktop/share/classes/java/awt/BorderLayout.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/BorderLayout.java
rename to jdk/src/java.desktop/share/classes/java/awt/BorderLayout.java
diff --git a/jdk/src/share/classes/java/awt/BufferCapabilities.java b/jdk/src/java.desktop/share/classes/java/awt/BufferCapabilities.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/BufferCapabilities.java
rename to jdk/src/java.desktop/share/classes/java/awt/BufferCapabilities.java
diff --git a/jdk/src/share/classes/java/awt/Button.java b/jdk/src/java.desktop/share/classes/java/awt/Button.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/Button.java
rename to jdk/src/java.desktop/share/classes/java/awt/Button.java
diff --git a/jdk/src/share/classes/java/awt/Canvas.java b/jdk/src/java.desktop/share/classes/java/awt/Canvas.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/Canvas.java
rename to jdk/src/java.desktop/share/classes/java/awt/Canvas.java
diff --git a/jdk/src/share/classes/java/awt/CardLayout.java b/jdk/src/java.desktop/share/classes/java/awt/CardLayout.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/CardLayout.java
rename to jdk/src/java.desktop/share/classes/java/awt/CardLayout.java
diff --git a/jdk/src/share/classes/java/awt/Checkbox.java b/jdk/src/java.desktop/share/classes/java/awt/Checkbox.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/Checkbox.java
rename to jdk/src/java.desktop/share/classes/java/awt/Checkbox.java
diff --git a/jdk/src/share/classes/java/awt/CheckboxGroup.java b/jdk/src/java.desktop/share/classes/java/awt/CheckboxGroup.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/CheckboxGroup.java
rename to jdk/src/java.desktop/share/classes/java/awt/CheckboxGroup.java
diff --git a/jdk/src/share/classes/java/awt/CheckboxMenuItem.java b/jdk/src/java.desktop/share/classes/java/awt/CheckboxMenuItem.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/CheckboxMenuItem.java
rename to jdk/src/java.desktop/share/classes/java/awt/CheckboxMenuItem.java
diff --git a/jdk/src/share/classes/java/awt/Choice.java b/jdk/src/java.desktop/share/classes/java/awt/Choice.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/Choice.java
rename to jdk/src/java.desktop/share/classes/java/awt/Choice.java
diff --git a/jdk/src/share/classes/java/awt/Color.java b/jdk/src/java.desktop/share/classes/java/awt/Color.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/Color.java
rename to jdk/src/java.desktop/share/classes/java/awt/Color.java
diff --git a/jdk/src/share/classes/java/awt/ColorPaintContext.java b/jdk/src/java.desktop/share/classes/java/awt/ColorPaintContext.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/ColorPaintContext.java
rename to jdk/src/java.desktop/share/classes/java/awt/ColorPaintContext.java
diff --git a/jdk/src/share/classes/java/awt/Component.java b/jdk/src/java.desktop/share/classes/java/awt/Component.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/Component.java
rename to jdk/src/java.desktop/share/classes/java/awt/Component.java
diff --git a/jdk/src/share/classes/java/awt/ComponentOrientation.java b/jdk/src/java.desktop/share/classes/java/awt/ComponentOrientation.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/ComponentOrientation.java
rename to jdk/src/java.desktop/share/classes/java/awt/ComponentOrientation.java
diff --git a/jdk/src/share/classes/java/awt/Composite.java b/jdk/src/java.desktop/share/classes/java/awt/Composite.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/Composite.java
rename to jdk/src/java.desktop/share/classes/java/awt/Composite.java
diff --git a/jdk/src/share/classes/java/awt/CompositeContext.java b/jdk/src/java.desktop/share/classes/java/awt/CompositeContext.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/CompositeContext.java
rename to jdk/src/java.desktop/share/classes/java/awt/CompositeContext.java
diff --git a/jdk/src/share/classes/java/awt/Conditional.java b/jdk/src/java.desktop/share/classes/java/awt/Conditional.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/Conditional.java
rename to jdk/src/java.desktop/share/classes/java/awt/Conditional.java
diff --git a/jdk/src/share/classes/java/awt/Container.java b/jdk/src/java.desktop/share/classes/java/awt/Container.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/Container.java
rename to jdk/src/java.desktop/share/classes/java/awt/Container.java
diff --git a/jdk/src/share/classes/java/awt/ContainerOrderFocusTraversalPolicy.java b/jdk/src/java.desktop/share/classes/java/awt/ContainerOrderFocusTraversalPolicy.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/ContainerOrderFocusTraversalPolicy.java
rename to jdk/src/java.desktop/share/classes/java/awt/ContainerOrderFocusTraversalPolicy.java
diff --git a/jdk/src/share/classes/java/awt/Cursor.java b/jdk/src/java.desktop/share/classes/java/awt/Cursor.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/Cursor.java
rename to jdk/src/java.desktop/share/classes/java/awt/Cursor.java
diff --git a/jdk/src/share/classes/java/awt/DefaultFocusTraversalPolicy.java b/jdk/src/java.desktop/share/classes/java/awt/DefaultFocusTraversalPolicy.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/DefaultFocusTraversalPolicy.java
rename to jdk/src/java.desktop/share/classes/java/awt/DefaultFocusTraversalPolicy.java
diff --git a/jdk/src/share/classes/java/awt/DefaultKeyboardFocusManager.java b/jdk/src/java.desktop/share/classes/java/awt/DefaultKeyboardFocusManager.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/DefaultKeyboardFocusManager.java
rename to jdk/src/java.desktop/share/classes/java/awt/DefaultKeyboardFocusManager.java
diff --git a/jdk/src/share/classes/java/awt/Desktop.java b/jdk/src/java.desktop/share/classes/java/awt/Desktop.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/Desktop.java
rename to jdk/src/java.desktop/share/classes/java/awt/Desktop.java
diff --git a/jdk/src/share/classes/java/awt/Dialog.java b/jdk/src/java.desktop/share/classes/java/awt/Dialog.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/Dialog.java
rename to jdk/src/java.desktop/share/classes/java/awt/Dialog.java
diff --git a/jdk/src/share/classes/java/awt/Dimension.java b/jdk/src/java.desktop/share/classes/java/awt/Dimension.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/Dimension.java
rename to jdk/src/java.desktop/share/classes/java/awt/Dimension.java
diff --git a/jdk/src/share/classes/java/awt/DisplayMode.java b/jdk/src/java.desktop/share/classes/java/awt/DisplayMode.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/DisplayMode.java
rename to jdk/src/java.desktop/share/classes/java/awt/DisplayMode.java
diff --git a/jdk/src/share/classes/java/awt/Event.java b/jdk/src/java.desktop/share/classes/java/awt/Event.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/Event.java
rename to jdk/src/java.desktop/share/classes/java/awt/Event.java
diff --git a/jdk/src/share/classes/java/awt/EventDispatchThread.java b/jdk/src/java.desktop/share/classes/java/awt/EventDispatchThread.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/EventDispatchThread.java
rename to jdk/src/java.desktop/share/classes/java/awt/EventDispatchThread.java
diff --git a/jdk/src/share/classes/java/awt/EventFilter.java b/jdk/src/java.desktop/share/classes/java/awt/EventFilter.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/EventFilter.java
rename to jdk/src/java.desktop/share/classes/java/awt/EventFilter.java
diff --git a/jdk/src/share/classes/java/awt/EventQueue.java b/jdk/src/java.desktop/share/classes/java/awt/EventQueue.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/EventQueue.java
rename to jdk/src/java.desktop/share/classes/java/awt/EventQueue.java
diff --git a/jdk/src/share/classes/java/awt/FileDialog.java b/jdk/src/java.desktop/share/classes/java/awt/FileDialog.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/FileDialog.java
rename to jdk/src/java.desktop/share/classes/java/awt/FileDialog.java
diff --git a/jdk/src/share/classes/java/awt/FlowLayout.java b/jdk/src/java.desktop/share/classes/java/awt/FlowLayout.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/FlowLayout.java
rename to jdk/src/java.desktop/share/classes/java/awt/FlowLayout.java
diff --git a/jdk/src/share/classes/java/awt/FocusTraversalPolicy.java b/jdk/src/java.desktop/share/classes/java/awt/FocusTraversalPolicy.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/FocusTraversalPolicy.java
rename to jdk/src/java.desktop/share/classes/java/awt/FocusTraversalPolicy.java
diff --git a/jdk/src/share/classes/java/awt/Font.java b/jdk/src/java.desktop/share/classes/java/awt/Font.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/Font.java
rename to jdk/src/java.desktop/share/classes/java/awt/Font.java
diff --git a/jdk/src/share/classes/java/awt/FontFormatException.java b/jdk/src/java.desktop/share/classes/java/awt/FontFormatException.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/FontFormatException.java
rename to jdk/src/java.desktop/share/classes/java/awt/FontFormatException.java
diff --git a/jdk/src/share/classes/java/awt/FontMetrics.java b/jdk/src/java.desktop/share/classes/java/awt/FontMetrics.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/FontMetrics.java
rename to jdk/src/java.desktop/share/classes/java/awt/FontMetrics.java
diff --git a/jdk/src/share/classes/java/awt/Frame.java b/jdk/src/java.desktop/share/classes/java/awt/Frame.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/Frame.java
rename to jdk/src/java.desktop/share/classes/java/awt/Frame.java
diff --git a/jdk/src/share/classes/java/awt/GradientPaint.java b/jdk/src/java.desktop/share/classes/java/awt/GradientPaint.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/GradientPaint.java
rename to jdk/src/java.desktop/share/classes/java/awt/GradientPaint.java
diff --git a/jdk/src/share/classes/java/awt/GradientPaintContext.java b/jdk/src/java.desktop/share/classes/java/awt/GradientPaintContext.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/GradientPaintContext.java
rename to jdk/src/java.desktop/share/classes/java/awt/GradientPaintContext.java
diff --git a/jdk/src/share/classes/java/awt/Graphics.java b/jdk/src/java.desktop/share/classes/java/awt/Graphics.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/Graphics.java
rename to jdk/src/java.desktop/share/classes/java/awt/Graphics.java
diff --git a/jdk/src/share/classes/java/awt/Graphics2D.java b/jdk/src/java.desktop/share/classes/java/awt/Graphics2D.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/Graphics2D.java
rename to jdk/src/java.desktop/share/classes/java/awt/Graphics2D.java
diff --git a/jdk/src/share/classes/java/awt/GraphicsCallback.java b/jdk/src/java.desktop/share/classes/java/awt/GraphicsCallback.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/GraphicsCallback.java
rename to jdk/src/java.desktop/share/classes/java/awt/GraphicsCallback.java
diff --git a/jdk/src/share/classes/java/awt/GraphicsConfigTemplate.java b/jdk/src/java.desktop/share/classes/java/awt/GraphicsConfigTemplate.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/GraphicsConfigTemplate.java
rename to jdk/src/java.desktop/share/classes/java/awt/GraphicsConfigTemplate.java
diff --git a/jdk/src/share/classes/java/awt/GraphicsConfiguration.java b/jdk/src/java.desktop/share/classes/java/awt/GraphicsConfiguration.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/GraphicsConfiguration.java
rename to jdk/src/java.desktop/share/classes/java/awt/GraphicsConfiguration.java
diff --git a/jdk/src/share/classes/java/awt/GraphicsDevice.java b/jdk/src/java.desktop/share/classes/java/awt/GraphicsDevice.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/GraphicsDevice.java
rename to jdk/src/java.desktop/share/classes/java/awt/GraphicsDevice.java
diff --git a/jdk/src/share/classes/java/awt/GraphicsEnvironment.java b/jdk/src/java.desktop/share/classes/java/awt/GraphicsEnvironment.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/GraphicsEnvironment.java
rename to jdk/src/java.desktop/share/classes/java/awt/GraphicsEnvironment.java
diff --git a/jdk/src/share/classes/java/awt/GridBagConstraints.java b/jdk/src/java.desktop/share/classes/java/awt/GridBagConstraints.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/GridBagConstraints.java
rename to jdk/src/java.desktop/share/classes/java/awt/GridBagConstraints.java
diff --git a/jdk/src/share/classes/java/awt/GridBagLayout.java b/jdk/src/java.desktop/share/classes/java/awt/GridBagLayout.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/GridBagLayout.java
rename to jdk/src/java.desktop/share/classes/java/awt/GridBagLayout.java
diff --git a/jdk/src/share/classes/java/awt/GridBagLayoutInfo.java b/jdk/src/java.desktop/share/classes/java/awt/GridBagLayoutInfo.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/GridBagLayoutInfo.java
rename to jdk/src/java.desktop/share/classes/java/awt/GridBagLayoutInfo.java
diff --git a/jdk/src/share/classes/java/awt/GridLayout.java b/jdk/src/java.desktop/share/classes/java/awt/GridLayout.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/GridLayout.java
rename to jdk/src/java.desktop/share/classes/java/awt/GridLayout.java
diff --git a/jdk/src/share/classes/java/awt/HeadlessException.java b/jdk/src/java.desktop/share/classes/java/awt/HeadlessException.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/HeadlessException.java
rename to jdk/src/java.desktop/share/classes/java/awt/HeadlessException.java
diff --git a/jdk/src/share/classes/java/awt/IllegalComponentStateException.java b/jdk/src/java.desktop/share/classes/java/awt/IllegalComponentStateException.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/IllegalComponentStateException.java
rename to jdk/src/java.desktop/share/classes/java/awt/IllegalComponentStateException.java
diff --git a/jdk/src/share/classes/java/awt/Image.java b/jdk/src/java.desktop/share/classes/java/awt/Image.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/Image.java
rename to jdk/src/java.desktop/share/classes/java/awt/Image.java
diff --git a/jdk/src/share/classes/java/awt/ImageCapabilities.java b/jdk/src/java.desktop/share/classes/java/awt/ImageCapabilities.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/ImageCapabilities.java
rename to jdk/src/java.desktop/share/classes/java/awt/ImageCapabilities.java
diff --git a/jdk/src/share/classes/java/awt/Insets.java b/jdk/src/java.desktop/share/classes/java/awt/Insets.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/Insets.java
rename to jdk/src/java.desktop/share/classes/java/awt/Insets.java
diff --git a/jdk/src/share/classes/java/awt/ItemSelectable.java b/jdk/src/java.desktop/share/classes/java/awt/ItemSelectable.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/ItemSelectable.java
rename to jdk/src/java.desktop/share/classes/java/awt/ItemSelectable.java
diff --git a/jdk/src/share/classes/java/awt/JobAttributes.java b/jdk/src/java.desktop/share/classes/java/awt/JobAttributes.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/JobAttributes.java
rename to jdk/src/java.desktop/share/classes/java/awt/JobAttributes.java
diff --git a/jdk/src/share/classes/java/awt/KeyEventDispatcher.java b/jdk/src/java.desktop/share/classes/java/awt/KeyEventDispatcher.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/KeyEventDispatcher.java
rename to jdk/src/java.desktop/share/classes/java/awt/KeyEventDispatcher.java
diff --git a/jdk/src/share/classes/java/awt/KeyEventPostProcessor.java b/jdk/src/java.desktop/share/classes/java/awt/KeyEventPostProcessor.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/KeyEventPostProcessor.java
rename to jdk/src/java.desktop/share/classes/java/awt/KeyEventPostProcessor.java
diff --git a/jdk/src/share/classes/java/awt/KeyboardFocusManager.java b/jdk/src/java.desktop/share/classes/java/awt/KeyboardFocusManager.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/KeyboardFocusManager.java
rename to jdk/src/java.desktop/share/classes/java/awt/KeyboardFocusManager.java
diff --git a/jdk/src/share/classes/java/awt/Label.java b/jdk/src/java.desktop/share/classes/java/awt/Label.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/Label.java
rename to jdk/src/java.desktop/share/classes/java/awt/Label.java
diff --git a/jdk/src/share/classes/java/awt/LayoutManager.java b/jdk/src/java.desktop/share/classes/java/awt/LayoutManager.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/LayoutManager.java
rename to jdk/src/java.desktop/share/classes/java/awt/LayoutManager.java
diff --git a/jdk/src/share/classes/java/awt/LayoutManager2.java b/jdk/src/java.desktop/share/classes/java/awt/LayoutManager2.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/LayoutManager2.java
rename to jdk/src/java.desktop/share/classes/java/awt/LayoutManager2.java
diff --git a/jdk/src/share/classes/java/awt/LinearGradientPaint.java b/jdk/src/java.desktop/share/classes/java/awt/LinearGradientPaint.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/LinearGradientPaint.java
rename to jdk/src/java.desktop/share/classes/java/awt/LinearGradientPaint.java
diff --git a/jdk/src/share/classes/java/awt/LinearGradientPaintContext.java b/jdk/src/java.desktop/share/classes/java/awt/LinearGradientPaintContext.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/LinearGradientPaintContext.java
rename to jdk/src/java.desktop/share/classes/java/awt/LinearGradientPaintContext.java
diff --git a/jdk/src/share/classes/java/awt/List.java b/jdk/src/java.desktop/share/classes/java/awt/List.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/List.java
rename to jdk/src/java.desktop/share/classes/java/awt/List.java
diff --git a/jdk/src/share/classes/java/awt/MediaTracker.java b/jdk/src/java.desktop/share/classes/java/awt/MediaTracker.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/MediaTracker.java
rename to jdk/src/java.desktop/share/classes/java/awt/MediaTracker.java
diff --git a/jdk/src/share/classes/java/awt/Menu.java b/jdk/src/java.desktop/share/classes/java/awt/Menu.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/Menu.java
rename to jdk/src/java.desktop/share/classes/java/awt/Menu.java
diff --git a/jdk/src/share/classes/java/awt/MenuBar.java b/jdk/src/java.desktop/share/classes/java/awt/MenuBar.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/MenuBar.java
rename to jdk/src/java.desktop/share/classes/java/awt/MenuBar.java
diff --git a/jdk/src/share/classes/java/awt/MenuComponent.java b/jdk/src/java.desktop/share/classes/java/awt/MenuComponent.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/MenuComponent.java
rename to jdk/src/java.desktop/share/classes/java/awt/MenuComponent.java
diff --git a/jdk/src/share/classes/java/awt/MenuContainer.java b/jdk/src/java.desktop/share/classes/java/awt/MenuContainer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/MenuContainer.java
rename to jdk/src/java.desktop/share/classes/java/awt/MenuContainer.java
diff --git a/jdk/src/share/classes/java/awt/MenuItem.java b/jdk/src/java.desktop/share/classes/java/awt/MenuItem.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/MenuItem.java
rename to jdk/src/java.desktop/share/classes/java/awt/MenuItem.java
diff --git a/jdk/src/share/classes/java/awt/MenuShortcut.java b/jdk/src/java.desktop/share/classes/java/awt/MenuShortcut.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/MenuShortcut.java
rename to jdk/src/java.desktop/share/classes/java/awt/MenuShortcut.java
diff --git a/jdk/src/share/classes/java/awt/ModalEventFilter.java b/jdk/src/java.desktop/share/classes/java/awt/ModalEventFilter.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/ModalEventFilter.java
rename to jdk/src/java.desktop/share/classes/java/awt/ModalEventFilter.java
diff --git a/jdk/src/share/classes/java/awt/MouseInfo.java b/jdk/src/java.desktop/share/classes/java/awt/MouseInfo.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/MouseInfo.java
rename to jdk/src/java.desktop/share/classes/java/awt/MouseInfo.java
diff --git a/jdk/src/share/classes/java/awt/MultipleGradientPaint.java b/jdk/src/java.desktop/share/classes/java/awt/MultipleGradientPaint.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/MultipleGradientPaint.java
rename to jdk/src/java.desktop/share/classes/java/awt/MultipleGradientPaint.java
diff --git a/jdk/src/share/classes/java/awt/MultipleGradientPaintContext.java b/jdk/src/java.desktop/share/classes/java/awt/MultipleGradientPaintContext.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/MultipleGradientPaintContext.java
rename to jdk/src/java.desktop/share/classes/java/awt/MultipleGradientPaintContext.java
diff --git a/jdk/src/share/classes/java/awt/PageAttributes.java b/jdk/src/java.desktop/share/classes/java/awt/PageAttributes.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/PageAttributes.java
rename to jdk/src/java.desktop/share/classes/java/awt/PageAttributes.java
diff --git a/jdk/src/share/classes/java/awt/Paint.java b/jdk/src/java.desktop/share/classes/java/awt/Paint.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/Paint.java
rename to jdk/src/java.desktop/share/classes/java/awt/Paint.java
diff --git a/jdk/src/share/classes/java/awt/PaintContext.java b/jdk/src/java.desktop/share/classes/java/awt/PaintContext.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/PaintContext.java
rename to jdk/src/java.desktop/share/classes/java/awt/PaintContext.java
diff --git a/jdk/src/share/classes/java/awt/Panel.java b/jdk/src/java.desktop/share/classes/java/awt/Panel.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/Panel.java
rename to jdk/src/java.desktop/share/classes/java/awt/Panel.java
diff --git a/jdk/src/share/classes/java/awt/Point.java b/jdk/src/java.desktop/share/classes/java/awt/Point.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/Point.java
rename to jdk/src/java.desktop/share/classes/java/awt/Point.java
diff --git a/jdk/src/share/classes/java/awt/PointerInfo.java b/jdk/src/java.desktop/share/classes/java/awt/PointerInfo.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/PointerInfo.java
rename to jdk/src/java.desktop/share/classes/java/awt/PointerInfo.java
diff --git a/jdk/src/share/classes/java/awt/Polygon.java b/jdk/src/java.desktop/share/classes/java/awt/Polygon.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/Polygon.java
rename to jdk/src/java.desktop/share/classes/java/awt/Polygon.java
diff --git a/jdk/src/share/classes/java/awt/PopupMenu.java b/jdk/src/java.desktop/share/classes/java/awt/PopupMenu.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/PopupMenu.java
rename to jdk/src/java.desktop/share/classes/java/awt/PopupMenu.java
diff --git a/jdk/src/share/classes/java/awt/PrintGraphics.java b/jdk/src/java.desktop/share/classes/java/awt/PrintGraphics.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/PrintGraphics.java
rename to jdk/src/java.desktop/share/classes/java/awt/PrintGraphics.java
diff --git a/jdk/src/share/classes/java/awt/PrintJob.java b/jdk/src/java.desktop/share/classes/java/awt/PrintJob.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/PrintJob.java
rename to jdk/src/java.desktop/share/classes/java/awt/PrintJob.java
diff --git a/jdk/src/share/classes/java/awt/RadialGradientPaint.java b/jdk/src/java.desktop/share/classes/java/awt/RadialGradientPaint.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/RadialGradientPaint.java
rename to jdk/src/java.desktop/share/classes/java/awt/RadialGradientPaint.java
diff --git a/jdk/src/share/classes/java/awt/RadialGradientPaintContext.java b/jdk/src/java.desktop/share/classes/java/awt/RadialGradientPaintContext.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/RadialGradientPaintContext.java
rename to jdk/src/java.desktop/share/classes/java/awt/RadialGradientPaintContext.java
diff --git a/jdk/src/share/classes/java/awt/Rectangle.java b/jdk/src/java.desktop/share/classes/java/awt/Rectangle.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/Rectangle.java
rename to jdk/src/java.desktop/share/classes/java/awt/Rectangle.java
diff --git a/jdk/src/share/classes/java/awt/RenderingHints.java b/jdk/src/java.desktop/share/classes/java/awt/RenderingHints.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/RenderingHints.java
rename to jdk/src/java.desktop/share/classes/java/awt/RenderingHints.java
diff --git a/jdk/src/share/classes/java/awt/Robot.java b/jdk/src/java.desktop/share/classes/java/awt/Robot.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/Robot.java
rename to jdk/src/java.desktop/share/classes/java/awt/Robot.java
diff --git a/jdk/src/share/classes/java/awt/ScrollPane.java b/jdk/src/java.desktop/share/classes/java/awt/ScrollPane.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/ScrollPane.java
rename to jdk/src/java.desktop/share/classes/java/awt/ScrollPane.java
diff --git a/jdk/src/share/classes/java/awt/ScrollPaneAdjustable.java b/jdk/src/java.desktop/share/classes/java/awt/ScrollPaneAdjustable.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/ScrollPaneAdjustable.java
rename to jdk/src/java.desktop/share/classes/java/awt/ScrollPaneAdjustable.java
diff --git a/jdk/src/share/classes/java/awt/Scrollbar.java b/jdk/src/java.desktop/share/classes/java/awt/Scrollbar.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/Scrollbar.java
rename to jdk/src/java.desktop/share/classes/java/awt/Scrollbar.java
diff --git a/jdk/src/share/classes/java/awt/SecondaryLoop.java b/jdk/src/java.desktop/share/classes/java/awt/SecondaryLoop.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/SecondaryLoop.java
rename to jdk/src/java.desktop/share/classes/java/awt/SecondaryLoop.java
diff --git a/jdk/src/share/classes/java/awt/SentEvent.java b/jdk/src/java.desktop/share/classes/java/awt/SentEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/SentEvent.java
rename to jdk/src/java.desktop/share/classes/java/awt/SentEvent.java
diff --git a/jdk/src/share/classes/java/awt/SequencedEvent.java b/jdk/src/java.desktop/share/classes/java/awt/SequencedEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/SequencedEvent.java
rename to jdk/src/java.desktop/share/classes/java/awt/SequencedEvent.java
diff --git a/jdk/src/share/classes/java/awt/Shape.java b/jdk/src/java.desktop/share/classes/java/awt/Shape.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/Shape.java
rename to jdk/src/java.desktop/share/classes/java/awt/Shape.java
diff --git a/jdk/src/share/classes/java/awt/SplashScreen.java b/jdk/src/java.desktop/share/classes/java/awt/SplashScreen.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/SplashScreen.java
rename to jdk/src/java.desktop/share/classes/java/awt/SplashScreen.java
diff --git a/jdk/src/share/classes/java/awt/Stroke.java b/jdk/src/java.desktop/share/classes/java/awt/Stroke.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/Stroke.java
rename to jdk/src/java.desktop/share/classes/java/awt/Stroke.java
diff --git a/jdk/src/share/classes/java/awt/SystemColor.java b/jdk/src/java.desktop/share/classes/java/awt/SystemColor.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/SystemColor.java
rename to jdk/src/java.desktop/share/classes/java/awt/SystemColor.java
diff --git a/jdk/src/share/classes/java/awt/SystemTray.java b/jdk/src/java.desktop/share/classes/java/awt/SystemTray.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/SystemTray.java
rename to jdk/src/java.desktop/share/classes/java/awt/SystemTray.java
diff --git a/jdk/src/share/classes/java/awt/TextArea.java b/jdk/src/java.desktop/share/classes/java/awt/TextArea.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/TextArea.java
rename to jdk/src/java.desktop/share/classes/java/awt/TextArea.java
diff --git a/jdk/src/share/classes/java/awt/TextComponent.java b/jdk/src/java.desktop/share/classes/java/awt/TextComponent.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/TextComponent.java
rename to jdk/src/java.desktop/share/classes/java/awt/TextComponent.java
diff --git a/jdk/src/share/classes/java/awt/TextField.java b/jdk/src/java.desktop/share/classes/java/awt/TextField.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/TextField.java
rename to jdk/src/java.desktop/share/classes/java/awt/TextField.java
diff --git a/jdk/src/share/classes/java/awt/TexturePaint.java b/jdk/src/java.desktop/share/classes/java/awt/TexturePaint.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/TexturePaint.java
rename to jdk/src/java.desktop/share/classes/java/awt/TexturePaint.java
diff --git a/jdk/src/share/classes/java/awt/TexturePaintContext.java b/jdk/src/java.desktop/share/classes/java/awt/TexturePaintContext.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/TexturePaintContext.java
rename to jdk/src/java.desktop/share/classes/java/awt/TexturePaintContext.java
diff --git a/jdk/src/share/classes/java/awt/Toolkit.java b/jdk/src/java.desktop/share/classes/java/awt/Toolkit.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/Toolkit.java
rename to jdk/src/java.desktop/share/classes/java/awt/Toolkit.java
diff --git a/jdk/src/share/classes/java/awt/Transparency.java b/jdk/src/java.desktop/share/classes/java/awt/Transparency.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/Transparency.java
rename to jdk/src/java.desktop/share/classes/java/awt/Transparency.java
diff --git a/jdk/src/share/classes/java/awt/TrayIcon.java b/jdk/src/java.desktop/share/classes/java/awt/TrayIcon.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/TrayIcon.java
rename to jdk/src/java.desktop/share/classes/java/awt/TrayIcon.java
diff --git a/jdk/src/share/classes/java/awt/WaitDispatchSupport.java b/jdk/src/java.desktop/share/classes/java/awt/WaitDispatchSupport.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/WaitDispatchSupport.java
rename to jdk/src/java.desktop/share/classes/java/awt/WaitDispatchSupport.java
diff --git a/jdk/src/share/classes/java/awt/Window.java b/jdk/src/java.desktop/share/classes/java/awt/Window.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/Window.java
rename to jdk/src/java.desktop/share/classes/java/awt/Window.java
diff --git a/jdk/src/share/classes/java/awt/color/CMMException.java b/jdk/src/java.desktop/share/classes/java/awt/color/CMMException.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/color/CMMException.java
rename to jdk/src/java.desktop/share/classes/java/awt/color/CMMException.java
diff --git a/jdk/src/share/classes/java/awt/color/ColorSpace.java b/jdk/src/java.desktop/share/classes/java/awt/color/ColorSpace.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/color/ColorSpace.java
rename to jdk/src/java.desktop/share/classes/java/awt/color/ColorSpace.java
diff --git a/jdk/src/share/classes/java/awt/color/ICC_ColorSpace.java b/jdk/src/java.desktop/share/classes/java/awt/color/ICC_ColorSpace.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/color/ICC_ColorSpace.java
rename to jdk/src/java.desktop/share/classes/java/awt/color/ICC_ColorSpace.java
diff --git a/jdk/src/share/classes/java/awt/color/ICC_Profile.java b/jdk/src/java.desktop/share/classes/java/awt/color/ICC_Profile.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/color/ICC_Profile.java
rename to jdk/src/java.desktop/share/classes/java/awt/color/ICC_Profile.java
diff --git a/jdk/src/share/classes/java/awt/color/ICC_ProfileGray.java b/jdk/src/java.desktop/share/classes/java/awt/color/ICC_ProfileGray.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/color/ICC_ProfileGray.java
rename to jdk/src/java.desktop/share/classes/java/awt/color/ICC_ProfileGray.java
diff --git a/jdk/src/share/classes/java/awt/color/ICC_ProfileRGB.java b/jdk/src/java.desktop/share/classes/java/awt/color/ICC_ProfileRGB.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/color/ICC_ProfileRGB.java
rename to jdk/src/java.desktop/share/classes/java/awt/color/ICC_ProfileRGB.java
diff --git a/jdk/src/share/classes/java/awt/color/ProfileDataException.java b/jdk/src/java.desktop/share/classes/java/awt/color/ProfileDataException.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/color/ProfileDataException.java
rename to jdk/src/java.desktop/share/classes/java/awt/color/ProfileDataException.java
diff --git a/jdk/src/share/classes/java/awt/color/package.html b/jdk/src/java.desktop/share/classes/java/awt/color/package.html
similarity index 100%
rename from jdk/src/share/classes/java/awt/color/package.html
rename to jdk/src/java.desktop/share/classes/java/awt/color/package.html
diff --git a/jdk/src/share/classes/java/awt/datatransfer/Clipboard.java b/jdk/src/java.desktop/share/classes/java/awt/datatransfer/Clipboard.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/datatransfer/Clipboard.java
rename to jdk/src/java.desktop/share/classes/java/awt/datatransfer/Clipboard.java
diff --git a/jdk/src/share/classes/java/awt/datatransfer/ClipboardOwner.java b/jdk/src/java.desktop/share/classes/java/awt/datatransfer/ClipboardOwner.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/datatransfer/ClipboardOwner.java
rename to jdk/src/java.desktop/share/classes/java/awt/datatransfer/ClipboardOwner.java
diff --git a/jdk/src/share/classes/java/awt/datatransfer/DataFlavor.java b/jdk/src/java.desktop/share/classes/java/awt/datatransfer/DataFlavor.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/datatransfer/DataFlavor.java
rename to jdk/src/java.desktop/share/classes/java/awt/datatransfer/DataFlavor.java
diff --git a/jdk/src/share/classes/java/awt/datatransfer/FlavorEvent.java b/jdk/src/java.desktop/share/classes/java/awt/datatransfer/FlavorEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/datatransfer/FlavorEvent.java
rename to jdk/src/java.desktop/share/classes/java/awt/datatransfer/FlavorEvent.java
diff --git a/jdk/src/share/classes/java/awt/datatransfer/FlavorListener.java b/jdk/src/java.desktop/share/classes/java/awt/datatransfer/FlavorListener.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/datatransfer/FlavorListener.java
rename to jdk/src/java.desktop/share/classes/java/awt/datatransfer/FlavorListener.java
diff --git a/jdk/src/share/classes/java/awt/datatransfer/FlavorMap.java b/jdk/src/java.desktop/share/classes/java/awt/datatransfer/FlavorMap.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/datatransfer/FlavorMap.java
rename to jdk/src/java.desktop/share/classes/java/awt/datatransfer/FlavorMap.java
diff --git a/jdk/src/share/classes/java/awt/datatransfer/FlavorTable.java b/jdk/src/java.desktop/share/classes/java/awt/datatransfer/FlavorTable.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/datatransfer/FlavorTable.java
rename to jdk/src/java.desktop/share/classes/java/awt/datatransfer/FlavorTable.java
diff --git a/jdk/src/share/classes/java/awt/datatransfer/MimeType.java b/jdk/src/java.desktop/share/classes/java/awt/datatransfer/MimeType.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/datatransfer/MimeType.java
rename to jdk/src/java.desktop/share/classes/java/awt/datatransfer/MimeType.java
diff --git a/jdk/src/share/classes/java/awt/datatransfer/MimeTypeParameterList.java b/jdk/src/java.desktop/share/classes/java/awt/datatransfer/MimeTypeParameterList.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/datatransfer/MimeTypeParameterList.java
rename to jdk/src/java.desktop/share/classes/java/awt/datatransfer/MimeTypeParameterList.java
diff --git a/jdk/src/share/classes/java/awt/datatransfer/MimeTypeParseException.java b/jdk/src/java.desktop/share/classes/java/awt/datatransfer/MimeTypeParseException.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/datatransfer/MimeTypeParseException.java
rename to jdk/src/java.desktop/share/classes/java/awt/datatransfer/MimeTypeParseException.java
diff --git a/jdk/src/share/classes/java/awt/datatransfer/StringSelection.java b/jdk/src/java.desktop/share/classes/java/awt/datatransfer/StringSelection.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/datatransfer/StringSelection.java
rename to jdk/src/java.desktop/share/classes/java/awt/datatransfer/StringSelection.java
diff --git a/jdk/src/share/classes/java/awt/datatransfer/SystemFlavorMap.java b/jdk/src/java.desktop/share/classes/java/awt/datatransfer/SystemFlavorMap.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/datatransfer/SystemFlavorMap.java
rename to jdk/src/java.desktop/share/classes/java/awt/datatransfer/SystemFlavorMap.java
diff --git a/jdk/src/share/classes/java/awt/datatransfer/Transferable.java b/jdk/src/java.desktop/share/classes/java/awt/datatransfer/Transferable.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/datatransfer/Transferable.java
rename to jdk/src/java.desktop/share/classes/java/awt/datatransfer/Transferable.java
diff --git a/jdk/src/share/classes/java/awt/datatransfer/UnsupportedFlavorException.java b/jdk/src/java.desktop/share/classes/java/awt/datatransfer/UnsupportedFlavorException.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/datatransfer/UnsupportedFlavorException.java
rename to jdk/src/java.desktop/share/classes/java/awt/datatransfer/UnsupportedFlavorException.java
diff --git a/jdk/src/share/classes/java/awt/datatransfer/package.html b/jdk/src/java.desktop/share/classes/java/awt/datatransfer/package.html
similarity index 100%
rename from jdk/src/share/classes/java/awt/datatransfer/package.html
rename to jdk/src/java.desktop/share/classes/java/awt/datatransfer/package.html
diff --git a/jdk/src/share/classes/java/awt/dnd/Autoscroll.java b/jdk/src/java.desktop/share/classes/java/awt/dnd/Autoscroll.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/dnd/Autoscroll.java
rename to jdk/src/java.desktop/share/classes/java/awt/dnd/Autoscroll.java
diff --git a/jdk/src/share/classes/java/awt/dnd/DnDConstants.java b/jdk/src/java.desktop/share/classes/java/awt/dnd/DnDConstants.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/dnd/DnDConstants.java
rename to jdk/src/java.desktop/share/classes/java/awt/dnd/DnDConstants.java
diff --git a/jdk/src/share/classes/java/awt/dnd/DnDEventMulticaster.java b/jdk/src/java.desktop/share/classes/java/awt/dnd/DnDEventMulticaster.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/dnd/DnDEventMulticaster.java
rename to jdk/src/java.desktop/share/classes/java/awt/dnd/DnDEventMulticaster.java
diff --git a/jdk/src/share/classes/java/awt/dnd/DragGestureEvent.java b/jdk/src/java.desktop/share/classes/java/awt/dnd/DragGestureEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/dnd/DragGestureEvent.java
rename to jdk/src/java.desktop/share/classes/java/awt/dnd/DragGestureEvent.java
diff --git a/jdk/src/share/classes/java/awt/dnd/DragGestureListener.java b/jdk/src/java.desktop/share/classes/java/awt/dnd/DragGestureListener.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/dnd/DragGestureListener.java
rename to jdk/src/java.desktop/share/classes/java/awt/dnd/DragGestureListener.java
diff --git a/jdk/src/share/classes/java/awt/dnd/DragGestureRecognizer.java b/jdk/src/java.desktop/share/classes/java/awt/dnd/DragGestureRecognizer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/dnd/DragGestureRecognizer.java
rename to jdk/src/java.desktop/share/classes/java/awt/dnd/DragGestureRecognizer.java
diff --git a/jdk/src/share/classes/java/awt/dnd/DragSource.java b/jdk/src/java.desktop/share/classes/java/awt/dnd/DragSource.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/dnd/DragSource.java
rename to jdk/src/java.desktop/share/classes/java/awt/dnd/DragSource.java
diff --git a/jdk/src/share/classes/java/awt/dnd/DragSourceAdapter.java b/jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceAdapter.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/dnd/DragSourceAdapter.java
rename to jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceAdapter.java
diff --git a/jdk/src/share/classes/java/awt/dnd/DragSourceContext.java b/jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceContext.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/dnd/DragSourceContext.java
rename to jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceContext.java
diff --git a/jdk/src/share/classes/java/awt/dnd/DragSourceDragEvent.java b/jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceDragEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/dnd/DragSourceDragEvent.java
rename to jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceDragEvent.java
diff --git a/jdk/src/share/classes/java/awt/dnd/DragSourceDropEvent.java b/jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceDropEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/dnd/DragSourceDropEvent.java
rename to jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceDropEvent.java
diff --git a/jdk/src/share/classes/java/awt/dnd/DragSourceEvent.java b/jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/dnd/DragSourceEvent.java
rename to jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceEvent.java
diff --git a/jdk/src/share/classes/java/awt/dnd/DragSourceListener.java b/jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceListener.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/dnd/DragSourceListener.java
rename to jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceListener.java
diff --git a/jdk/src/share/classes/java/awt/dnd/DragSourceMotionListener.java b/jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceMotionListener.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/dnd/DragSourceMotionListener.java
rename to jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceMotionListener.java
diff --git a/jdk/src/share/classes/java/awt/dnd/DropTarget.java b/jdk/src/java.desktop/share/classes/java/awt/dnd/DropTarget.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/dnd/DropTarget.java
rename to jdk/src/java.desktop/share/classes/java/awt/dnd/DropTarget.java
diff --git a/jdk/src/share/classes/java/awt/dnd/DropTargetAdapter.java b/jdk/src/java.desktop/share/classes/java/awt/dnd/DropTargetAdapter.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/dnd/DropTargetAdapter.java
rename to jdk/src/java.desktop/share/classes/java/awt/dnd/DropTargetAdapter.java
diff --git a/jdk/src/share/classes/java/awt/dnd/DropTargetContext.java b/jdk/src/java.desktop/share/classes/java/awt/dnd/DropTargetContext.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/dnd/DropTargetContext.java
rename to jdk/src/java.desktop/share/classes/java/awt/dnd/DropTargetContext.java
diff --git a/jdk/src/share/classes/java/awt/dnd/DropTargetDragEvent.java b/jdk/src/java.desktop/share/classes/java/awt/dnd/DropTargetDragEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/dnd/DropTargetDragEvent.java
rename to jdk/src/java.desktop/share/classes/java/awt/dnd/DropTargetDragEvent.java
diff --git a/jdk/src/share/classes/java/awt/dnd/DropTargetDropEvent.java b/jdk/src/java.desktop/share/classes/java/awt/dnd/DropTargetDropEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/dnd/DropTargetDropEvent.java
rename to jdk/src/java.desktop/share/classes/java/awt/dnd/DropTargetDropEvent.java
diff --git a/jdk/src/share/classes/java/awt/dnd/DropTargetEvent.java b/jdk/src/java.desktop/share/classes/java/awt/dnd/DropTargetEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/dnd/DropTargetEvent.java
rename to jdk/src/java.desktop/share/classes/java/awt/dnd/DropTargetEvent.java
diff --git a/jdk/src/share/classes/java/awt/dnd/DropTargetListener.java b/jdk/src/java.desktop/share/classes/java/awt/dnd/DropTargetListener.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/dnd/DropTargetListener.java
rename to jdk/src/java.desktop/share/classes/java/awt/dnd/DropTargetListener.java
diff --git a/jdk/src/share/classes/java/awt/dnd/InvalidDnDOperationException.java b/jdk/src/java.desktop/share/classes/java/awt/dnd/InvalidDnDOperationException.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/dnd/InvalidDnDOperationException.java
rename to jdk/src/java.desktop/share/classes/java/awt/dnd/InvalidDnDOperationException.java
diff --git a/jdk/src/share/classes/java/awt/dnd/MouseDragGestureRecognizer.java b/jdk/src/java.desktop/share/classes/java/awt/dnd/MouseDragGestureRecognizer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/dnd/MouseDragGestureRecognizer.java
rename to jdk/src/java.desktop/share/classes/java/awt/dnd/MouseDragGestureRecognizer.java
diff --git a/jdk/src/share/classes/java/awt/dnd/SerializationTester.java b/jdk/src/java.desktop/share/classes/java/awt/dnd/SerializationTester.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/dnd/SerializationTester.java
rename to jdk/src/java.desktop/share/classes/java/awt/dnd/SerializationTester.java
diff --git a/jdk/src/share/classes/java/awt/dnd/package.html b/jdk/src/java.desktop/share/classes/java/awt/dnd/package.html
similarity index 100%
rename from jdk/src/share/classes/java/awt/dnd/package.html
rename to jdk/src/java.desktop/share/classes/java/awt/dnd/package.html
diff --git a/jdk/src/share/classes/java/awt/dnd/peer/DragSourceContextPeer.java b/jdk/src/java.desktop/share/classes/java/awt/dnd/peer/DragSourceContextPeer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/dnd/peer/DragSourceContextPeer.java
rename to jdk/src/java.desktop/share/classes/java/awt/dnd/peer/DragSourceContextPeer.java
diff --git a/jdk/src/share/classes/java/awt/dnd/peer/DropTargetContextPeer.java b/jdk/src/java.desktop/share/classes/java/awt/dnd/peer/DropTargetContextPeer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/dnd/peer/DropTargetContextPeer.java
rename to jdk/src/java.desktop/share/classes/java/awt/dnd/peer/DropTargetContextPeer.java
diff --git a/jdk/src/share/classes/java/awt/dnd/peer/DropTargetPeer.java b/jdk/src/java.desktop/share/classes/java/awt/dnd/peer/DropTargetPeer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/dnd/peer/DropTargetPeer.java
rename to jdk/src/java.desktop/share/classes/java/awt/dnd/peer/DropTargetPeer.java
diff --git a/jdk/src/share/classes/java/awt/dnd/peer/package.html b/jdk/src/java.desktop/share/classes/java/awt/dnd/peer/package.html
similarity index 100%
rename from jdk/src/share/classes/java/awt/dnd/peer/package.html
rename to jdk/src/java.desktop/share/classes/java/awt/dnd/peer/package.html
diff --git a/jdk/src/share/classes/java/awt/doc-files/AWTThreadIssues.html b/jdk/src/java.desktop/share/classes/java/awt/doc-files/AWTThreadIssues.html
similarity index 100%
rename from jdk/src/share/classes/java/awt/doc-files/AWTThreadIssues.html
rename to jdk/src/java.desktop/share/classes/java/awt/doc-files/AWTThreadIssues.html
diff --git a/jdk/src/share/classes/java/awt/doc-files/BorderLayout-1.gif b/jdk/src/java.desktop/share/classes/java/awt/doc-files/BorderLayout-1.gif
similarity index 100%
rename from jdk/src/share/classes/java/awt/doc-files/BorderLayout-1.gif
rename to jdk/src/java.desktop/share/classes/java/awt/doc-files/BorderLayout-1.gif
diff --git a/jdk/src/share/classes/java/awt/doc-files/Button-1.gif b/jdk/src/java.desktop/share/classes/java/awt/doc-files/Button-1.gif
similarity index 100%
rename from jdk/src/share/classes/java/awt/doc-files/Button-1.gif
rename to jdk/src/java.desktop/share/classes/java/awt/doc-files/Button-1.gif
diff --git a/jdk/src/share/classes/java/awt/doc-files/Checkbox-1.gif b/jdk/src/java.desktop/share/classes/java/awt/doc-files/Checkbox-1.gif
similarity index 100%
rename from jdk/src/share/classes/java/awt/doc-files/Checkbox-1.gif
rename to jdk/src/java.desktop/share/classes/java/awt/doc-files/Checkbox-1.gif
diff --git a/jdk/src/share/classes/java/awt/doc-files/CheckboxGroup-1.gif b/jdk/src/java.desktop/share/classes/java/awt/doc-files/CheckboxGroup-1.gif
similarity index 100%
rename from jdk/src/share/classes/java/awt/doc-files/CheckboxGroup-1.gif
rename to jdk/src/java.desktop/share/classes/java/awt/doc-files/CheckboxGroup-1.gif
diff --git a/jdk/src/share/classes/java/awt/doc-files/Choice-1.gif b/jdk/src/java.desktop/share/classes/java/awt/doc-files/Choice-1.gif
similarity index 100%
rename from jdk/src/share/classes/java/awt/doc-files/Choice-1.gif
rename to jdk/src/java.desktop/share/classes/java/awt/doc-files/Choice-1.gif
diff --git a/jdk/src/share/classes/java/awt/doc-files/DesktopProperties.html b/jdk/src/java.desktop/share/classes/java/awt/doc-files/DesktopProperties.html
similarity index 100%
rename from jdk/src/share/classes/java/awt/doc-files/DesktopProperties.html
rename to jdk/src/java.desktop/share/classes/java/awt/doc-files/DesktopProperties.html
diff --git a/jdk/src/share/classes/java/awt/doc-files/FlowLayout-1.gif b/jdk/src/java.desktop/share/classes/java/awt/doc-files/FlowLayout-1.gif
similarity index 100%
rename from jdk/src/share/classes/java/awt/doc-files/FlowLayout-1.gif
rename to jdk/src/java.desktop/share/classes/java/awt/doc-files/FlowLayout-1.gif
diff --git a/jdk/src/share/classes/java/awt/doc-files/FocusCycle.gif b/jdk/src/java.desktop/share/classes/java/awt/doc-files/FocusCycle.gif
similarity index 100%
rename from jdk/src/share/classes/java/awt/doc-files/FocusCycle.gif
rename to jdk/src/java.desktop/share/classes/java/awt/doc-files/FocusCycle.gif
diff --git a/jdk/src/share/classes/java/awt/doc-files/FocusSpec.html b/jdk/src/java.desktop/share/classes/java/awt/doc-files/FocusSpec.html
similarity index 100%
rename from jdk/src/share/classes/java/awt/doc-files/FocusSpec.html
rename to jdk/src/java.desktop/share/classes/java/awt/doc-files/FocusSpec.html
diff --git a/jdk/src/share/classes/java/awt/doc-files/FontMetrics-1.gif b/jdk/src/java.desktop/share/classes/java/awt/doc-files/FontMetrics-1.gif
similarity index 100%
rename from jdk/src/share/classes/java/awt/doc-files/FontMetrics-1.gif
rename to jdk/src/java.desktop/share/classes/java/awt/doc-files/FontMetrics-1.gif
diff --git a/jdk/src/share/classes/java/awt/doc-files/GridBagLayout-1.gif b/jdk/src/java.desktop/share/classes/java/awt/doc-files/GridBagLayout-1.gif
similarity index 100%
rename from jdk/src/share/classes/java/awt/doc-files/GridBagLayout-1.gif
rename to jdk/src/java.desktop/share/classes/java/awt/doc-files/GridBagLayout-1.gif
diff --git a/jdk/src/share/classes/java/awt/doc-files/GridBagLayout-2.gif b/jdk/src/java.desktop/share/classes/java/awt/doc-files/GridBagLayout-2.gif
similarity index 100%
rename from jdk/src/share/classes/java/awt/doc-files/GridBagLayout-2.gif
rename to jdk/src/java.desktop/share/classes/java/awt/doc-files/GridBagLayout-2.gif
diff --git a/jdk/src/share/classes/java/awt/doc-files/GridBagLayout-baseline.png b/jdk/src/java.desktop/share/classes/java/awt/doc-files/GridBagLayout-baseline.png
similarity index 100%
rename from jdk/src/share/classes/java/awt/doc-files/GridBagLayout-baseline.png
rename to jdk/src/java.desktop/share/classes/java/awt/doc-files/GridBagLayout-baseline.png
diff --git a/jdk/src/share/classes/java/awt/doc-files/GridLayout-1.gif b/jdk/src/java.desktop/share/classes/java/awt/doc-files/GridLayout-1.gif
similarity index 100%
rename from jdk/src/share/classes/java/awt/doc-files/GridLayout-1.gif
rename to jdk/src/java.desktop/share/classes/java/awt/doc-files/GridLayout-1.gif
diff --git a/jdk/src/share/classes/java/awt/doc-files/GridLayout-2.gif b/jdk/src/java.desktop/share/classes/java/awt/doc-files/GridLayout-2.gif
similarity index 100%
rename from jdk/src/share/classes/java/awt/doc-files/GridLayout-2.gif
rename to jdk/src/java.desktop/share/classes/java/awt/doc-files/GridLayout-2.gif
diff --git a/jdk/src/share/classes/java/awt/doc-files/ImplicitFocusTransfer.gif b/jdk/src/java.desktop/share/classes/java/awt/doc-files/ImplicitFocusTransfer.gif
similarity index 100%
rename from jdk/src/share/classes/java/awt/doc-files/ImplicitFocusTransfer.gif
rename to jdk/src/java.desktop/share/classes/java/awt/doc-files/ImplicitFocusTransfer.gif
diff --git a/jdk/src/share/classes/java/awt/doc-files/Label-1.gif b/jdk/src/java.desktop/share/classes/java/awt/doc-files/Label-1.gif
similarity index 100%
rename from jdk/src/share/classes/java/awt/doc-files/Label-1.gif
rename to jdk/src/java.desktop/share/classes/java/awt/doc-files/Label-1.gif
diff --git a/jdk/src/share/classes/java/awt/doc-files/LinearGradientPaint.png b/jdk/src/java.desktop/share/classes/java/awt/doc-files/LinearGradientPaint.png
similarity index 100%
rename from jdk/src/share/classes/java/awt/doc-files/LinearGradientPaint.png
rename to jdk/src/java.desktop/share/classes/java/awt/doc-files/LinearGradientPaint.png
diff --git a/jdk/src/share/classes/java/awt/doc-files/List-1.gif b/jdk/src/java.desktop/share/classes/java/awt/doc-files/List-1.gif
similarity index 100%
rename from jdk/src/share/classes/java/awt/doc-files/List-1.gif
rename to jdk/src/java.desktop/share/classes/java/awt/doc-files/List-1.gif
diff --git a/jdk/src/share/classes/java/awt/doc-files/MenuBar-1.gif b/jdk/src/java.desktop/share/classes/java/awt/doc-files/MenuBar-1.gif
similarity index 100%
rename from jdk/src/share/classes/java/awt/doc-files/MenuBar-1.gif
rename to jdk/src/java.desktop/share/classes/java/awt/doc-files/MenuBar-1.gif
diff --git a/jdk/src/share/classes/java/awt/doc-files/Modality.html b/jdk/src/java.desktop/share/classes/java/awt/doc-files/Modality.html
similarity index 100%
rename from jdk/src/share/classes/java/awt/doc-files/Modality.html
rename to jdk/src/java.desktop/share/classes/java/awt/doc-files/Modality.html
diff --git a/jdk/src/share/classes/java/awt/doc-files/MultiScreen.gif b/jdk/src/java.desktop/share/classes/java/awt/doc-files/MultiScreen.gif
similarity index 100%
rename from jdk/src/share/classes/java/awt/doc-files/MultiScreen.gif
rename to jdk/src/java.desktop/share/classes/java/awt/doc-files/MultiScreen.gif
diff --git a/jdk/src/share/classes/java/awt/doc-files/RadialGradientPaint-1.png b/jdk/src/java.desktop/share/classes/java/awt/doc-files/RadialGradientPaint-1.png
similarity index 100%
rename from jdk/src/share/classes/java/awt/doc-files/RadialGradientPaint-1.png
rename to jdk/src/java.desktop/share/classes/java/awt/doc-files/RadialGradientPaint-1.png
diff --git a/jdk/src/share/classes/java/awt/doc-files/RadialGradientPaint-2.png b/jdk/src/java.desktop/share/classes/java/awt/doc-files/RadialGradientPaint-2.png
similarity index 100%
rename from jdk/src/share/classes/java/awt/doc-files/RadialGradientPaint-2.png
rename to jdk/src/java.desktop/share/classes/java/awt/doc-files/RadialGradientPaint-2.png
diff --git a/jdk/src/share/classes/java/awt/doc-files/RadialGradientPaint-3.png b/jdk/src/java.desktop/share/classes/java/awt/doc-files/RadialGradientPaint-3.png
similarity index 100%
rename from jdk/src/share/classes/java/awt/doc-files/RadialGradientPaint-3.png
rename to jdk/src/java.desktop/share/classes/java/awt/doc-files/RadialGradientPaint-3.png
diff --git a/jdk/src/share/classes/java/awt/doc-files/RadialGradientPaint-4.png b/jdk/src/java.desktop/share/classes/java/awt/doc-files/RadialGradientPaint-4.png
similarity index 100%
rename from jdk/src/share/classes/java/awt/doc-files/RadialGradientPaint-4.png
rename to jdk/src/java.desktop/share/classes/java/awt/doc-files/RadialGradientPaint-4.png
diff --git a/jdk/src/share/classes/java/awt/doc-files/Scrollbar-1.gif b/jdk/src/java.desktop/share/classes/java/awt/doc-files/Scrollbar-1.gif
similarity index 100%
rename from jdk/src/share/classes/java/awt/doc-files/Scrollbar-1.gif
rename to jdk/src/java.desktop/share/classes/java/awt/doc-files/Scrollbar-1.gif
diff --git a/jdk/src/share/classes/java/awt/doc-files/Scrollbar-2.gif b/jdk/src/java.desktop/share/classes/java/awt/doc-files/Scrollbar-2.gif
similarity index 100%
rename from jdk/src/share/classes/java/awt/doc-files/Scrollbar-2.gif
rename to jdk/src/java.desktop/share/classes/java/awt/doc-files/Scrollbar-2.gif
diff --git a/jdk/src/share/classes/java/awt/doc-files/TextArea-1.gif b/jdk/src/java.desktop/share/classes/java/awt/doc-files/TextArea-1.gif
similarity index 100%
rename from jdk/src/share/classes/java/awt/doc-files/TextArea-1.gif
rename to jdk/src/java.desktop/share/classes/java/awt/doc-files/TextArea-1.gif
diff --git a/jdk/src/share/classes/java/awt/doc-files/TextField-1.gif b/jdk/src/java.desktop/share/classes/java/awt/doc-files/TextField-1.gif
similarity index 100%
rename from jdk/src/share/classes/java/awt/doc-files/TextField-1.gif
rename to jdk/src/java.desktop/share/classes/java/awt/doc-files/TextField-1.gif
diff --git a/jdk/src/share/classes/java/awt/doc-files/modal-example1.gif b/jdk/src/java.desktop/share/classes/java/awt/doc-files/modal-example1.gif
similarity index 100%
rename from jdk/src/share/classes/java/awt/doc-files/modal-example1.gif
rename to jdk/src/java.desktop/share/classes/java/awt/doc-files/modal-example1.gif
diff --git a/jdk/src/share/classes/java/awt/doc-files/modal-example2.gif b/jdk/src/java.desktop/share/classes/java/awt/doc-files/modal-example2.gif
similarity index 100%
rename from jdk/src/share/classes/java/awt/doc-files/modal-example2.gif
rename to jdk/src/java.desktop/share/classes/java/awt/doc-files/modal-example2.gif
diff --git a/jdk/src/share/classes/java/awt/doc-files/modal-example3.gif b/jdk/src/java.desktop/share/classes/java/awt/doc-files/modal-example3.gif
similarity index 100%
rename from jdk/src/share/classes/java/awt/doc-files/modal-example3.gif
rename to jdk/src/java.desktop/share/classes/java/awt/doc-files/modal-example3.gif
diff --git a/jdk/src/share/classes/java/awt/doc-files/modal-example4.gif b/jdk/src/java.desktop/share/classes/java/awt/doc-files/modal-example4.gif
similarity index 100%
rename from jdk/src/share/classes/java/awt/doc-files/modal-example4.gif
rename to jdk/src/java.desktop/share/classes/java/awt/doc-files/modal-example4.gif
diff --git a/jdk/src/share/classes/java/awt/event/AWTEventListener.java b/jdk/src/java.desktop/share/classes/java/awt/event/AWTEventListener.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/AWTEventListener.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/AWTEventListener.java
diff --git a/jdk/src/share/classes/java/awt/event/AWTEventListenerProxy.java b/jdk/src/java.desktop/share/classes/java/awt/event/AWTEventListenerProxy.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/AWTEventListenerProxy.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/AWTEventListenerProxy.java
diff --git a/jdk/src/share/classes/java/awt/event/ActionEvent.java b/jdk/src/java.desktop/share/classes/java/awt/event/ActionEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/ActionEvent.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/ActionEvent.java
diff --git a/jdk/src/share/classes/java/awt/event/ActionListener.java b/jdk/src/java.desktop/share/classes/java/awt/event/ActionListener.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/ActionListener.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/ActionListener.java
diff --git a/jdk/src/share/classes/java/awt/event/AdjustmentEvent.java b/jdk/src/java.desktop/share/classes/java/awt/event/AdjustmentEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/AdjustmentEvent.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/AdjustmentEvent.java
diff --git a/jdk/src/share/classes/java/awt/event/AdjustmentListener.java b/jdk/src/java.desktop/share/classes/java/awt/event/AdjustmentListener.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/AdjustmentListener.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/AdjustmentListener.java
diff --git a/jdk/src/share/classes/java/awt/event/ComponentAdapter.java b/jdk/src/java.desktop/share/classes/java/awt/event/ComponentAdapter.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/ComponentAdapter.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/ComponentAdapter.java
diff --git a/jdk/src/share/classes/java/awt/event/ComponentEvent.java b/jdk/src/java.desktop/share/classes/java/awt/event/ComponentEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/ComponentEvent.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/ComponentEvent.java
diff --git a/jdk/src/share/classes/java/awt/event/ComponentListener.java b/jdk/src/java.desktop/share/classes/java/awt/event/ComponentListener.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/ComponentListener.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/ComponentListener.java
diff --git a/jdk/src/share/classes/java/awt/event/ContainerAdapter.java b/jdk/src/java.desktop/share/classes/java/awt/event/ContainerAdapter.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/ContainerAdapter.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/ContainerAdapter.java
diff --git a/jdk/src/share/classes/java/awt/event/ContainerEvent.java b/jdk/src/java.desktop/share/classes/java/awt/event/ContainerEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/ContainerEvent.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/ContainerEvent.java
diff --git a/jdk/src/share/classes/java/awt/event/ContainerListener.java b/jdk/src/java.desktop/share/classes/java/awt/event/ContainerListener.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/ContainerListener.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/ContainerListener.java
diff --git a/jdk/src/share/classes/java/awt/event/FocusAdapter.java b/jdk/src/java.desktop/share/classes/java/awt/event/FocusAdapter.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/FocusAdapter.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/FocusAdapter.java
diff --git a/jdk/src/share/classes/java/awt/event/FocusEvent.java b/jdk/src/java.desktop/share/classes/java/awt/event/FocusEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/FocusEvent.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/FocusEvent.java
diff --git a/jdk/src/share/classes/java/awt/event/FocusListener.java b/jdk/src/java.desktop/share/classes/java/awt/event/FocusListener.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/FocusListener.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/FocusListener.java
diff --git a/jdk/src/share/classes/java/awt/event/HierarchyBoundsAdapter.java b/jdk/src/java.desktop/share/classes/java/awt/event/HierarchyBoundsAdapter.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/HierarchyBoundsAdapter.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/HierarchyBoundsAdapter.java
diff --git a/jdk/src/share/classes/java/awt/event/HierarchyBoundsListener.java b/jdk/src/java.desktop/share/classes/java/awt/event/HierarchyBoundsListener.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/HierarchyBoundsListener.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/HierarchyBoundsListener.java
diff --git a/jdk/src/share/classes/java/awt/event/HierarchyEvent.java b/jdk/src/java.desktop/share/classes/java/awt/event/HierarchyEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/HierarchyEvent.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/HierarchyEvent.java
diff --git a/jdk/src/share/classes/java/awt/event/HierarchyListener.java b/jdk/src/java.desktop/share/classes/java/awt/event/HierarchyListener.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/HierarchyListener.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/HierarchyListener.java
diff --git a/jdk/src/share/classes/java/awt/event/InputEvent.java b/jdk/src/java.desktop/share/classes/java/awt/event/InputEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/InputEvent.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/InputEvent.java
diff --git a/jdk/src/share/classes/java/awt/event/InputMethodEvent.java b/jdk/src/java.desktop/share/classes/java/awt/event/InputMethodEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/InputMethodEvent.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/InputMethodEvent.java
diff --git a/jdk/src/share/classes/java/awt/event/InputMethodListener.java b/jdk/src/java.desktop/share/classes/java/awt/event/InputMethodListener.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/InputMethodListener.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/InputMethodListener.java
diff --git a/jdk/src/share/classes/java/awt/event/InvocationEvent.java b/jdk/src/java.desktop/share/classes/java/awt/event/InvocationEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/InvocationEvent.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/InvocationEvent.java
diff --git a/jdk/src/share/classes/java/awt/event/ItemEvent.java b/jdk/src/java.desktop/share/classes/java/awt/event/ItemEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/ItemEvent.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/ItemEvent.java
diff --git a/jdk/src/share/classes/java/awt/event/ItemListener.java b/jdk/src/java.desktop/share/classes/java/awt/event/ItemListener.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/ItemListener.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/ItemListener.java
diff --git a/jdk/src/share/classes/java/awt/event/KeyAdapter.java b/jdk/src/java.desktop/share/classes/java/awt/event/KeyAdapter.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/KeyAdapter.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/KeyAdapter.java
diff --git a/jdk/src/share/classes/java/awt/event/KeyEvent.java b/jdk/src/java.desktop/share/classes/java/awt/event/KeyEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/KeyEvent.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/KeyEvent.java
diff --git a/jdk/src/share/classes/java/awt/event/KeyListener.java b/jdk/src/java.desktop/share/classes/java/awt/event/KeyListener.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/KeyListener.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/KeyListener.java
diff --git a/jdk/src/share/classes/java/awt/event/MouseAdapter.java b/jdk/src/java.desktop/share/classes/java/awt/event/MouseAdapter.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/MouseAdapter.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/MouseAdapter.java
diff --git a/jdk/src/share/classes/java/awt/event/MouseEvent.java b/jdk/src/java.desktop/share/classes/java/awt/event/MouseEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/MouseEvent.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/MouseEvent.java
diff --git a/jdk/src/share/classes/java/awt/event/MouseListener.java b/jdk/src/java.desktop/share/classes/java/awt/event/MouseListener.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/MouseListener.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/MouseListener.java
diff --git a/jdk/src/share/classes/java/awt/event/MouseMotionAdapter.java b/jdk/src/java.desktop/share/classes/java/awt/event/MouseMotionAdapter.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/MouseMotionAdapter.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/MouseMotionAdapter.java
diff --git a/jdk/src/share/classes/java/awt/event/MouseMotionListener.java b/jdk/src/java.desktop/share/classes/java/awt/event/MouseMotionListener.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/MouseMotionListener.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/MouseMotionListener.java
diff --git a/jdk/src/share/classes/java/awt/event/MouseWheelEvent.java b/jdk/src/java.desktop/share/classes/java/awt/event/MouseWheelEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/MouseWheelEvent.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/MouseWheelEvent.java
diff --git a/jdk/src/share/classes/java/awt/event/MouseWheelListener.java b/jdk/src/java.desktop/share/classes/java/awt/event/MouseWheelListener.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/MouseWheelListener.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/MouseWheelListener.java
diff --git a/jdk/src/share/classes/java/awt/event/NativeLibLoader.java b/jdk/src/java.desktop/share/classes/java/awt/event/NativeLibLoader.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/NativeLibLoader.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/NativeLibLoader.java
diff --git a/jdk/src/share/classes/java/awt/event/PaintEvent.java b/jdk/src/java.desktop/share/classes/java/awt/event/PaintEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/PaintEvent.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/PaintEvent.java
diff --git a/jdk/src/share/classes/java/awt/event/TextEvent.java b/jdk/src/java.desktop/share/classes/java/awt/event/TextEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/TextEvent.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/TextEvent.java
diff --git a/jdk/src/share/classes/java/awt/event/TextListener.java b/jdk/src/java.desktop/share/classes/java/awt/event/TextListener.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/TextListener.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/TextListener.java
diff --git a/jdk/src/share/classes/java/awt/event/WindowAdapter.java b/jdk/src/java.desktop/share/classes/java/awt/event/WindowAdapter.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/WindowAdapter.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/WindowAdapter.java
diff --git a/jdk/src/share/classes/java/awt/event/WindowEvent.java b/jdk/src/java.desktop/share/classes/java/awt/event/WindowEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/WindowEvent.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/WindowEvent.java
diff --git a/jdk/src/share/classes/java/awt/event/WindowFocusListener.java b/jdk/src/java.desktop/share/classes/java/awt/event/WindowFocusListener.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/WindowFocusListener.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/WindowFocusListener.java
diff --git a/jdk/src/share/classes/java/awt/event/WindowListener.java b/jdk/src/java.desktop/share/classes/java/awt/event/WindowListener.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/WindowListener.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/WindowListener.java
diff --git a/jdk/src/share/classes/java/awt/event/WindowStateListener.java b/jdk/src/java.desktop/share/classes/java/awt/event/WindowStateListener.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/WindowStateListener.java
rename to jdk/src/java.desktop/share/classes/java/awt/event/WindowStateListener.java
diff --git a/jdk/src/share/classes/java/awt/event/package.html b/jdk/src/java.desktop/share/classes/java/awt/event/package.html
similarity index 100%
rename from jdk/src/share/classes/java/awt/event/package.html
rename to jdk/src/java.desktop/share/classes/java/awt/event/package.html
diff --git a/jdk/src/share/classes/java/awt/font/CharArrayIterator.java b/jdk/src/java.desktop/share/classes/java/awt/font/CharArrayIterator.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/font/CharArrayIterator.java
rename to jdk/src/java.desktop/share/classes/java/awt/font/CharArrayIterator.java
diff --git a/jdk/src/share/classes/java/awt/font/FontRenderContext.java b/jdk/src/java.desktop/share/classes/java/awt/font/FontRenderContext.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/font/FontRenderContext.java
rename to jdk/src/java.desktop/share/classes/java/awt/font/FontRenderContext.java
diff --git a/jdk/src/share/classes/java/awt/font/GlyphJustificationInfo.java b/jdk/src/java.desktop/share/classes/java/awt/font/GlyphJustificationInfo.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/font/GlyphJustificationInfo.java
rename to jdk/src/java.desktop/share/classes/java/awt/font/GlyphJustificationInfo.java
diff --git a/jdk/src/share/classes/java/awt/font/GlyphMetrics.java b/jdk/src/java.desktop/share/classes/java/awt/font/GlyphMetrics.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/font/GlyphMetrics.java
rename to jdk/src/java.desktop/share/classes/java/awt/font/GlyphMetrics.java
diff --git a/jdk/src/share/classes/java/awt/font/GlyphVector.java b/jdk/src/java.desktop/share/classes/java/awt/font/GlyphVector.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/font/GlyphVector.java
rename to jdk/src/java.desktop/share/classes/java/awt/font/GlyphVector.java
diff --git a/jdk/src/share/classes/java/awt/font/GraphicAttribute.java b/jdk/src/java.desktop/share/classes/java/awt/font/GraphicAttribute.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/font/GraphicAttribute.java
rename to jdk/src/java.desktop/share/classes/java/awt/font/GraphicAttribute.java
diff --git a/jdk/src/share/classes/java/awt/font/ImageGraphicAttribute.java b/jdk/src/java.desktop/share/classes/java/awt/font/ImageGraphicAttribute.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/font/ImageGraphicAttribute.java
rename to jdk/src/java.desktop/share/classes/java/awt/font/ImageGraphicAttribute.java
diff --git a/jdk/src/share/classes/java/awt/font/JavaAWTFontAccessImpl.java b/jdk/src/java.desktop/share/classes/java/awt/font/JavaAWTFontAccessImpl.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/font/JavaAWTFontAccessImpl.java
rename to jdk/src/java.desktop/share/classes/java/awt/font/JavaAWTFontAccessImpl.java
diff --git a/jdk/src/share/classes/java/awt/font/LayoutPath.java b/jdk/src/java.desktop/share/classes/java/awt/font/LayoutPath.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/font/LayoutPath.java
rename to jdk/src/java.desktop/share/classes/java/awt/font/LayoutPath.java
diff --git a/jdk/src/share/classes/java/awt/font/LineBreakMeasurer.java b/jdk/src/java.desktop/share/classes/java/awt/font/LineBreakMeasurer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/font/LineBreakMeasurer.java
rename to jdk/src/java.desktop/share/classes/java/awt/font/LineBreakMeasurer.java
diff --git a/jdk/src/share/classes/java/awt/font/LineMetrics.java b/jdk/src/java.desktop/share/classes/java/awt/font/LineMetrics.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/font/LineMetrics.java
rename to jdk/src/java.desktop/share/classes/java/awt/font/LineMetrics.java
diff --git a/jdk/src/share/classes/java/awt/font/MultipleMaster.java b/jdk/src/java.desktop/share/classes/java/awt/font/MultipleMaster.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/font/MultipleMaster.java
rename to jdk/src/java.desktop/share/classes/java/awt/font/MultipleMaster.java
diff --git a/jdk/src/share/classes/java/awt/font/NumericShaper.java b/jdk/src/java.desktop/share/classes/java/awt/font/NumericShaper.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/font/NumericShaper.java
rename to jdk/src/java.desktop/share/classes/java/awt/font/NumericShaper.java
diff --git a/jdk/src/share/classes/java/awt/font/OpenType.java b/jdk/src/java.desktop/share/classes/java/awt/font/OpenType.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/font/OpenType.java
rename to jdk/src/java.desktop/share/classes/java/awt/font/OpenType.java
diff --git a/jdk/src/share/classes/java/awt/font/ShapeGraphicAttribute.java b/jdk/src/java.desktop/share/classes/java/awt/font/ShapeGraphicAttribute.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/font/ShapeGraphicAttribute.java
rename to jdk/src/java.desktop/share/classes/java/awt/font/ShapeGraphicAttribute.java
diff --git a/jdk/src/share/classes/java/awt/font/StyledParagraph.java b/jdk/src/java.desktop/share/classes/java/awt/font/StyledParagraph.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/font/StyledParagraph.java
rename to jdk/src/java.desktop/share/classes/java/awt/font/StyledParagraph.java
diff --git a/jdk/src/share/classes/java/awt/font/TextAttribute.java b/jdk/src/java.desktop/share/classes/java/awt/font/TextAttribute.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/font/TextAttribute.java
rename to jdk/src/java.desktop/share/classes/java/awt/font/TextAttribute.java
diff --git a/jdk/src/share/classes/java/awt/font/TextHitInfo.java b/jdk/src/java.desktop/share/classes/java/awt/font/TextHitInfo.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/font/TextHitInfo.java
rename to jdk/src/java.desktop/share/classes/java/awt/font/TextHitInfo.java
diff --git a/jdk/src/share/classes/java/awt/font/TextJustifier.java b/jdk/src/java.desktop/share/classes/java/awt/font/TextJustifier.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/font/TextJustifier.java
rename to jdk/src/java.desktop/share/classes/java/awt/font/TextJustifier.java
diff --git a/jdk/src/share/classes/java/awt/font/TextLayout.java b/jdk/src/java.desktop/share/classes/java/awt/font/TextLayout.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/font/TextLayout.java
rename to jdk/src/java.desktop/share/classes/java/awt/font/TextLayout.java
diff --git a/jdk/src/share/classes/java/awt/font/TextLine.java b/jdk/src/java.desktop/share/classes/java/awt/font/TextLine.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/font/TextLine.java
rename to jdk/src/java.desktop/share/classes/java/awt/font/TextLine.java
diff --git a/jdk/src/share/classes/java/awt/font/TextMeasurer.java b/jdk/src/java.desktop/share/classes/java/awt/font/TextMeasurer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/font/TextMeasurer.java
rename to jdk/src/java.desktop/share/classes/java/awt/font/TextMeasurer.java
diff --git a/jdk/src/share/classes/java/awt/font/TransformAttribute.java b/jdk/src/java.desktop/share/classes/java/awt/font/TransformAttribute.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/font/TransformAttribute.java
rename to jdk/src/java.desktop/share/classes/java/awt/font/TransformAttribute.java
diff --git a/jdk/src/share/classes/java/awt/font/package.html b/jdk/src/java.desktop/share/classes/java/awt/font/package.html
similarity index 100%
rename from jdk/src/share/classes/java/awt/font/package.html
rename to jdk/src/java.desktop/share/classes/java/awt/font/package.html
diff --git a/jdk/src/share/classes/java/awt/geom/AffineTransform.java b/jdk/src/java.desktop/share/classes/java/awt/geom/AffineTransform.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/geom/AffineTransform.java
rename to jdk/src/java.desktop/share/classes/java/awt/geom/AffineTransform.java
diff --git a/jdk/src/share/classes/java/awt/geom/Arc2D.java b/jdk/src/java.desktop/share/classes/java/awt/geom/Arc2D.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/geom/Arc2D.java
rename to jdk/src/java.desktop/share/classes/java/awt/geom/Arc2D.java
diff --git a/jdk/src/share/classes/java/awt/geom/ArcIterator.java b/jdk/src/java.desktop/share/classes/java/awt/geom/ArcIterator.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/geom/ArcIterator.java
rename to jdk/src/java.desktop/share/classes/java/awt/geom/ArcIterator.java
diff --git a/jdk/src/share/classes/java/awt/geom/Area.java b/jdk/src/java.desktop/share/classes/java/awt/geom/Area.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/geom/Area.java
rename to jdk/src/java.desktop/share/classes/java/awt/geom/Area.java
diff --git a/jdk/src/share/classes/java/awt/geom/CubicCurve2D.java b/jdk/src/java.desktop/share/classes/java/awt/geom/CubicCurve2D.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/geom/CubicCurve2D.java
rename to jdk/src/java.desktop/share/classes/java/awt/geom/CubicCurve2D.java
diff --git a/jdk/src/share/classes/java/awt/geom/CubicIterator.java b/jdk/src/java.desktop/share/classes/java/awt/geom/CubicIterator.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/geom/CubicIterator.java
rename to jdk/src/java.desktop/share/classes/java/awt/geom/CubicIterator.java
diff --git a/jdk/src/share/classes/java/awt/geom/Dimension2D.java b/jdk/src/java.desktop/share/classes/java/awt/geom/Dimension2D.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/geom/Dimension2D.java
rename to jdk/src/java.desktop/share/classes/java/awt/geom/Dimension2D.java
diff --git a/jdk/src/share/classes/java/awt/geom/Ellipse2D.java b/jdk/src/java.desktop/share/classes/java/awt/geom/Ellipse2D.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/geom/Ellipse2D.java
rename to jdk/src/java.desktop/share/classes/java/awt/geom/Ellipse2D.java
diff --git a/jdk/src/share/classes/java/awt/geom/EllipseIterator.java b/jdk/src/java.desktop/share/classes/java/awt/geom/EllipseIterator.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/geom/EllipseIterator.java
rename to jdk/src/java.desktop/share/classes/java/awt/geom/EllipseIterator.java
diff --git a/jdk/src/share/classes/java/awt/geom/FlatteningPathIterator.java b/jdk/src/java.desktop/share/classes/java/awt/geom/FlatteningPathIterator.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/geom/FlatteningPathIterator.java
rename to jdk/src/java.desktop/share/classes/java/awt/geom/FlatteningPathIterator.java
diff --git a/jdk/src/share/classes/java/awt/geom/GeneralPath.java b/jdk/src/java.desktop/share/classes/java/awt/geom/GeneralPath.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/geom/GeneralPath.java
rename to jdk/src/java.desktop/share/classes/java/awt/geom/GeneralPath.java
diff --git a/jdk/src/share/classes/java/awt/geom/IllegalPathStateException.java b/jdk/src/java.desktop/share/classes/java/awt/geom/IllegalPathStateException.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/geom/IllegalPathStateException.java
rename to jdk/src/java.desktop/share/classes/java/awt/geom/IllegalPathStateException.java
diff --git a/jdk/src/share/classes/java/awt/geom/Line2D.java b/jdk/src/java.desktop/share/classes/java/awt/geom/Line2D.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/geom/Line2D.java
rename to jdk/src/java.desktop/share/classes/java/awt/geom/Line2D.java
diff --git a/jdk/src/share/classes/java/awt/geom/LineIterator.java b/jdk/src/java.desktop/share/classes/java/awt/geom/LineIterator.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/geom/LineIterator.java
rename to jdk/src/java.desktop/share/classes/java/awt/geom/LineIterator.java
diff --git a/jdk/src/share/classes/java/awt/geom/NoninvertibleTransformException.java b/jdk/src/java.desktop/share/classes/java/awt/geom/NoninvertibleTransformException.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/geom/NoninvertibleTransformException.java
rename to jdk/src/java.desktop/share/classes/java/awt/geom/NoninvertibleTransformException.java
diff --git a/jdk/src/share/classes/java/awt/geom/Path2D.java b/jdk/src/java.desktop/share/classes/java/awt/geom/Path2D.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/geom/Path2D.java
rename to jdk/src/java.desktop/share/classes/java/awt/geom/Path2D.java
diff --git a/jdk/src/share/classes/java/awt/geom/PathIterator.java b/jdk/src/java.desktop/share/classes/java/awt/geom/PathIterator.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/geom/PathIterator.java
rename to jdk/src/java.desktop/share/classes/java/awt/geom/PathIterator.java
diff --git a/jdk/src/share/classes/java/awt/geom/Point2D.java b/jdk/src/java.desktop/share/classes/java/awt/geom/Point2D.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/geom/Point2D.java
rename to jdk/src/java.desktop/share/classes/java/awt/geom/Point2D.java
diff --git a/jdk/src/share/classes/java/awt/geom/QuadCurve2D.java b/jdk/src/java.desktop/share/classes/java/awt/geom/QuadCurve2D.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/geom/QuadCurve2D.java
rename to jdk/src/java.desktop/share/classes/java/awt/geom/QuadCurve2D.java
diff --git a/jdk/src/share/classes/java/awt/geom/QuadIterator.java b/jdk/src/java.desktop/share/classes/java/awt/geom/QuadIterator.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/geom/QuadIterator.java
rename to jdk/src/java.desktop/share/classes/java/awt/geom/QuadIterator.java
diff --git a/jdk/src/share/classes/java/awt/geom/RectIterator.java b/jdk/src/java.desktop/share/classes/java/awt/geom/RectIterator.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/geom/RectIterator.java
rename to jdk/src/java.desktop/share/classes/java/awt/geom/RectIterator.java
diff --git a/jdk/src/share/classes/java/awt/geom/Rectangle2D.java b/jdk/src/java.desktop/share/classes/java/awt/geom/Rectangle2D.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/geom/Rectangle2D.java
rename to jdk/src/java.desktop/share/classes/java/awt/geom/Rectangle2D.java
diff --git a/jdk/src/share/classes/java/awt/geom/RectangularShape.java b/jdk/src/java.desktop/share/classes/java/awt/geom/RectangularShape.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/geom/RectangularShape.java
rename to jdk/src/java.desktop/share/classes/java/awt/geom/RectangularShape.java
diff --git a/jdk/src/share/classes/java/awt/geom/RoundRectIterator.java b/jdk/src/java.desktop/share/classes/java/awt/geom/RoundRectIterator.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/geom/RoundRectIterator.java
rename to jdk/src/java.desktop/share/classes/java/awt/geom/RoundRectIterator.java
diff --git a/jdk/src/share/classes/java/awt/geom/RoundRectangle2D.java b/jdk/src/java.desktop/share/classes/java/awt/geom/RoundRectangle2D.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/geom/RoundRectangle2D.java
rename to jdk/src/java.desktop/share/classes/java/awt/geom/RoundRectangle2D.java
diff --git a/jdk/src/share/classes/java/awt/geom/package.html b/jdk/src/java.desktop/share/classes/java/awt/geom/package.html
similarity index 100%
rename from jdk/src/share/classes/java/awt/geom/package.html
rename to jdk/src/java.desktop/share/classes/java/awt/geom/package.html
diff --git a/jdk/src/share/classes/java/awt/im/InputContext.java b/jdk/src/java.desktop/share/classes/java/awt/im/InputContext.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/im/InputContext.java
rename to jdk/src/java.desktop/share/classes/java/awt/im/InputContext.java
diff --git a/jdk/src/share/classes/java/awt/im/InputMethodHighlight.java b/jdk/src/java.desktop/share/classes/java/awt/im/InputMethodHighlight.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/im/InputMethodHighlight.java
rename to jdk/src/java.desktop/share/classes/java/awt/im/InputMethodHighlight.java
diff --git a/jdk/src/share/classes/java/awt/im/InputMethodRequests.java b/jdk/src/java.desktop/share/classes/java/awt/im/InputMethodRequests.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/im/InputMethodRequests.java
rename to jdk/src/java.desktop/share/classes/java/awt/im/InputMethodRequests.java
diff --git a/jdk/src/share/classes/java/awt/im/InputSubset.java b/jdk/src/java.desktop/share/classes/java/awt/im/InputSubset.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/im/InputSubset.java
rename to jdk/src/java.desktop/share/classes/java/awt/im/InputSubset.java
diff --git a/jdk/src/share/classes/java/awt/im/package.html b/jdk/src/java.desktop/share/classes/java/awt/im/package.html
similarity index 100%
rename from jdk/src/share/classes/java/awt/im/package.html
rename to jdk/src/java.desktop/share/classes/java/awt/im/package.html
diff --git a/jdk/src/share/classes/java/awt/im/spi/InputMethod.java b/jdk/src/java.desktop/share/classes/java/awt/im/spi/InputMethod.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/im/spi/InputMethod.java
rename to jdk/src/java.desktop/share/classes/java/awt/im/spi/InputMethod.java
diff --git a/jdk/src/share/classes/java/awt/im/spi/InputMethodContext.java b/jdk/src/java.desktop/share/classes/java/awt/im/spi/InputMethodContext.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/im/spi/InputMethodContext.java
rename to jdk/src/java.desktop/share/classes/java/awt/im/spi/InputMethodContext.java
diff --git a/jdk/src/share/classes/java/awt/im/spi/InputMethodDescriptor.java b/jdk/src/java.desktop/share/classes/java/awt/im/spi/InputMethodDescriptor.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/im/spi/InputMethodDescriptor.java
rename to jdk/src/java.desktop/share/classes/java/awt/im/spi/InputMethodDescriptor.java
diff --git a/jdk/src/share/classes/java/awt/im/spi/package.html b/jdk/src/java.desktop/share/classes/java/awt/im/spi/package.html
similarity index 100%
rename from jdk/src/share/classes/java/awt/im/spi/package.html
rename to jdk/src/java.desktop/share/classes/java/awt/im/spi/package.html
diff --git a/jdk/src/share/classes/java/awt/image/AffineTransformOp.java b/jdk/src/java.desktop/share/classes/java/awt/image/AffineTransformOp.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/AffineTransformOp.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/AffineTransformOp.java
diff --git a/jdk/src/share/classes/java/awt/image/AreaAveragingScaleFilter.java b/jdk/src/java.desktop/share/classes/java/awt/image/AreaAveragingScaleFilter.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/AreaAveragingScaleFilter.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/AreaAveragingScaleFilter.java
diff --git a/jdk/src/share/classes/java/awt/image/BandCombineOp.java b/jdk/src/java.desktop/share/classes/java/awt/image/BandCombineOp.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/BandCombineOp.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/BandCombineOp.java
diff --git a/jdk/src/share/classes/java/awt/image/BandedSampleModel.java b/jdk/src/java.desktop/share/classes/java/awt/image/BandedSampleModel.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/BandedSampleModel.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/BandedSampleModel.java
diff --git a/jdk/src/share/classes/java/awt/image/BufferStrategy.java b/jdk/src/java.desktop/share/classes/java/awt/image/BufferStrategy.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/BufferStrategy.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/BufferStrategy.java
diff --git a/jdk/src/share/classes/java/awt/image/BufferedImage.java b/jdk/src/java.desktop/share/classes/java/awt/image/BufferedImage.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/BufferedImage.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/BufferedImage.java
diff --git a/jdk/src/share/classes/java/awt/image/BufferedImageFilter.java b/jdk/src/java.desktop/share/classes/java/awt/image/BufferedImageFilter.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/BufferedImageFilter.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/BufferedImageFilter.java
diff --git a/jdk/src/share/classes/java/awt/image/BufferedImageOp.java b/jdk/src/java.desktop/share/classes/java/awt/image/BufferedImageOp.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/BufferedImageOp.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/BufferedImageOp.java
diff --git a/jdk/src/share/classes/java/awt/image/ByteLookupTable.java b/jdk/src/java.desktop/share/classes/java/awt/image/ByteLookupTable.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/ByteLookupTable.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/ByteLookupTable.java
diff --git a/jdk/src/share/classes/java/awt/image/ColorConvertOp.java b/jdk/src/java.desktop/share/classes/java/awt/image/ColorConvertOp.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/ColorConvertOp.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/ColorConvertOp.java
diff --git a/jdk/src/share/classes/java/awt/image/ColorModel.java b/jdk/src/java.desktop/share/classes/java/awt/image/ColorModel.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/ColorModel.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/ColorModel.java
diff --git a/jdk/src/share/classes/java/awt/image/ComponentColorModel.java b/jdk/src/java.desktop/share/classes/java/awt/image/ComponentColorModel.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/ComponentColorModel.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/ComponentColorModel.java
diff --git a/jdk/src/share/classes/java/awt/image/ComponentSampleModel.java b/jdk/src/java.desktop/share/classes/java/awt/image/ComponentSampleModel.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/ComponentSampleModel.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/ComponentSampleModel.java
diff --git a/jdk/src/share/classes/java/awt/image/ConvolveOp.java b/jdk/src/java.desktop/share/classes/java/awt/image/ConvolveOp.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/ConvolveOp.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/ConvolveOp.java
diff --git a/jdk/src/share/classes/java/awt/image/CropImageFilter.java b/jdk/src/java.desktop/share/classes/java/awt/image/CropImageFilter.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/CropImageFilter.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/CropImageFilter.java
diff --git a/jdk/src/share/classes/java/awt/image/DataBuffer.java b/jdk/src/java.desktop/share/classes/java/awt/image/DataBuffer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/DataBuffer.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/DataBuffer.java
diff --git a/jdk/src/share/classes/java/awt/image/DataBufferByte.java b/jdk/src/java.desktop/share/classes/java/awt/image/DataBufferByte.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/DataBufferByte.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/DataBufferByte.java
diff --git a/jdk/src/share/classes/java/awt/image/DataBufferDouble.java b/jdk/src/java.desktop/share/classes/java/awt/image/DataBufferDouble.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/DataBufferDouble.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/DataBufferDouble.java
diff --git a/jdk/src/share/classes/java/awt/image/DataBufferFloat.java b/jdk/src/java.desktop/share/classes/java/awt/image/DataBufferFloat.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/DataBufferFloat.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/DataBufferFloat.java
diff --git a/jdk/src/share/classes/java/awt/image/DataBufferInt.java b/jdk/src/java.desktop/share/classes/java/awt/image/DataBufferInt.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/DataBufferInt.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/DataBufferInt.java
diff --git a/jdk/src/share/classes/java/awt/image/DataBufferShort.java b/jdk/src/java.desktop/share/classes/java/awt/image/DataBufferShort.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/DataBufferShort.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/DataBufferShort.java
diff --git a/jdk/src/share/classes/java/awt/image/DataBufferUShort.java b/jdk/src/java.desktop/share/classes/java/awt/image/DataBufferUShort.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/DataBufferUShort.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/DataBufferUShort.java
diff --git a/jdk/src/share/classes/java/awt/image/DirectColorModel.java b/jdk/src/java.desktop/share/classes/java/awt/image/DirectColorModel.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/DirectColorModel.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/DirectColorModel.java
diff --git a/jdk/src/share/classes/java/awt/image/FilteredImageSource.java b/jdk/src/java.desktop/share/classes/java/awt/image/FilteredImageSource.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/FilteredImageSource.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/FilteredImageSource.java
diff --git a/jdk/src/share/classes/java/awt/image/ImageConsumer.java b/jdk/src/java.desktop/share/classes/java/awt/image/ImageConsumer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/ImageConsumer.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/ImageConsumer.java
diff --git a/jdk/src/share/classes/java/awt/image/ImageFilter.java b/jdk/src/java.desktop/share/classes/java/awt/image/ImageFilter.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/ImageFilter.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/ImageFilter.java
diff --git a/jdk/src/share/classes/java/awt/image/ImageObserver.java b/jdk/src/java.desktop/share/classes/java/awt/image/ImageObserver.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/ImageObserver.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/ImageObserver.java
diff --git a/jdk/src/share/classes/java/awt/image/ImageProducer.java b/jdk/src/java.desktop/share/classes/java/awt/image/ImageProducer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/ImageProducer.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/ImageProducer.java
diff --git a/jdk/src/share/classes/java/awt/image/ImagingOpException.java b/jdk/src/java.desktop/share/classes/java/awt/image/ImagingOpException.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/ImagingOpException.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/ImagingOpException.java
diff --git a/jdk/src/share/classes/java/awt/image/IndexColorModel.java b/jdk/src/java.desktop/share/classes/java/awt/image/IndexColorModel.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/IndexColorModel.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/IndexColorModel.java
diff --git a/jdk/src/share/classes/java/awt/image/Kernel.java b/jdk/src/java.desktop/share/classes/java/awt/image/Kernel.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/Kernel.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/Kernel.java
diff --git a/jdk/src/share/classes/java/awt/image/LookupOp.java b/jdk/src/java.desktop/share/classes/java/awt/image/LookupOp.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/LookupOp.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/LookupOp.java
diff --git a/jdk/src/share/classes/java/awt/image/LookupTable.java b/jdk/src/java.desktop/share/classes/java/awt/image/LookupTable.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/LookupTable.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/LookupTable.java
diff --git a/jdk/src/share/classes/java/awt/image/MemoryImageSource.java b/jdk/src/java.desktop/share/classes/java/awt/image/MemoryImageSource.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/MemoryImageSource.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/MemoryImageSource.java
diff --git a/jdk/src/share/classes/java/awt/image/MultiPixelPackedSampleModel.java b/jdk/src/java.desktop/share/classes/java/awt/image/MultiPixelPackedSampleModel.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/MultiPixelPackedSampleModel.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/MultiPixelPackedSampleModel.java
diff --git a/jdk/src/share/classes/java/awt/image/PackedColorModel.java b/jdk/src/java.desktop/share/classes/java/awt/image/PackedColorModel.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/PackedColorModel.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/PackedColorModel.java
diff --git a/jdk/src/share/classes/java/awt/image/PixelGrabber.java b/jdk/src/java.desktop/share/classes/java/awt/image/PixelGrabber.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/PixelGrabber.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/PixelGrabber.java
diff --git a/jdk/src/share/classes/java/awt/image/PixelInterleavedSampleModel.java b/jdk/src/java.desktop/share/classes/java/awt/image/PixelInterleavedSampleModel.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/PixelInterleavedSampleModel.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/PixelInterleavedSampleModel.java
diff --git a/jdk/src/share/classes/java/awt/image/RGBImageFilter.java b/jdk/src/java.desktop/share/classes/java/awt/image/RGBImageFilter.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/RGBImageFilter.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/RGBImageFilter.java
diff --git a/jdk/src/share/classes/java/awt/image/Raster.java b/jdk/src/java.desktop/share/classes/java/awt/image/Raster.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/Raster.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/Raster.java
diff --git a/jdk/src/share/classes/java/awt/image/RasterFormatException.java b/jdk/src/java.desktop/share/classes/java/awt/image/RasterFormatException.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/RasterFormatException.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/RasterFormatException.java
diff --git a/jdk/src/share/classes/java/awt/image/RasterOp.java b/jdk/src/java.desktop/share/classes/java/awt/image/RasterOp.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/RasterOp.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/RasterOp.java
diff --git a/jdk/src/share/classes/java/awt/image/RenderedImage.java b/jdk/src/java.desktop/share/classes/java/awt/image/RenderedImage.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/RenderedImage.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/RenderedImage.java
diff --git a/jdk/src/share/classes/java/awt/image/ReplicateScaleFilter.java b/jdk/src/java.desktop/share/classes/java/awt/image/ReplicateScaleFilter.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/ReplicateScaleFilter.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/ReplicateScaleFilter.java
diff --git a/jdk/src/share/classes/java/awt/image/RescaleOp.java b/jdk/src/java.desktop/share/classes/java/awt/image/RescaleOp.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/RescaleOp.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/RescaleOp.java
diff --git a/jdk/src/share/classes/java/awt/image/SampleModel.java b/jdk/src/java.desktop/share/classes/java/awt/image/SampleModel.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/SampleModel.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/SampleModel.java
diff --git a/jdk/src/share/classes/java/awt/image/ShortLookupTable.java b/jdk/src/java.desktop/share/classes/java/awt/image/ShortLookupTable.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/ShortLookupTable.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/ShortLookupTable.java
diff --git a/jdk/src/share/classes/java/awt/image/SinglePixelPackedSampleModel.java b/jdk/src/java.desktop/share/classes/java/awt/image/SinglePixelPackedSampleModel.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/SinglePixelPackedSampleModel.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/SinglePixelPackedSampleModel.java
diff --git a/jdk/src/share/classes/java/awt/image/TileObserver.java b/jdk/src/java.desktop/share/classes/java/awt/image/TileObserver.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/TileObserver.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/TileObserver.java
diff --git a/jdk/src/share/classes/java/awt/image/VolatileImage.java b/jdk/src/java.desktop/share/classes/java/awt/image/VolatileImage.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/VolatileImage.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/VolatileImage.java
diff --git a/jdk/src/share/classes/java/awt/image/WritableRaster.java b/jdk/src/java.desktop/share/classes/java/awt/image/WritableRaster.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/WritableRaster.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/WritableRaster.java
diff --git a/jdk/src/share/classes/java/awt/image/WritableRenderedImage.java b/jdk/src/java.desktop/share/classes/java/awt/image/WritableRenderedImage.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/WritableRenderedImage.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/WritableRenderedImage.java
diff --git a/jdk/src/share/classes/java/awt/image/package.html b/jdk/src/java.desktop/share/classes/java/awt/image/package.html
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/package.html
rename to jdk/src/java.desktop/share/classes/java/awt/image/package.html
diff --git a/jdk/src/share/classes/java/awt/image/renderable/ContextualRenderedImageFactory.java b/jdk/src/java.desktop/share/classes/java/awt/image/renderable/ContextualRenderedImageFactory.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/renderable/ContextualRenderedImageFactory.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/renderable/ContextualRenderedImageFactory.java
diff --git a/jdk/src/share/classes/java/awt/image/renderable/ParameterBlock.java b/jdk/src/java.desktop/share/classes/java/awt/image/renderable/ParameterBlock.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/renderable/ParameterBlock.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/renderable/ParameterBlock.java
diff --git a/jdk/src/share/classes/java/awt/image/renderable/RenderContext.java b/jdk/src/java.desktop/share/classes/java/awt/image/renderable/RenderContext.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/renderable/RenderContext.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/renderable/RenderContext.java
diff --git a/jdk/src/share/classes/java/awt/image/renderable/RenderableImage.java b/jdk/src/java.desktop/share/classes/java/awt/image/renderable/RenderableImage.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/renderable/RenderableImage.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/renderable/RenderableImage.java
diff --git a/jdk/src/share/classes/java/awt/image/renderable/RenderableImageOp.java b/jdk/src/java.desktop/share/classes/java/awt/image/renderable/RenderableImageOp.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/renderable/RenderableImageOp.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/renderable/RenderableImageOp.java
diff --git a/jdk/src/share/classes/java/awt/image/renderable/RenderableImageProducer.java b/jdk/src/java.desktop/share/classes/java/awt/image/renderable/RenderableImageProducer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/renderable/RenderableImageProducer.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/renderable/RenderableImageProducer.java
diff --git a/jdk/src/share/classes/java/awt/image/renderable/RenderedImageFactory.java b/jdk/src/java.desktop/share/classes/java/awt/image/renderable/RenderedImageFactory.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/renderable/RenderedImageFactory.java
rename to jdk/src/java.desktop/share/classes/java/awt/image/renderable/RenderedImageFactory.java
diff --git a/jdk/src/share/classes/java/awt/image/renderable/package.html b/jdk/src/java.desktop/share/classes/java/awt/image/renderable/package.html
similarity index 100%
rename from jdk/src/share/classes/java/awt/image/renderable/package.html
rename to jdk/src/java.desktop/share/classes/java/awt/image/renderable/package.html
diff --git a/jdk/src/share/classes/java/awt/package.html b/jdk/src/java.desktop/share/classes/java/awt/package.html
similarity index 100%
rename from jdk/src/share/classes/java/awt/package.html
rename to jdk/src/java.desktop/share/classes/java/awt/package.html
diff --git a/jdk/src/share/classes/java/awt/peer/ButtonPeer.java b/jdk/src/java.desktop/share/classes/java/awt/peer/ButtonPeer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/peer/ButtonPeer.java
rename to jdk/src/java.desktop/share/classes/java/awt/peer/ButtonPeer.java
diff --git a/jdk/src/share/classes/java/awt/peer/CanvasPeer.java b/jdk/src/java.desktop/share/classes/java/awt/peer/CanvasPeer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/peer/CanvasPeer.java
rename to jdk/src/java.desktop/share/classes/java/awt/peer/CanvasPeer.java
diff --git a/jdk/src/share/classes/java/awt/peer/CheckboxMenuItemPeer.java b/jdk/src/java.desktop/share/classes/java/awt/peer/CheckboxMenuItemPeer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/peer/CheckboxMenuItemPeer.java
rename to jdk/src/java.desktop/share/classes/java/awt/peer/CheckboxMenuItemPeer.java
diff --git a/jdk/src/share/classes/java/awt/peer/CheckboxPeer.java b/jdk/src/java.desktop/share/classes/java/awt/peer/CheckboxPeer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/peer/CheckboxPeer.java
rename to jdk/src/java.desktop/share/classes/java/awt/peer/CheckboxPeer.java
diff --git a/jdk/src/share/classes/java/awt/peer/ChoicePeer.java b/jdk/src/java.desktop/share/classes/java/awt/peer/ChoicePeer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/peer/ChoicePeer.java
rename to jdk/src/java.desktop/share/classes/java/awt/peer/ChoicePeer.java
diff --git a/jdk/src/share/classes/java/awt/peer/ComponentPeer.java b/jdk/src/java.desktop/share/classes/java/awt/peer/ComponentPeer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/peer/ComponentPeer.java
rename to jdk/src/java.desktop/share/classes/java/awt/peer/ComponentPeer.java
diff --git a/jdk/src/share/classes/java/awt/peer/ContainerPeer.java b/jdk/src/java.desktop/share/classes/java/awt/peer/ContainerPeer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/peer/ContainerPeer.java
rename to jdk/src/java.desktop/share/classes/java/awt/peer/ContainerPeer.java
diff --git a/jdk/src/share/classes/java/awt/peer/DesktopPeer.java b/jdk/src/java.desktop/share/classes/java/awt/peer/DesktopPeer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/peer/DesktopPeer.java
rename to jdk/src/java.desktop/share/classes/java/awt/peer/DesktopPeer.java
diff --git a/jdk/src/share/classes/java/awt/peer/DialogPeer.java b/jdk/src/java.desktop/share/classes/java/awt/peer/DialogPeer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/peer/DialogPeer.java
rename to jdk/src/java.desktop/share/classes/java/awt/peer/DialogPeer.java
diff --git a/jdk/src/share/classes/java/awt/peer/FileDialogPeer.java b/jdk/src/java.desktop/share/classes/java/awt/peer/FileDialogPeer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/peer/FileDialogPeer.java
rename to jdk/src/java.desktop/share/classes/java/awt/peer/FileDialogPeer.java
diff --git a/jdk/src/share/classes/java/awt/peer/FontPeer.java b/jdk/src/java.desktop/share/classes/java/awt/peer/FontPeer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/peer/FontPeer.java
rename to jdk/src/java.desktop/share/classes/java/awt/peer/FontPeer.java
diff --git a/jdk/src/share/classes/java/awt/peer/FramePeer.java b/jdk/src/java.desktop/share/classes/java/awt/peer/FramePeer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/peer/FramePeer.java
rename to jdk/src/java.desktop/share/classes/java/awt/peer/FramePeer.java
diff --git a/jdk/src/share/classes/java/awt/peer/KeyboardFocusManagerPeer.java b/jdk/src/java.desktop/share/classes/java/awt/peer/KeyboardFocusManagerPeer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/peer/KeyboardFocusManagerPeer.java
rename to jdk/src/java.desktop/share/classes/java/awt/peer/KeyboardFocusManagerPeer.java
diff --git a/jdk/src/share/classes/java/awt/peer/LabelPeer.java b/jdk/src/java.desktop/share/classes/java/awt/peer/LabelPeer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/peer/LabelPeer.java
rename to jdk/src/java.desktop/share/classes/java/awt/peer/LabelPeer.java
diff --git a/jdk/src/share/classes/java/awt/peer/LightweightPeer.java b/jdk/src/java.desktop/share/classes/java/awt/peer/LightweightPeer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/peer/LightweightPeer.java
rename to jdk/src/java.desktop/share/classes/java/awt/peer/LightweightPeer.java
diff --git a/jdk/src/share/classes/java/awt/peer/ListPeer.java b/jdk/src/java.desktop/share/classes/java/awt/peer/ListPeer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/peer/ListPeer.java
rename to jdk/src/java.desktop/share/classes/java/awt/peer/ListPeer.java
diff --git a/jdk/src/share/classes/java/awt/peer/MenuBarPeer.java b/jdk/src/java.desktop/share/classes/java/awt/peer/MenuBarPeer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/peer/MenuBarPeer.java
rename to jdk/src/java.desktop/share/classes/java/awt/peer/MenuBarPeer.java
diff --git a/jdk/src/share/classes/java/awt/peer/MenuComponentPeer.java b/jdk/src/java.desktop/share/classes/java/awt/peer/MenuComponentPeer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/peer/MenuComponentPeer.java
rename to jdk/src/java.desktop/share/classes/java/awt/peer/MenuComponentPeer.java
diff --git a/jdk/src/share/classes/java/awt/peer/MenuItemPeer.java b/jdk/src/java.desktop/share/classes/java/awt/peer/MenuItemPeer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/peer/MenuItemPeer.java
rename to jdk/src/java.desktop/share/classes/java/awt/peer/MenuItemPeer.java
diff --git a/jdk/src/share/classes/java/awt/peer/MenuPeer.java b/jdk/src/java.desktop/share/classes/java/awt/peer/MenuPeer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/peer/MenuPeer.java
rename to jdk/src/java.desktop/share/classes/java/awt/peer/MenuPeer.java
diff --git a/jdk/src/share/classes/java/awt/peer/MouseInfoPeer.java b/jdk/src/java.desktop/share/classes/java/awt/peer/MouseInfoPeer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/peer/MouseInfoPeer.java
rename to jdk/src/java.desktop/share/classes/java/awt/peer/MouseInfoPeer.java
diff --git a/jdk/src/share/classes/java/awt/peer/PanelPeer.java b/jdk/src/java.desktop/share/classes/java/awt/peer/PanelPeer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/peer/PanelPeer.java
rename to jdk/src/java.desktop/share/classes/java/awt/peer/PanelPeer.java
diff --git a/jdk/src/share/classes/java/awt/peer/PopupMenuPeer.java b/jdk/src/java.desktop/share/classes/java/awt/peer/PopupMenuPeer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/peer/PopupMenuPeer.java
rename to jdk/src/java.desktop/share/classes/java/awt/peer/PopupMenuPeer.java
diff --git a/jdk/src/share/classes/java/awt/peer/RobotPeer.java b/jdk/src/java.desktop/share/classes/java/awt/peer/RobotPeer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/peer/RobotPeer.java
rename to jdk/src/java.desktop/share/classes/java/awt/peer/RobotPeer.java
diff --git a/jdk/src/share/classes/java/awt/peer/ScrollPanePeer.java b/jdk/src/java.desktop/share/classes/java/awt/peer/ScrollPanePeer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/peer/ScrollPanePeer.java
rename to jdk/src/java.desktop/share/classes/java/awt/peer/ScrollPanePeer.java
diff --git a/jdk/src/share/classes/java/awt/peer/ScrollbarPeer.java b/jdk/src/java.desktop/share/classes/java/awt/peer/ScrollbarPeer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/peer/ScrollbarPeer.java
rename to jdk/src/java.desktop/share/classes/java/awt/peer/ScrollbarPeer.java
diff --git a/jdk/src/share/classes/java/awt/peer/SystemTrayPeer.java b/jdk/src/java.desktop/share/classes/java/awt/peer/SystemTrayPeer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/peer/SystemTrayPeer.java
rename to jdk/src/java.desktop/share/classes/java/awt/peer/SystemTrayPeer.java
diff --git a/jdk/src/share/classes/java/awt/peer/TextAreaPeer.java b/jdk/src/java.desktop/share/classes/java/awt/peer/TextAreaPeer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/peer/TextAreaPeer.java
rename to jdk/src/java.desktop/share/classes/java/awt/peer/TextAreaPeer.java
diff --git a/jdk/src/share/classes/java/awt/peer/TextComponentPeer.java b/jdk/src/java.desktop/share/classes/java/awt/peer/TextComponentPeer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/peer/TextComponentPeer.java
rename to jdk/src/java.desktop/share/classes/java/awt/peer/TextComponentPeer.java
diff --git a/jdk/src/share/classes/java/awt/peer/TextFieldPeer.java b/jdk/src/java.desktop/share/classes/java/awt/peer/TextFieldPeer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/peer/TextFieldPeer.java
rename to jdk/src/java.desktop/share/classes/java/awt/peer/TextFieldPeer.java
diff --git a/jdk/src/share/classes/java/awt/peer/TrayIconPeer.java b/jdk/src/java.desktop/share/classes/java/awt/peer/TrayIconPeer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/peer/TrayIconPeer.java
rename to jdk/src/java.desktop/share/classes/java/awt/peer/TrayIconPeer.java
diff --git a/jdk/src/share/classes/java/awt/peer/WindowPeer.java b/jdk/src/java.desktop/share/classes/java/awt/peer/WindowPeer.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/peer/WindowPeer.java
rename to jdk/src/java.desktop/share/classes/java/awt/peer/WindowPeer.java
diff --git a/jdk/src/share/classes/java/awt/peer/package.html b/jdk/src/java.desktop/share/classes/java/awt/peer/package.html
similarity index 100%
rename from jdk/src/share/classes/java/awt/peer/package.html
rename to jdk/src/java.desktop/share/classes/java/awt/peer/package.html
diff --git a/jdk/src/share/classes/java/awt/print/Book.java b/jdk/src/java.desktop/share/classes/java/awt/print/Book.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/print/Book.java
rename to jdk/src/java.desktop/share/classes/java/awt/print/Book.java
diff --git a/jdk/src/share/classes/java/awt/print/PageFormat.java b/jdk/src/java.desktop/share/classes/java/awt/print/PageFormat.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/print/PageFormat.java
rename to jdk/src/java.desktop/share/classes/java/awt/print/PageFormat.java
diff --git a/jdk/src/share/classes/java/awt/print/Pageable.java b/jdk/src/java.desktop/share/classes/java/awt/print/Pageable.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/print/Pageable.java
rename to jdk/src/java.desktop/share/classes/java/awt/print/Pageable.java
diff --git a/jdk/src/share/classes/java/awt/print/Paper.java b/jdk/src/java.desktop/share/classes/java/awt/print/Paper.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/print/Paper.java
rename to jdk/src/java.desktop/share/classes/java/awt/print/Paper.java
diff --git a/jdk/src/share/classes/java/awt/print/Printable.java b/jdk/src/java.desktop/share/classes/java/awt/print/Printable.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/print/Printable.java
rename to jdk/src/java.desktop/share/classes/java/awt/print/Printable.java
diff --git a/jdk/src/share/classes/java/awt/print/PrinterAbortException.java b/jdk/src/java.desktop/share/classes/java/awt/print/PrinterAbortException.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/print/PrinterAbortException.java
rename to jdk/src/java.desktop/share/classes/java/awt/print/PrinterAbortException.java
diff --git a/jdk/src/share/classes/java/awt/print/PrinterException.java b/jdk/src/java.desktop/share/classes/java/awt/print/PrinterException.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/print/PrinterException.java
rename to jdk/src/java.desktop/share/classes/java/awt/print/PrinterException.java
diff --git a/jdk/src/share/classes/java/awt/print/PrinterGraphics.java b/jdk/src/java.desktop/share/classes/java/awt/print/PrinterGraphics.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/print/PrinterGraphics.java
rename to jdk/src/java.desktop/share/classes/java/awt/print/PrinterGraphics.java
diff --git a/jdk/src/share/classes/java/awt/print/PrinterIOException.java b/jdk/src/java.desktop/share/classes/java/awt/print/PrinterIOException.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/print/PrinterIOException.java
rename to jdk/src/java.desktop/share/classes/java/awt/print/PrinterIOException.java
diff --git a/jdk/src/share/classes/java/awt/print/PrinterJob.java b/jdk/src/java.desktop/share/classes/java/awt/print/PrinterJob.java
similarity index 100%
rename from jdk/src/share/classes/java/awt/print/PrinterJob.java
rename to jdk/src/java.desktop/share/classes/java/awt/print/PrinterJob.java
diff --git a/jdk/src/share/classes/java/awt/print/package.html b/jdk/src/java.desktop/share/classes/java/awt/print/package.html
similarity index 100%
rename from jdk/src/share/classes/java/awt/print/package.html
rename to jdk/src/java.desktop/share/classes/java/awt/print/package.html
diff --git a/jdk/src/share/classes/java/beans/AppletInitializer.java b/jdk/src/java.desktop/share/classes/java/beans/AppletInitializer.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/AppletInitializer.java
rename to jdk/src/java.desktop/share/classes/java/beans/AppletInitializer.java
diff --git a/jdk/src/share/classes/java/beans/BeanDescriptor.java b/jdk/src/java.desktop/share/classes/java/beans/BeanDescriptor.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/BeanDescriptor.java
rename to jdk/src/java.desktop/share/classes/java/beans/BeanDescriptor.java
diff --git a/jdk/src/share/classes/java/beans/BeanInfo.java b/jdk/src/java.desktop/share/classes/java/beans/BeanInfo.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/BeanInfo.java
rename to jdk/src/java.desktop/share/classes/java/beans/BeanInfo.java
diff --git a/jdk/src/share/classes/java/beans/BeanProperty.java b/jdk/src/java.desktop/share/classes/java/beans/BeanProperty.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/BeanProperty.java
rename to jdk/src/java.desktop/share/classes/java/beans/BeanProperty.java
diff --git a/jdk/src/share/classes/java/beans/Beans.java b/jdk/src/java.desktop/share/classes/java/beans/Beans.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/Beans.java
rename to jdk/src/java.desktop/share/classes/java/beans/Beans.java
diff --git a/jdk/src/share/classes/java/beans/ChangeListenerMap.java b/jdk/src/java.desktop/share/classes/java/beans/ChangeListenerMap.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/ChangeListenerMap.java
rename to jdk/src/java.desktop/share/classes/java/beans/ChangeListenerMap.java
diff --git a/jdk/src/share/classes/java/beans/ConstructorProperties.java b/jdk/src/java.desktop/share/classes/java/beans/ConstructorProperties.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/ConstructorProperties.java
rename to jdk/src/java.desktop/share/classes/java/beans/ConstructorProperties.java
diff --git a/jdk/src/share/classes/java/beans/Customizer.java b/jdk/src/java.desktop/share/classes/java/beans/Customizer.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/Customizer.java
rename to jdk/src/java.desktop/share/classes/java/beans/Customizer.java
diff --git a/jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java b/jdk/src/java.desktop/share/classes/java/beans/DefaultPersistenceDelegate.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java
rename to jdk/src/java.desktop/share/classes/java/beans/DefaultPersistenceDelegate.java
diff --git a/jdk/src/share/classes/java/beans/DesignMode.java b/jdk/src/java.desktop/share/classes/java/beans/DesignMode.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/DesignMode.java
rename to jdk/src/java.desktop/share/classes/java/beans/DesignMode.java
diff --git a/jdk/src/share/classes/java/beans/Encoder.java b/jdk/src/java.desktop/share/classes/java/beans/Encoder.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/Encoder.java
rename to jdk/src/java.desktop/share/classes/java/beans/Encoder.java
diff --git a/jdk/src/share/classes/java/beans/EventHandler.java b/jdk/src/java.desktop/share/classes/java/beans/EventHandler.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/EventHandler.java
rename to jdk/src/java.desktop/share/classes/java/beans/EventHandler.java
diff --git a/jdk/src/share/classes/java/beans/EventSetDescriptor.java b/jdk/src/java.desktop/share/classes/java/beans/EventSetDescriptor.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/EventSetDescriptor.java
rename to jdk/src/java.desktop/share/classes/java/beans/EventSetDescriptor.java
diff --git a/jdk/src/share/classes/java/beans/ExceptionListener.java b/jdk/src/java.desktop/share/classes/java/beans/ExceptionListener.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/ExceptionListener.java
rename to jdk/src/java.desktop/share/classes/java/beans/ExceptionListener.java
diff --git a/jdk/src/share/classes/java/beans/Expression.java b/jdk/src/java.desktop/share/classes/java/beans/Expression.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/Expression.java
rename to jdk/src/java.desktop/share/classes/java/beans/Expression.java
diff --git a/jdk/src/share/classes/java/beans/FeatureDescriptor.java b/jdk/src/java.desktop/share/classes/java/beans/FeatureDescriptor.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/FeatureDescriptor.java
rename to jdk/src/java.desktop/share/classes/java/beans/FeatureDescriptor.java
diff --git a/jdk/src/share/classes/java/beans/IndexedPropertyChangeEvent.java b/jdk/src/java.desktop/share/classes/java/beans/IndexedPropertyChangeEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/IndexedPropertyChangeEvent.java
rename to jdk/src/java.desktop/share/classes/java/beans/IndexedPropertyChangeEvent.java
diff --git a/jdk/src/share/classes/java/beans/IndexedPropertyDescriptor.java b/jdk/src/java.desktop/share/classes/java/beans/IndexedPropertyDescriptor.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/IndexedPropertyDescriptor.java
rename to jdk/src/java.desktop/share/classes/java/beans/IndexedPropertyDescriptor.java
diff --git a/jdk/src/share/classes/java/beans/IntrospectionException.java b/jdk/src/java.desktop/share/classes/java/beans/IntrospectionException.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/IntrospectionException.java
rename to jdk/src/java.desktop/share/classes/java/beans/IntrospectionException.java
diff --git a/jdk/src/share/classes/java/beans/Introspector.java b/jdk/src/java.desktop/share/classes/java/beans/Introspector.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/Introspector.java
rename to jdk/src/java.desktop/share/classes/java/beans/Introspector.java
diff --git a/jdk/src/share/classes/java/beans/JavaBean.java b/jdk/src/java.desktop/share/classes/java/beans/JavaBean.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/JavaBean.java
rename to jdk/src/java.desktop/share/classes/java/beans/JavaBean.java
diff --git a/jdk/src/share/classes/java/beans/MetaData.java b/jdk/src/java.desktop/share/classes/java/beans/MetaData.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/MetaData.java
rename to jdk/src/java.desktop/share/classes/java/beans/MetaData.java
diff --git a/jdk/src/share/classes/java/beans/MethodDescriptor.java b/jdk/src/java.desktop/share/classes/java/beans/MethodDescriptor.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/MethodDescriptor.java
rename to jdk/src/java.desktop/share/classes/java/beans/MethodDescriptor.java
diff --git a/jdk/src/share/classes/java/beans/MethodRef.java b/jdk/src/java.desktop/share/classes/java/beans/MethodRef.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/MethodRef.java
rename to jdk/src/java.desktop/share/classes/java/beans/MethodRef.java
diff --git a/jdk/src/share/classes/java/beans/NameGenerator.java b/jdk/src/java.desktop/share/classes/java/beans/NameGenerator.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/NameGenerator.java
rename to jdk/src/java.desktop/share/classes/java/beans/NameGenerator.java
diff --git a/jdk/src/share/classes/java/beans/ParameterDescriptor.java b/jdk/src/java.desktop/share/classes/java/beans/ParameterDescriptor.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/ParameterDescriptor.java
rename to jdk/src/java.desktop/share/classes/java/beans/ParameterDescriptor.java
diff --git a/jdk/src/share/classes/java/beans/PersistenceDelegate.java b/jdk/src/java.desktop/share/classes/java/beans/PersistenceDelegate.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/PersistenceDelegate.java
rename to jdk/src/java.desktop/share/classes/java/beans/PersistenceDelegate.java
diff --git a/jdk/src/share/classes/java/beans/PropertyChangeEvent.java b/jdk/src/java.desktop/share/classes/java/beans/PropertyChangeEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/PropertyChangeEvent.java
rename to jdk/src/java.desktop/share/classes/java/beans/PropertyChangeEvent.java
diff --git a/jdk/src/share/classes/java/beans/PropertyChangeListener.java b/jdk/src/java.desktop/share/classes/java/beans/PropertyChangeListener.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/PropertyChangeListener.java
rename to jdk/src/java.desktop/share/classes/java/beans/PropertyChangeListener.java
diff --git a/jdk/src/share/classes/java/beans/PropertyChangeListenerProxy.java b/jdk/src/java.desktop/share/classes/java/beans/PropertyChangeListenerProxy.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/PropertyChangeListenerProxy.java
rename to jdk/src/java.desktop/share/classes/java/beans/PropertyChangeListenerProxy.java
diff --git a/jdk/src/share/classes/java/beans/PropertyChangeSupport.java b/jdk/src/java.desktop/share/classes/java/beans/PropertyChangeSupport.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/PropertyChangeSupport.java
rename to jdk/src/java.desktop/share/classes/java/beans/PropertyChangeSupport.java
diff --git a/jdk/src/share/classes/java/beans/PropertyDescriptor.java b/jdk/src/java.desktop/share/classes/java/beans/PropertyDescriptor.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/PropertyDescriptor.java
rename to jdk/src/java.desktop/share/classes/java/beans/PropertyDescriptor.java
diff --git a/jdk/src/share/classes/java/beans/PropertyEditor.java b/jdk/src/java.desktop/share/classes/java/beans/PropertyEditor.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/PropertyEditor.java
rename to jdk/src/java.desktop/share/classes/java/beans/PropertyEditor.java
diff --git a/jdk/src/share/classes/java/beans/PropertyEditorManager.java b/jdk/src/java.desktop/share/classes/java/beans/PropertyEditorManager.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/PropertyEditorManager.java
rename to jdk/src/java.desktop/share/classes/java/beans/PropertyEditorManager.java
diff --git a/jdk/src/share/classes/java/beans/PropertyEditorSupport.java b/jdk/src/java.desktop/share/classes/java/beans/PropertyEditorSupport.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/PropertyEditorSupport.java
rename to jdk/src/java.desktop/share/classes/java/beans/PropertyEditorSupport.java
diff --git a/jdk/src/share/classes/java/beans/PropertyVetoException.java b/jdk/src/java.desktop/share/classes/java/beans/PropertyVetoException.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/PropertyVetoException.java
rename to jdk/src/java.desktop/share/classes/java/beans/PropertyVetoException.java
diff --git a/jdk/src/share/classes/java/beans/SimpleBeanInfo.java b/jdk/src/java.desktop/share/classes/java/beans/SimpleBeanInfo.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/SimpleBeanInfo.java
rename to jdk/src/java.desktop/share/classes/java/beans/SimpleBeanInfo.java
diff --git a/jdk/src/share/classes/java/beans/Statement.java b/jdk/src/java.desktop/share/classes/java/beans/Statement.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/Statement.java
rename to jdk/src/java.desktop/share/classes/java/beans/Statement.java
diff --git a/jdk/src/share/classes/java/beans/ThreadGroupContext.java b/jdk/src/java.desktop/share/classes/java/beans/ThreadGroupContext.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/ThreadGroupContext.java
rename to jdk/src/java.desktop/share/classes/java/beans/ThreadGroupContext.java
diff --git a/jdk/src/share/classes/java/beans/Transient.java b/jdk/src/java.desktop/share/classes/java/beans/Transient.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/Transient.java
rename to jdk/src/java.desktop/share/classes/java/beans/Transient.java
diff --git a/jdk/src/share/classes/java/beans/VetoableChangeListener.java b/jdk/src/java.desktop/share/classes/java/beans/VetoableChangeListener.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/VetoableChangeListener.java
rename to jdk/src/java.desktop/share/classes/java/beans/VetoableChangeListener.java
diff --git a/jdk/src/share/classes/java/beans/VetoableChangeListenerProxy.java b/jdk/src/java.desktop/share/classes/java/beans/VetoableChangeListenerProxy.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/VetoableChangeListenerProxy.java
rename to jdk/src/java.desktop/share/classes/java/beans/VetoableChangeListenerProxy.java
diff --git a/jdk/src/share/classes/java/beans/VetoableChangeSupport.java b/jdk/src/java.desktop/share/classes/java/beans/VetoableChangeSupport.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/VetoableChangeSupport.java
rename to jdk/src/java.desktop/share/classes/java/beans/VetoableChangeSupport.java
diff --git a/jdk/src/share/classes/java/beans/Visibility.java b/jdk/src/java.desktop/share/classes/java/beans/Visibility.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/Visibility.java
rename to jdk/src/java.desktop/share/classes/java/beans/Visibility.java
diff --git a/jdk/src/share/classes/java/beans/WeakIdentityMap.java b/jdk/src/java.desktop/share/classes/java/beans/WeakIdentityMap.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/WeakIdentityMap.java
rename to jdk/src/java.desktop/share/classes/java/beans/WeakIdentityMap.java
diff --git a/jdk/src/share/classes/java/beans/XMLDecoder.java b/jdk/src/java.desktop/share/classes/java/beans/XMLDecoder.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/XMLDecoder.java
rename to jdk/src/java.desktop/share/classes/java/beans/XMLDecoder.java
diff --git a/jdk/src/share/classes/java/beans/XMLEncoder.java b/jdk/src/java.desktop/share/classes/java/beans/XMLEncoder.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/XMLEncoder.java
rename to jdk/src/java.desktop/share/classes/java/beans/XMLEncoder.java
diff --git a/jdk/src/share/classes/java/beans/beancontext/BeanContext.java b/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContext.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/beancontext/BeanContext.java
rename to jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContext.java
diff --git a/jdk/src/share/classes/java/beans/beancontext/BeanContextChild.java b/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChild.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/beancontext/BeanContextChild.java
rename to jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChild.java
diff --git a/jdk/src/share/classes/java/beans/beancontext/BeanContextChildComponentProxy.java b/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildComponentProxy.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/beancontext/BeanContextChildComponentProxy.java
rename to jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildComponentProxy.java
diff --git a/jdk/src/share/classes/java/beans/beancontext/BeanContextChildSupport.java b/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildSupport.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/beancontext/BeanContextChildSupport.java
rename to jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildSupport.java
diff --git a/jdk/src/share/classes/java/beans/beancontext/BeanContextContainerProxy.java b/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextContainerProxy.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/beancontext/BeanContextContainerProxy.java
rename to jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextContainerProxy.java
diff --git a/jdk/src/share/classes/java/beans/beancontext/BeanContextEvent.java b/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/beancontext/BeanContextEvent.java
rename to jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextEvent.java
diff --git a/jdk/src/share/classes/java/beans/beancontext/BeanContextMembershipEvent.java b/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/beancontext/BeanContextMembershipEvent.java
rename to jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipEvent.java
diff --git a/jdk/src/share/classes/java/beans/beancontext/BeanContextMembershipListener.java b/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipListener.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/beancontext/BeanContextMembershipListener.java
rename to jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipListener.java
diff --git a/jdk/src/share/classes/java/beans/beancontext/BeanContextProxy.java b/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextProxy.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/beancontext/BeanContextProxy.java
rename to jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextProxy.java
diff --git a/jdk/src/share/classes/java/beans/beancontext/BeanContextServiceAvailableEvent.java b/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceAvailableEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/beancontext/BeanContextServiceAvailableEvent.java
rename to jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceAvailableEvent.java
diff --git a/jdk/src/share/classes/java/beans/beancontext/BeanContextServiceProvider.java b/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProvider.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/beancontext/BeanContextServiceProvider.java
rename to jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProvider.java
diff --git a/jdk/src/share/classes/java/beans/beancontext/BeanContextServiceProviderBeanInfo.java b/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProviderBeanInfo.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/beancontext/BeanContextServiceProviderBeanInfo.java
rename to jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProviderBeanInfo.java
diff --git a/jdk/src/share/classes/java/beans/beancontext/BeanContextServiceRevokedEvent.java b/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/beancontext/BeanContextServiceRevokedEvent.java
rename to jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedEvent.java
diff --git a/jdk/src/share/classes/java/beans/beancontext/BeanContextServiceRevokedListener.java b/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedListener.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/beancontext/BeanContextServiceRevokedListener.java
rename to jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedListener.java
diff --git a/jdk/src/share/classes/java/beans/beancontext/BeanContextServices.java b/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServices.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/beancontext/BeanContextServices.java
rename to jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServices.java
diff --git a/jdk/src/share/classes/java/beans/beancontext/BeanContextServicesListener.java b/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesListener.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/beancontext/BeanContextServicesListener.java
rename to jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesListener.java
diff --git a/jdk/src/share/classes/java/beans/beancontext/BeanContextServicesSupport.java b/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesSupport.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/beancontext/BeanContextServicesSupport.java
rename to jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesSupport.java
diff --git a/jdk/src/share/classes/java/beans/beancontext/BeanContextSupport.java b/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextSupport.java
similarity index 100%
rename from jdk/src/share/classes/java/beans/beancontext/BeanContextSupport.java
rename to jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextSupport.java
diff --git a/jdk/src/share/classes/java/beans/beancontext/package.html b/jdk/src/java.desktop/share/classes/java/beans/beancontext/package.html
similarity index 100%
rename from jdk/src/share/classes/java/beans/beancontext/package.html
rename to jdk/src/java.desktop/share/classes/java/beans/beancontext/package.html
diff --git a/jdk/src/share/classes/java/beans/package.html b/jdk/src/java.desktop/share/classes/java/beans/package.html
similarity index 100%
rename from jdk/src/share/classes/java/beans/package.html
rename to jdk/src/java.desktop/share/classes/java/beans/package.html
diff --git a/jdk/src/share/classes/javax/accessibility/Accessible.java b/jdk/src/java.desktop/share/classes/javax/accessibility/Accessible.java
similarity index 100%
rename from jdk/src/share/classes/javax/accessibility/Accessible.java
rename to jdk/src/java.desktop/share/classes/javax/accessibility/Accessible.java
diff --git a/jdk/src/share/classes/javax/accessibility/AccessibleAction.java b/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleAction.java
similarity index 100%
rename from jdk/src/share/classes/javax/accessibility/AccessibleAction.java
rename to jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleAction.java
diff --git a/jdk/src/share/classes/javax/accessibility/AccessibleAttributeSequence.java b/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleAttributeSequence.java
similarity index 100%
rename from jdk/src/share/classes/javax/accessibility/AccessibleAttributeSequence.java
rename to jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleAttributeSequence.java
diff --git a/jdk/src/share/classes/javax/accessibility/AccessibleBundle.java b/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleBundle.java
similarity index 100%
rename from jdk/src/share/classes/javax/accessibility/AccessibleBundle.java
rename to jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleBundle.java
diff --git a/jdk/src/share/classes/javax/accessibility/AccessibleComponent.java b/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleComponent.java
similarity index 100%
rename from jdk/src/share/classes/javax/accessibility/AccessibleComponent.java
rename to jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleComponent.java
diff --git a/jdk/src/share/classes/javax/accessibility/AccessibleContext.java b/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleContext.java
similarity index 100%
rename from jdk/src/share/classes/javax/accessibility/AccessibleContext.java
rename to jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleContext.java
diff --git a/jdk/src/share/classes/javax/accessibility/AccessibleEditableText.java b/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleEditableText.java
similarity index 100%
rename from jdk/src/share/classes/javax/accessibility/AccessibleEditableText.java
rename to jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleEditableText.java
diff --git a/jdk/src/share/classes/javax/accessibility/AccessibleExtendedComponent.java b/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleExtendedComponent.java
similarity index 100%
rename from jdk/src/share/classes/javax/accessibility/AccessibleExtendedComponent.java
rename to jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleExtendedComponent.java
diff --git a/jdk/src/share/classes/javax/accessibility/AccessibleExtendedTable.java b/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleExtendedTable.java
similarity index 100%
rename from jdk/src/share/classes/javax/accessibility/AccessibleExtendedTable.java
rename to jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleExtendedTable.java
diff --git a/jdk/src/share/classes/javax/accessibility/AccessibleExtendedText.java b/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleExtendedText.java
similarity index 100%
rename from jdk/src/share/classes/javax/accessibility/AccessibleExtendedText.java
rename to jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleExtendedText.java
diff --git a/jdk/src/share/classes/javax/accessibility/AccessibleHyperlink.java b/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleHyperlink.java
similarity index 100%
rename from jdk/src/share/classes/javax/accessibility/AccessibleHyperlink.java
rename to jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleHyperlink.java
diff --git a/jdk/src/share/classes/javax/accessibility/AccessibleHypertext.java b/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleHypertext.java
similarity index 100%
rename from jdk/src/share/classes/javax/accessibility/AccessibleHypertext.java
rename to jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleHypertext.java
diff --git a/jdk/src/share/classes/javax/accessibility/AccessibleIcon.java b/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleIcon.java
similarity index 100%
rename from jdk/src/share/classes/javax/accessibility/AccessibleIcon.java
rename to jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleIcon.java
diff --git a/jdk/src/share/classes/javax/accessibility/AccessibleKeyBinding.java b/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleKeyBinding.java
similarity index 100%
rename from jdk/src/share/classes/javax/accessibility/AccessibleKeyBinding.java
rename to jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleKeyBinding.java
diff --git a/jdk/src/share/classes/javax/accessibility/AccessibleRelation.java b/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleRelation.java
similarity index 100%
rename from jdk/src/share/classes/javax/accessibility/AccessibleRelation.java
rename to jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleRelation.java
diff --git a/jdk/src/share/classes/javax/accessibility/AccessibleRelationSet.java b/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleRelationSet.java
similarity index 100%
rename from jdk/src/share/classes/javax/accessibility/AccessibleRelationSet.java
rename to jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleRelationSet.java
diff --git a/jdk/src/share/classes/javax/accessibility/AccessibleResourceBundle.java b/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleResourceBundle.java
similarity index 100%
rename from jdk/src/share/classes/javax/accessibility/AccessibleResourceBundle.java
rename to jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleResourceBundle.java
diff --git a/jdk/src/share/classes/javax/accessibility/AccessibleRole.java b/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleRole.java
similarity index 100%
rename from jdk/src/share/classes/javax/accessibility/AccessibleRole.java
rename to jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleRole.java
diff --git a/jdk/src/share/classes/javax/accessibility/AccessibleSelection.java b/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleSelection.java
similarity index 100%
rename from jdk/src/share/classes/javax/accessibility/AccessibleSelection.java
rename to jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleSelection.java
diff --git a/jdk/src/share/classes/javax/accessibility/AccessibleState.java b/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleState.java
similarity index 100%
rename from jdk/src/share/classes/javax/accessibility/AccessibleState.java
rename to jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleState.java
diff --git a/jdk/src/share/classes/javax/accessibility/AccessibleStateSet.java b/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleStateSet.java
similarity index 100%
rename from jdk/src/share/classes/javax/accessibility/AccessibleStateSet.java
rename to jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleStateSet.java
diff --git a/jdk/src/share/classes/javax/accessibility/AccessibleStreamable.java b/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleStreamable.java
similarity index 100%
rename from jdk/src/share/classes/javax/accessibility/AccessibleStreamable.java
rename to jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleStreamable.java
diff --git a/jdk/src/share/classes/javax/accessibility/AccessibleTable.java b/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleTable.java
similarity index 100%
rename from jdk/src/share/classes/javax/accessibility/AccessibleTable.java
rename to jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleTable.java
diff --git a/jdk/src/share/classes/javax/accessibility/AccessibleTableModelChange.java b/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleTableModelChange.java
similarity index 100%
rename from jdk/src/share/classes/javax/accessibility/AccessibleTableModelChange.java
rename to jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleTableModelChange.java
diff --git a/jdk/src/share/classes/javax/accessibility/AccessibleText.java b/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleText.java
similarity index 100%
rename from jdk/src/share/classes/javax/accessibility/AccessibleText.java
rename to jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleText.java
diff --git a/jdk/src/share/classes/javax/accessibility/AccessibleTextSequence.java b/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleTextSequence.java
similarity index 100%
rename from jdk/src/share/classes/javax/accessibility/AccessibleTextSequence.java
rename to jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleTextSequence.java
diff --git a/jdk/src/share/classes/javax/accessibility/AccessibleValue.java b/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleValue.java
similarity index 100%
rename from jdk/src/share/classes/javax/accessibility/AccessibleValue.java
rename to jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleValue.java
diff --git a/jdk/src/share/classes/javax/accessibility/package.html b/jdk/src/java.desktop/share/classes/javax/accessibility/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/accessibility/package.html
rename to jdk/src/java.desktop/share/classes/javax/accessibility/package.html
diff --git a/jdk/src/share/classes/javax/imageio/IIOException.java b/jdk/src/java.desktop/share/classes/javax/imageio/IIOException.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/IIOException.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/IIOException.java
diff --git a/jdk/src/share/classes/javax/imageio/IIOImage.java b/jdk/src/java.desktop/share/classes/javax/imageio/IIOImage.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/IIOImage.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/IIOImage.java
diff --git a/jdk/src/share/classes/javax/imageio/IIOParam.java b/jdk/src/java.desktop/share/classes/javax/imageio/IIOParam.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/IIOParam.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/IIOParam.java
diff --git a/jdk/src/share/classes/javax/imageio/IIOParamController.java b/jdk/src/java.desktop/share/classes/javax/imageio/IIOParamController.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/IIOParamController.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/IIOParamController.java
diff --git a/jdk/src/share/classes/javax/imageio/ImageIO.java b/jdk/src/java.desktop/share/classes/javax/imageio/ImageIO.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/ImageIO.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/ImageIO.java
diff --git a/jdk/src/share/classes/javax/imageio/ImageReadParam.java b/jdk/src/java.desktop/share/classes/javax/imageio/ImageReadParam.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/ImageReadParam.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/ImageReadParam.java
diff --git a/jdk/src/share/classes/javax/imageio/ImageReader.java b/jdk/src/java.desktop/share/classes/javax/imageio/ImageReader.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/ImageReader.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/ImageReader.java
diff --git a/jdk/src/share/classes/javax/imageio/ImageTranscoder.java b/jdk/src/java.desktop/share/classes/javax/imageio/ImageTranscoder.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/ImageTranscoder.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/ImageTranscoder.java
diff --git a/jdk/src/share/classes/javax/imageio/ImageTypeSpecifier.java b/jdk/src/java.desktop/share/classes/javax/imageio/ImageTypeSpecifier.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/ImageTypeSpecifier.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/ImageTypeSpecifier.java
diff --git a/jdk/src/share/classes/javax/imageio/ImageWriteParam.java b/jdk/src/java.desktop/share/classes/javax/imageio/ImageWriteParam.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/ImageWriteParam.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/ImageWriteParam.java
diff --git a/jdk/src/share/classes/javax/imageio/ImageWriter.java b/jdk/src/java.desktop/share/classes/javax/imageio/ImageWriter.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/ImageWriter.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/ImageWriter.java
diff --git a/jdk/src/share/classes/javax/imageio/event/IIOReadProgressListener.java b/jdk/src/java.desktop/share/classes/javax/imageio/event/IIOReadProgressListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/event/IIOReadProgressListener.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/event/IIOReadProgressListener.java
diff --git a/jdk/src/share/classes/javax/imageio/event/IIOReadUpdateListener.java b/jdk/src/java.desktop/share/classes/javax/imageio/event/IIOReadUpdateListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/event/IIOReadUpdateListener.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/event/IIOReadUpdateListener.java
diff --git a/jdk/src/share/classes/javax/imageio/event/IIOReadWarningListener.java b/jdk/src/java.desktop/share/classes/javax/imageio/event/IIOReadWarningListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/event/IIOReadWarningListener.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/event/IIOReadWarningListener.java
diff --git a/jdk/src/share/classes/javax/imageio/event/IIOWriteProgressListener.java b/jdk/src/java.desktop/share/classes/javax/imageio/event/IIOWriteProgressListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/event/IIOWriteProgressListener.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/event/IIOWriteProgressListener.java
diff --git a/jdk/src/share/classes/javax/imageio/event/IIOWriteWarningListener.java b/jdk/src/java.desktop/share/classes/javax/imageio/event/IIOWriteWarningListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/event/IIOWriteWarningListener.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/event/IIOWriteWarningListener.java
diff --git a/jdk/src/share/classes/javax/imageio/event/package.html b/jdk/src/java.desktop/share/classes/javax/imageio/event/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/event/package.html
rename to jdk/src/java.desktop/share/classes/javax/imageio/event/package.html
diff --git a/jdk/src/share/classes/javax/imageio/metadata/IIOInvalidTreeException.java b/jdk/src/java.desktop/share/classes/javax/imageio/metadata/IIOInvalidTreeException.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/metadata/IIOInvalidTreeException.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/metadata/IIOInvalidTreeException.java
diff --git a/jdk/src/share/classes/javax/imageio/metadata/IIOMetadata.java b/jdk/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadata.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/metadata/IIOMetadata.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadata.java
diff --git a/jdk/src/share/classes/javax/imageio/metadata/IIOMetadataController.java b/jdk/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataController.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/metadata/IIOMetadataController.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataController.java
diff --git a/jdk/src/share/classes/javax/imageio/metadata/IIOMetadataFormat.java b/jdk/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataFormat.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/metadata/IIOMetadataFormat.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataFormat.java
diff --git a/jdk/src/share/classes/javax/imageio/metadata/IIOMetadataFormatImpl.java b/jdk/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataFormatImpl.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/metadata/IIOMetadataFormatImpl.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataFormatImpl.java
diff --git a/jdk/src/share/classes/javax/imageio/metadata/IIOMetadataNode.java b/jdk/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataNode.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/metadata/IIOMetadataNode.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataNode.java
diff --git a/jdk/src/share/classes/javax/imageio/metadata/doc-files/bmp_metadata.html b/jdk/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/bmp_metadata.html
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/metadata/doc-files/bmp_metadata.html
rename to jdk/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/bmp_metadata.html
diff --git a/jdk/src/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html b/jdk/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html
rename to jdk/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html
diff --git a/jdk/src/share/classes/javax/imageio/metadata/doc-files/jpeg_metadata.html b/jdk/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/jpeg_metadata.html
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/metadata/doc-files/jpeg_metadata.html
rename to jdk/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/jpeg_metadata.html
diff --git a/jdk/src/share/classes/javax/imageio/metadata/doc-files/png_metadata.html b/jdk/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/png_metadata.html
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/metadata/doc-files/png_metadata.html
rename to jdk/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/png_metadata.html
diff --git a/jdk/src/share/classes/javax/imageio/metadata/doc-files/standard_metadata.html b/jdk/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/standard_metadata.html
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/metadata/doc-files/standard_metadata.html
rename to jdk/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/standard_metadata.html
diff --git a/jdk/src/share/classes/javax/imageio/metadata/doc-files/wbmp_metadata.html b/jdk/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/wbmp_metadata.html
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/metadata/doc-files/wbmp_metadata.html
rename to jdk/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/wbmp_metadata.html
diff --git a/jdk/src/share/classes/javax/imageio/metadata/package.html b/jdk/src/java.desktop/share/classes/javax/imageio/metadata/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/metadata/package.html
rename to jdk/src/java.desktop/share/classes/javax/imageio/metadata/package.html
diff --git a/jdk/src/share/classes/javax/imageio/package.html b/jdk/src/java.desktop/share/classes/javax/imageio/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/package.html
rename to jdk/src/java.desktop/share/classes/javax/imageio/package.html
diff --git a/jdk/src/share/classes/javax/imageio/plugins/bmp/BMPImageWriteParam.java b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/bmp/BMPImageWriteParam.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/plugins/bmp/BMPImageWriteParam.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/plugins/bmp/BMPImageWriteParam.java
diff --git a/jdk/src/share/classes/javax/imageio/plugins/bmp/package.html b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/bmp/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/plugins/bmp/package.html
rename to jdk/src/java.desktop/share/classes/javax/imageio/plugins/bmp/package.html
diff --git a/jdk/src/share/classes/javax/imageio/plugins/jpeg/JPEGHuffmanTable.java b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/jpeg/JPEGHuffmanTable.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/plugins/jpeg/JPEGHuffmanTable.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/plugins/jpeg/JPEGHuffmanTable.java
diff --git a/jdk/src/share/classes/javax/imageio/plugins/jpeg/JPEGImageReadParam.java b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/jpeg/JPEGImageReadParam.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/plugins/jpeg/JPEGImageReadParam.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/plugins/jpeg/JPEGImageReadParam.java
diff --git a/jdk/src/share/classes/javax/imageio/plugins/jpeg/JPEGImageWriteParam.java b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/jpeg/JPEGImageWriteParam.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/plugins/jpeg/JPEGImageWriteParam.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/plugins/jpeg/JPEGImageWriteParam.java
diff --git a/jdk/src/share/classes/javax/imageio/plugins/jpeg/JPEGQTable.java b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/jpeg/JPEGQTable.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/plugins/jpeg/JPEGQTable.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/plugins/jpeg/JPEGQTable.java
diff --git a/jdk/src/share/classes/javax/imageio/plugins/jpeg/package.html b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/jpeg/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/plugins/jpeg/package.html
rename to jdk/src/java.desktop/share/classes/javax/imageio/plugins/jpeg/package.html
diff --git a/jdk/src/share/classes/javax/imageio/spi/DigraphNode.java b/jdk/src/java.desktop/share/classes/javax/imageio/spi/DigraphNode.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/spi/DigraphNode.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/spi/DigraphNode.java
diff --git a/jdk/src/share/classes/javax/imageio/spi/IIORegistry.java b/jdk/src/java.desktop/share/classes/javax/imageio/spi/IIORegistry.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/spi/IIORegistry.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/spi/IIORegistry.java
diff --git a/jdk/src/share/classes/javax/imageio/spi/IIOServiceProvider.java b/jdk/src/java.desktop/share/classes/javax/imageio/spi/IIOServiceProvider.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/spi/IIOServiceProvider.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/spi/IIOServiceProvider.java
diff --git a/jdk/src/share/classes/javax/imageio/spi/ImageInputStreamSpi.java b/jdk/src/java.desktop/share/classes/javax/imageio/spi/ImageInputStreamSpi.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/spi/ImageInputStreamSpi.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/spi/ImageInputStreamSpi.java
diff --git a/jdk/src/share/classes/javax/imageio/spi/ImageOutputStreamSpi.java b/jdk/src/java.desktop/share/classes/javax/imageio/spi/ImageOutputStreamSpi.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/spi/ImageOutputStreamSpi.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/spi/ImageOutputStreamSpi.java
diff --git a/jdk/src/share/classes/javax/imageio/spi/ImageReaderSpi.java b/jdk/src/java.desktop/share/classes/javax/imageio/spi/ImageReaderSpi.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/spi/ImageReaderSpi.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/spi/ImageReaderSpi.java
diff --git a/jdk/src/share/classes/javax/imageio/spi/ImageReaderWriterSpi.java b/jdk/src/java.desktop/share/classes/javax/imageio/spi/ImageReaderWriterSpi.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/spi/ImageReaderWriterSpi.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/spi/ImageReaderWriterSpi.java
diff --git a/jdk/src/share/classes/javax/imageio/spi/ImageTranscoderSpi.java b/jdk/src/java.desktop/share/classes/javax/imageio/spi/ImageTranscoderSpi.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/spi/ImageTranscoderSpi.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/spi/ImageTranscoderSpi.java
diff --git a/jdk/src/share/classes/javax/imageio/spi/ImageWriterSpi.java b/jdk/src/java.desktop/share/classes/javax/imageio/spi/ImageWriterSpi.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/spi/ImageWriterSpi.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/spi/ImageWriterSpi.java
diff --git a/jdk/src/share/classes/javax/imageio/spi/PartiallyOrderedSet.java b/jdk/src/java.desktop/share/classes/javax/imageio/spi/PartiallyOrderedSet.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/spi/PartiallyOrderedSet.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/spi/PartiallyOrderedSet.java
diff --git a/jdk/src/share/classes/javax/imageio/spi/RegisterableService.java b/jdk/src/java.desktop/share/classes/javax/imageio/spi/RegisterableService.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/spi/RegisterableService.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/spi/RegisterableService.java
diff --git a/jdk/src/share/classes/javax/imageio/spi/ServiceRegistry.java b/jdk/src/java.desktop/share/classes/javax/imageio/spi/ServiceRegistry.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/spi/ServiceRegistry.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/spi/ServiceRegistry.java
diff --git a/jdk/src/share/classes/javax/imageio/spi/package.html b/jdk/src/java.desktop/share/classes/javax/imageio/spi/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/spi/package.html
rename to jdk/src/java.desktop/share/classes/javax/imageio/spi/package.html
diff --git a/jdk/src/share/classes/javax/imageio/stream/FileCacheImageInputStream.java b/jdk/src/java.desktop/share/classes/javax/imageio/stream/FileCacheImageInputStream.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/stream/FileCacheImageInputStream.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/stream/FileCacheImageInputStream.java
diff --git a/jdk/src/share/classes/javax/imageio/stream/FileCacheImageOutputStream.java b/jdk/src/java.desktop/share/classes/javax/imageio/stream/FileCacheImageOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/stream/FileCacheImageOutputStream.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/stream/FileCacheImageOutputStream.java
diff --git a/jdk/src/share/classes/javax/imageio/stream/FileImageInputStream.java b/jdk/src/java.desktop/share/classes/javax/imageio/stream/FileImageInputStream.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/stream/FileImageInputStream.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/stream/FileImageInputStream.java
diff --git a/jdk/src/share/classes/javax/imageio/stream/FileImageOutputStream.java b/jdk/src/java.desktop/share/classes/javax/imageio/stream/FileImageOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/stream/FileImageOutputStream.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/stream/FileImageOutputStream.java
diff --git a/jdk/src/share/classes/javax/imageio/stream/IIOByteBuffer.java b/jdk/src/java.desktop/share/classes/javax/imageio/stream/IIOByteBuffer.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/stream/IIOByteBuffer.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/stream/IIOByteBuffer.java
diff --git a/jdk/src/share/classes/javax/imageio/stream/ImageInputStream.java b/jdk/src/java.desktop/share/classes/javax/imageio/stream/ImageInputStream.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/stream/ImageInputStream.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/stream/ImageInputStream.java
diff --git a/jdk/src/share/classes/javax/imageio/stream/ImageInputStreamImpl.java b/jdk/src/java.desktop/share/classes/javax/imageio/stream/ImageInputStreamImpl.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/stream/ImageInputStreamImpl.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/stream/ImageInputStreamImpl.java
diff --git a/jdk/src/share/classes/javax/imageio/stream/ImageOutputStream.java b/jdk/src/java.desktop/share/classes/javax/imageio/stream/ImageOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/stream/ImageOutputStream.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/stream/ImageOutputStream.java
diff --git a/jdk/src/share/classes/javax/imageio/stream/ImageOutputStreamImpl.java b/jdk/src/java.desktop/share/classes/javax/imageio/stream/ImageOutputStreamImpl.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/stream/ImageOutputStreamImpl.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/stream/ImageOutputStreamImpl.java
diff --git a/jdk/src/share/classes/javax/imageio/stream/MemoryCache.java b/jdk/src/java.desktop/share/classes/javax/imageio/stream/MemoryCache.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/stream/MemoryCache.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/stream/MemoryCache.java
diff --git a/jdk/src/share/classes/javax/imageio/stream/MemoryCacheImageInputStream.java b/jdk/src/java.desktop/share/classes/javax/imageio/stream/MemoryCacheImageInputStream.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/stream/MemoryCacheImageInputStream.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/stream/MemoryCacheImageInputStream.java
diff --git a/jdk/src/share/classes/javax/imageio/stream/MemoryCacheImageOutputStream.java b/jdk/src/java.desktop/share/classes/javax/imageio/stream/MemoryCacheImageOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/stream/MemoryCacheImageOutputStream.java
rename to jdk/src/java.desktop/share/classes/javax/imageio/stream/MemoryCacheImageOutputStream.java
diff --git a/jdk/src/share/classes/javax/imageio/stream/package.html b/jdk/src/java.desktop/share/classes/javax/imageio/stream/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/imageio/stream/package.html
rename to jdk/src/java.desktop/share/classes/javax/imageio/stream/package.html
diff --git a/jdk/src/share/classes/javax/print/AttributeException.java b/jdk/src/java.desktop/share/classes/javax/print/AttributeException.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/AttributeException.java
rename to jdk/src/java.desktop/share/classes/javax/print/AttributeException.java
diff --git a/jdk/src/share/classes/javax/print/CancelablePrintJob.java b/jdk/src/java.desktop/share/classes/javax/print/CancelablePrintJob.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/CancelablePrintJob.java
rename to jdk/src/java.desktop/share/classes/javax/print/CancelablePrintJob.java
diff --git a/jdk/src/share/classes/javax/print/Doc.java b/jdk/src/java.desktop/share/classes/javax/print/Doc.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/Doc.java
rename to jdk/src/java.desktop/share/classes/javax/print/Doc.java
diff --git a/jdk/src/share/classes/javax/print/DocFlavor.java b/jdk/src/java.desktop/share/classes/javax/print/DocFlavor.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/DocFlavor.java
rename to jdk/src/java.desktop/share/classes/javax/print/DocFlavor.java
diff --git a/jdk/src/share/classes/javax/print/DocPrintJob.java b/jdk/src/java.desktop/share/classes/javax/print/DocPrintJob.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/DocPrintJob.java
rename to jdk/src/java.desktop/share/classes/javax/print/DocPrintJob.java
diff --git a/jdk/src/share/classes/javax/print/FlavorException.java b/jdk/src/java.desktop/share/classes/javax/print/FlavorException.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/FlavorException.java
rename to jdk/src/java.desktop/share/classes/javax/print/FlavorException.java
diff --git a/jdk/src/share/classes/javax/print/MimeType.java b/jdk/src/java.desktop/share/classes/javax/print/MimeType.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/MimeType.java
rename to jdk/src/java.desktop/share/classes/javax/print/MimeType.java
diff --git a/jdk/src/share/classes/javax/print/MultiDoc.java b/jdk/src/java.desktop/share/classes/javax/print/MultiDoc.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/MultiDoc.java
rename to jdk/src/java.desktop/share/classes/javax/print/MultiDoc.java
diff --git a/jdk/src/share/classes/javax/print/MultiDocPrintJob.java b/jdk/src/java.desktop/share/classes/javax/print/MultiDocPrintJob.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/MultiDocPrintJob.java
rename to jdk/src/java.desktop/share/classes/javax/print/MultiDocPrintJob.java
diff --git a/jdk/src/share/classes/javax/print/MultiDocPrintService.java b/jdk/src/java.desktop/share/classes/javax/print/MultiDocPrintService.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/MultiDocPrintService.java
rename to jdk/src/java.desktop/share/classes/javax/print/MultiDocPrintService.java
diff --git a/jdk/src/share/classes/javax/print/PrintException.java b/jdk/src/java.desktop/share/classes/javax/print/PrintException.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/PrintException.java
rename to jdk/src/java.desktop/share/classes/javax/print/PrintException.java
diff --git a/jdk/src/share/classes/javax/print/PrintService.java b/jdk/src/java.desktop/share/classes/javax/print/PrintService.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/PrintService.java
rename to jdk/src/java.desktop/share/classes/javax/print/PrintService.java
diff --git a/jdk/src/share/classes/javax/print/PrintServiceLookup.java b/jdk/src/java.desktop/share/classes/javax/print/PrintServiceLookup.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/PrintServiceLookup.java
rename to jdk/src/java.desktop/share/classes/javax/print/PrintServiceLookup.java
diff --git a/jdk/src/share/classes/javax/print/ServiceUI.java b/jdk/src/java.desktop/share/classes/javax/print/ServiceUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/ServiceUI.java
rename to jdk/src/java.desktop/share/classes/javax/print/ServiceUI.java
diff --git a/jdk/src/share/classes/javax/print/ServiceUIFactory.java b/jdk/src/java.desktop/share/classes/javax/print/ServiceUIFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/ServiceUIFactory.java
rename to jdk/src/java.desktop/share/classes/javax/print/ServiceUIFactory.java
diff --git a/jdk/src/share/classes/javax/print/SimpleDoc.java b/jdk/src/java.desktop/share/classes/javax/print/SimpleDoc.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/SimpleDoc.java
rename to jdk/src/java.desktop/share/classes/javax/print/SimpleDoc.java
diff --git a/jdk/src/share/classes/javax/print/StreamPrintService.java b/jdk/src/java.desktop/share/classes/javax/print/StreamPrintService.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/StreamPrintService.java
rename to jdk/src/java.desktop/share/classes/javax/print/StreamPrintService.java
diff --git a/jdk/src/share/classes/javax/print/StreamPrintServiceFactory.java b/jdk/src/java.desktop/share/classes/javax/print/StreamPrintServiceFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/StreamPrintServiceFactory.java
rename to jdk/src/java.desktop/share/classes/javax/print/StreamPrintServiceFactory.java
diff --git a/jdk/src/share/classes/javax/print/URIException.java b/jdk/src/java.desktop/share/classes/javax/print/URIException.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/URIException.java
rename to jdk/src/java.desktop/share/classes/javax/print/URIException.java
diff --git a/jdk/src/share/classes/javax/print/attribute/Attribute.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/Attribute.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/Attribute.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/Attribute.java
diff --git a/jdk/src/share/classes/javax/print/attribute/AttributeSet.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/AttributeSet.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/AttributeSet.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/AttributeSet.java
diff --git a/jdk/src/share/classes/javax/print/attribute/AttributeSetUtilities.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/AttributeSetUtilities.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/AttributeSetUtilities.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/AttributeSetUtilities.java
diff --git a/jdk/src/share/classes/javax/print/attribute/DateTimeSyntax.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/DateTimeSyntax.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/DateTimeSyntax.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/DateTimeSyntax.java
diff --git a/jdk/src/share/classes/javax/print/attribute/DocAttribute.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/DocAttribute.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/DocAttribute.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/DocAttribute.java
diff --git a/jdk/src/share/classes/javax/print/attribute/DocAttributeSet.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/DocAttributeSet.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/DocAttributeSet.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/DocAttributeSet.java
diff --git a/jdk/src/share/classes/javax/print/attribute/EnumSyntax.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/EnumSyntax.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/EnumSyntax.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/EnumSyntax.java
diff --git a/jdk/src/share/classes/javax/print/attribute/HashAttributeSet.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/HashAttributeSet.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/HashAttributeSet.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/HashAttributeSet.java
diff --git a/jdk/src/share/classes/javax/print/attribute/HashDocAttributeSet.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/HashDocAttributeSet.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/HashDocAttributeSet.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/HashDocAttributeSet.java
diff --git a/jdk/src/share/classes/javax/print/attribute/HashPrintJobAttributeSet.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/HashPrintJobAttributeSet.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/HashPrintJobAttributeSet.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/HashPrintJobAttributeSet.java
diff --git a/jdk/src/share/classes/javax/print/attribute/HashPrintRequestAttributeSet.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/HashPrintRequestAttributeSet.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/HashPrintRequestAttributeSet.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/HashPrintRequestAttributeSet.java
diff --git a/jdk/src/share/classes/javax/print/attribute/HashPrintServiceAttributeSet.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/HashPrintServiceAttributeSet.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/HashPrintServiceAttributeSet.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/HashPrintServiceAttributeSet.java
diff --git a/jdk/src/share/classes/javax/print/attribute/IntegerSyntax.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/IntegerSyntax.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/IntegerSyntax.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/IntegerSyntax.java
diff --git a/jdk/src/share/classes/javax/print/attribute/PrintJobAttribute.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/PrintJobAttribute.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/PrintJobAttribute.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/PrintJobAttribute.java
diff --git a/jdk/src/share/classes/javax/print/attribute/PrintJobAttributeSet.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/PrintJobAttributeSet.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/PrintJobAttributeSet.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/PrintJobAttributeSet.java
diff --git a/jdk/src/share/classes/javax/print/attribute/PrintRequestAttribute.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/PrintRequestAttribute.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/PrintRequestAttribute.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/PrintRequestAttribute.java
diff --git a/jdk/src/share/classes/javax/print/attribute/PrintRequestAttributeSet.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/PrintRequestAttributeSet.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/PrintRequestAttributeSet.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/PrintRequestAttributeSet.java
diff --git a/jdk/src/share/classes/javax/print/attribute/PrintServiceAttribute.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/PrintServiceAttribute.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/PrintServiceAttribute.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/PrintServiceAttribute.java
diff --git a/jdk/src/share/classes/javax/print/attribute/PrintServiceAttributeSet.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/PrintServiceAttributeSet.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/PrintServiceAttributeSet.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/PrintServiceAttributeSet.java
diff --git a/jdk/src/share/classes/javax/print/attribute/ResolutionSyntax.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/ResolutionSyntax.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/ResolutionSyntax.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/ResolutionSyntax.java
diff --git a/jdk/src/share/classes/javax/print/attribute/SetOfIntegerSyntax.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/SetOfIntegerSyntax.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/SetOfIntegerSyntax.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/SetOfIntegerSyntax.java
diff --git a/jdk/src/share/classes/javax/print/attribute/Size2DSyntax.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/Size2DSyntax.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/Size2DSyntax.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/Size2DSyntax.java
diff --git a/jdk/src/share/classes/javax/print/attribute/SupportedValuesAttribute.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/SupportedValuesAttribute.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/SupportedValuesAttribute.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/SupportedValuesAttribute.java
diff --git a/jdk/src/share/classes/javax/print/attribute/TextSyntax.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/TextSyntax.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/TextSyntax.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/TextSyntax.java
diff --git a/jdk/src/share/classes/javax/print/attribute/URISyntax.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/URISyntax.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/URISyntax.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/URISyntax.java
diff --git a/jdk/src/share/classes/javax/print/attribute/UnmodifiableSetException.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/UnmodifiableSetException.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/UnmodifiableSetException.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/UnmodifiableSetException.java
diff --git a/jdk/src/share/classes/javax/print/attribute/package.html b/jdk/src/java.desktop/share/classes/javax/print/attribute/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/package.html
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/package.html
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/Chromaticity.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Chromaticity.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/Chromaticity.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Chromaticity.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/ColorSupported.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/ColorSupported.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/ColorSupported.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/ColorSupported.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/Compression.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Compression.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/Compression.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Compression.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/Copies.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Copies.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/Copies.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Copies.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/CopiesSupported.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/CopiesSupported.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/CopiesSupported.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/CopiesSupported.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/DateTimeAtCompleted.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/DateTimeAtCompleted.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/DateTimeAtCompleted.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/DateTimeAtCompleted.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/DateTimeAtCreation.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/DateTimeAtCreation.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/DateTimeAtCreation.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/DateTimeAtCreation.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/DateTimeAtProcessing.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/DateTimeAtProcessing.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/DateTimeAtProcessing.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/DateTimeAtProcessing.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/Destination.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Destination.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/Destination.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Destination.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/DialogTypeSelection.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/DialogTypeSelection.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/DialogTypeSelection.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/DialogTypeSelection.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/DocumentName.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/DocumentName.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/DocumentName.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/DocumentName.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/Fidelity.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Fidelity.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/Fidelity.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Fidelity.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/Finishings.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Finishings.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/Finishings.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Finishings.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/JobHoldUntil.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobHoldUntil.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/JobHoldUntil.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobHoldUntil.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/JobImpressions.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobImpressions.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/JobImpressions.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobImpressions.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/JobImpressionsCompleted.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobImpressionsCompleted.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/JobImpressionsCompleted.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobImpressionsCompleted.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/JobImpressionsSupported.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobImpressionsSupported.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/JobImpressionsSupported.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobImpressionsSupported.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/JobKOctets.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobKOctets.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/JobKOctets.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobKOctets.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/JobKOctetsProcessed.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobKOctetsProcessed.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/JobKOctetsProcessed.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobKOctetsProcessed.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/JobKOctetsSupported.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobKOctetsSupported.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/JobKOctetsSupported.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobKOctetsSupported.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/JobMediaSheets.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobMediaSheets.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/JobMediaSheets.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobMediaSheets.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/JobMediaSheetsCompleted.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobMediaSheetsCompleted.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/JobMediaSheetsCompleted.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobMediaSheetsCompleted.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/JobMediaSheetsSupported.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobMediaSheetsSupported.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/JobMediaSheetsSupported.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobMediaSheetsSupported.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/JobMessageFromOperator.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobMessageFromOperator.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/JobMessageFromOperator.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobMessageFromOperator.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/JobName.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobName.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/JobName.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobName.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/JobOriginatingUserName.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobOriginatingUserName.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/JobOriginatingUserName.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobOriginatingUserName.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/JobPriority.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobPriority.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/JobPriority.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobPriority.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/JobPrioritySupported.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobPrioritySupported.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/JobPrioritySupported.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobPrioritySupported.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/JobSheets.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobSheets.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/JobSheets.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobSheets.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/JobState.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobState.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/JobState.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobState.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/JobStateReason.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobStateReason.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/JobStateReason.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobStateReason.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/JobStateReasons.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobStateReasons.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/JobStateReasons.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobStateReasons.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/Media.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Media.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/Media.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Media.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/MediaName.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/MediaName.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/MediaName.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/MediaName.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/MediaPrintableArea.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/MediaPrintableArea.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/MediaPrintableArea.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/MediaPrintableArea.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/MediaSize.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/MediaSize.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/MediaSize.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/MediaSize.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/MediaSizeName.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/MediaSizeName.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/MediaSizeName.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/MediaSizeName.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/MediaTray.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/MediaTray.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/MediaTray.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/MediaTray.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/MultipleDocumentHandling.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/MultipleDocumentHandling.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/MultipleDocumentHandling.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/MultipleDocumentHandling.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/NumberOfDocuments.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/NumberOfDocuments.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/NumberOfDocuments.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/NumberOfDocuments.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/NumberOfInterveningJobs.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/NumberOfInterveningJobs.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/NumberOfInterveningJobs.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/NumberOfInterveningJobs.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/NumberUp.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/NumberUp.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/NumberUp.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/NumberUp.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/NumberUpSupported.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/NumberUpSupported.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/NumberUpSupported.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/NumberUpSupported.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/OrientationRequested.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/OrientationRequested.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/OrientationRequested.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/OrientationRequested.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/OutputDeviceAssigned.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/OutputDeviceAssigned.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/OutputDeviceAssigned.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/OutputDeviceAssigned.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/PDLOverrideSupported.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PDLOverrideSupported.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/PDLOverrideSupported.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PDLOverrideSupported.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/PageRanges.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PageRanges.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/PageRanges.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PageRanges.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/PagesPerMinute.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PagesPerMinute.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/PagesPerMinute.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PagesPerMinute.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/PagesPerMinuteColor.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PagesPerMinuteColor.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/PagesPerMinuteColor.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PagesPerMinuteColor.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/PresentationDirection.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PresentationDirection.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/PresentationDirection.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PresentationDirection.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/PrintQuality.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrintQuality.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/PrintQuality.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrintQuality.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/PrinterInfo.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterInfo.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/PrinterInfo.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterInfo.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/PrinterIsAcceptingJobs.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterIsAcceptingJobs.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/PrinterIsAcceptingJobs.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterIsAcceptingJobs.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/PrinterLocation.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterLocation.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/PrinterLocation.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterLocation.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/PrinterMakeAndModel.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterMakeAndModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/PrinterMakeAndModel.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterMakeAndModel.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/PrinterMessageFromOperator.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterMessageFromOperator.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/PrinterMessageFromOperator.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterMessageFromOperator.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/PrinterMoreInfo.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterMoreInfo.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/PrinterMoreInfo.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterMoreInfo.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/PrinterName.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterName.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/PrinterName.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterName.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/PrinterResolution.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterResolution.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/PrinterResolution.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterResolution.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/PrinterState.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterState.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/PrinterState.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterState.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/PrinterStateReason.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterStateReason.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/PrinterStateReason.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterStateReason.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/PrinterStateReasons.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterStateReasons.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/PrinterStateReasons.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterStateReasons.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/PrinterURI.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterURI.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/PrinterURI.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterURI.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/QueuedJobCount.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/QueuedJobCount.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/QueuedJobCount.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/QueuedJobCount.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/ReferenceUriSchemesSupported.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/ReferenceUriSchemesSupported.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/ReferenceUriSchemesSupported.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/ReferenceUriSchemesSupported.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/RequestingUserName.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/RequestingUserName.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/RequestingUserName.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/RequestingUserName.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/Severity.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Severity.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/Severity.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Severity.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/SheetCollate.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/SheetCollate.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/SheetCollate.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/SheetCollate.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/Sides.java b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Sides.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/Sides.java
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Sides.java
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/package.html b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/print/attribute/standard/package.html
rename to jdk/src/java.desktop/share/classes/javax/print/attribute/standard/package.html
diff --git a/jdk/src/share/classes/javax/print/event/PrintEvent.java b/jdk/src/java.desktop/share/classes/javax/print/event/PrintEvent.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/event/PrintEvent.java
rename to jdk/src/java.desktop/share/classes/javax/print/event/PrintEvent.java
diff --git a/jdk/src/share/classes/javax/print/event/PrintJobAdapter.java b/jdk/src/java.desktop/share/classes/javax/print/event/PrintJobAdapter.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/event/PrintJobAdapter.java
rename to jdk/src/java.desktop/share/classes/javax/print/event/PrintJobAdapter.java
diff --git a/jdk/src/share/classes/javax/print/event/PrintJobAttributeEvent.java b/jdk/src/java.desktop/share/classes/javax/print/event/PrintJobAttributeEvent.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/event/PrintJobAttributeEvent.java
rename to jdk/src/java.desktop/share/classes/javax/print/event/PrintJobAttributeEvent.java
diff --git a/jdk/src/share/classes/javax/print/event/PrintJobAttributeListener.java b/jdk/src/java.desktop/share/classes/javax/print/event/PrintJobAttributeListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/event/PrintJobAttributeListener.java
rename to jdk/src/java.desktop/share/classes/javax/print/event/PrintJobAttributeListener.java
diff --git a/jdk/src/share/classes/javax/print/event/PrintJobEvent.java b/jdk/src/java.desktop/share/classes/javax/print/event/PrintJobEvent.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/event/PrintJobEvent.java
rename to jdk/src/java.desktop/share/classes/javax/print/event/PrintJobEvent.java
diff --git a/jdk/src/share/classes/javax/print/event/PrintJobListener.java b/jdk/src/java.desktop/share/classes/javax/print/event/PrintJobListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/event/PrintJobListener.java
rename to jdk/src/java.desktop/share/classes/javax/print/event/PrintJobListener.java
diff --git a/jdk/src/share/classes/javax/print/event/PrintServiceAttributeEvent.java b/jdk/src/java.desktop/share/classes/javax/print/event/PrintServiceAttributeEvent.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/event/PrintServiceAttributeEvent.java
rename to jdk/src/java.desktop/share/classes/javax/print/event/PrintServiceAttributeEvent.java
diff --git a/jdk/src/share/classes/javax/print/event/PrintServiceAttributeListener.java b/jdk/src/java.desktop/share/classes/javax/print/event/PrintServiceAttributeListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/print/event/PrintServiceAttributeListener.java
rename to jdk/src/java.desktop/share/classes/javax/print/event/PrintServiceAttributeListener.java
diff --git a/jdk/src/share/classes/javax/print/event/package.html b/jdk/src/java.desktop/share/classes/javax/print/event/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/print/event/package.html
rename to jdk/src/java.desktop/share/classes/javax/print/event/package.html
diff --git a/jdk/src/share/classes/javax/print/package.html b/jdk/src/java.desktop/share/classes/javax/print/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/print/package.html
rename to jdk/src/java.desktop/share/classes/javax/print/package.html
diff --git a/jdk/src/share/classes/javax/sound/midi/ControllerEventListener.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/ControllerEventListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/midi/ControllerEventListener.java
rename to jdk/src/java.desktop/share/classes/javax/sound/midi/ControllerEventListener.java
diff --git a/jdk/src/share/classes/javax/sound/midi/Instrument.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/Instrument.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/midi/Instrument.java
rename to jdk/src/java.desktop/share/classes/javax/sound/midi/Instrument.java
diff --git a/jdk/src/share/classes/javax/sound/midi/InvalidMidiDataException.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/InvalidMidiDataException.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/midi/InvalidMidiDataException.java
rename to jdk/src/java.desktop/share/classes/javax/sound/midi/InvalidMidiDataException.java
diff --git a/jdk/src/share/classes/javax/sound/midi/MetaEventListener.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/MetaEventListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/midi/MetaEventListener.java
rename to jdk/src/java.desktop/share/classes/javax/sound/midi/MetaEventListener.java
diff --git a/jdk/src/share/classes/javax/sound/midi/MetaMessage.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/MetaMessage.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/midi/MetaMessage.java
rename to jdk/src/java.desktop/share/classes/javax/sound/midi/MetaMessage.java
diff --git a/jdk/src/share/classes/javax/sound/midi/MidiChannel.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiChannel.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/midi/MidiChannel.java
rename to jdk/src/java.desktop/share/classes/javax/sound/midi/MidiChannel.java
diff --git a/jdk/src/share/classes/javax/sound/midi/MidiDevice.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiDevice.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/midi/MidiDevice.java
rename to jdk/src/java.desktop/share/classes/javax/sound/midi/MidiDevice.java
diff --git a/jdk/src/share/classes/javax/sound/midi/MidiDeviceReceiver.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiDeviceReceiver.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/midi/MidiDeviceReceiver.java
rename to jdk/src/java.desktop/share/classes/javax/sound/midi/MidiDeviceReceiver.java
diff --git a/jdk/src/share/classes/javax/sound/midi/MidiDeviceTransmitter.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiDeviceTransmitter.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/midi/MidiDeviceTransmitter.java
rename to jdk/src/java.desktop/share/classes/javax/sound/midi/MidiDeviceTransmitter.java
diff --git a/jdk/src/share/classes/javax/sound/midi/MidiEvent.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiEvent.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/midi/MidiEvent.java
rename to jdk/src/java.desktop/share/classes/javax/sound/midi/MidiEvent.java
diff --git a/jdk/src/share/classes/javax/sound/midi/MidiFileFormat.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiFileFormat.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/midi/MidiFileFormat.java
rename to jdk/src/java.desktop/share/classes/javax/sound/midi/MidiFileFormat.java
diff --git a/jdk/src/share/classes/javax/sound/midi/MidiMessage.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiMessage.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/midi/MidiMessage.java
rename to jdk/src/java.desktop/share/classes/javax/sound/midi/MidiMessage.java
diff --git a/jdk/src/share/classes/javax/sound/midi/MidiSystem.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiSystem.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/midi/MidiSystem.java
rename to jdk/src/java.desktop/share/classes/javax/sound/midi/MidiSystem.java
diff --git a/jdk/src/share/classes/javax/sound/midi/MidiUnavailableException.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiUnavailableException.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/midi/MidiUnavailableException.java
rename to jdk/src/java.desktop/share/classes/javax/sound/midi/MidiUnavailableException.java
diff --git a/jdk/src/share/classes/javax/sound/midi/Patch.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/Patch.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/midi/Patch.java
rename to jdk/src/java.desktop/share/classes/javax/sound/midi/Patch.java
diff --git a/jdk/src/share/classes/javax/sound/midi/Receiver.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/Receiver.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/midi/Receiver.java
rename to jdk/src/java.desktop/share/classes/javax/sound/midi/Receiver.java
diff --git a/jdk/src/share/classes/javax/sound/midi/Sequence.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/Sequence.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/midi/Sequence.java
rename to jdk/src/java.desktop/share/classes/javax/sound/midi/Sequence.java
diff --git a/jdk/src/share/classes/javax/sound/midi/Sequencer.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/Sequencer.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/midi/Sequencer.java
rename to jdk/src/java.desktop/share/classes/javax/sound/midi/Sequencer.java
diff --git a/jdk/src/share/classes/javax/sound/midi/ShortMessage.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/ShortMessage.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/midi/ShortMessage.java
rename to jdk/src/java.desktop/share/classes/javax/sound/midi/ShortMessage.java
diff --git a/jdk/src/share/classes/javax/sound/midi/Soundbank.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/Soundbank.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/midi/Soundbank.java
rename to jdk/src/java.desktop/share/classes/javax/sound/midi/Soundbank.java
diff --git a/jdk/src/share/classes/javax/sound/midi/SoundbankResource.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/SoundbankResource.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/midi/SoundbankResource.java
rename to jdk/src/java.desktop/share/classes/javax/sound/midi/SoundbankResource.java
diff --git a/jdk/src/share/classes/javax/sound/midi/Synthesizer.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/Synthesizer.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/midi/Synthesizer.java
rename to jdk/src/java.desktop/share/classes/javax/sound/midi/Synthesizer.java
diff --git a/jdk/src/share/classes/javax/sound/midi/SysexMessage.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/SysexMessage.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/midi/SysexMessage.java
rename to jdk/src/java.desktop/share/classes/javax/sound/midi/SysexMessage.java
diff --git a/jdk/src/share/classes/javax/sound/midi/Track.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/Track.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/midi/Track.java
rename to jdk/src/java.desktop/share/classes/javax/sound/midi/Track.java
diff --git a/jdk/src/share/classes/javax/sound/midi/Transmitter.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/Transmitter.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/midi/Transmitter.java
rename to jdk/src/java.desktop/share/classes/javax/sound/midi/Transmitter.java
diff --git a/jdk/src/share/classes/javax/sound/midi/VoiceStatus.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/VoiceStatus.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/midi/VoiceStatus.java
rename to jdk/src/java.desktop/share/classes/javax/sound/midi/VoiceStatus.java
diff --git a/jdk/src/share/classes/javax/sound/midi/package.html b/jdk/src/java.desktop/share/classes/javax/sound/midi/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/sound/midi/package.html
rename to jdk/src/java.desktop/share/classes/javax/sound/midi/package.html
diff --git a/jdk/src/share/classes/javax/sound/midi/spi/MidiDeviceProvider.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/spi/MidiDeviceProvider.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/midi/spi/MidiDeviceProvider.java
rename to jdk/src/java.desktop/share/classes/javax/sound/midi/spi/MidiDeviceProvider.java
diff --git a/jdk/src/share/classes/javax/sound/midi/spi/MidiFileReader.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/spi/MidiFileReader.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/midi/spi/MidiFileReader.java
rename to jdk/src/java.desktop/share/classes/javax/sound/midi/spi/MidiFileReader.java
diff --git a/jdk/src/share/classes/javax/sound/midi/spi/MidiFileWriter.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/spi/MidiFileWriter.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/midi/spi/MidiFileWriter.java
rename to jdk/src/java.desktop/share/classes/javax/sound/midi/spi/MidiFileWriter.java
diff --git a/jdk/src/share/classes/javax/sound/midi/spi/SoundbankReader.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/spi/SoundbankReader.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/midi/spi/SoundbankReader.java
rename to jdk/src/java.desktop/share/classes/javax/sound/midi/spi/SoundbankReader.java
diff --git a/jdk/src/share/classes/javax/sound/midi/spi/package.html b/jdk/src/java.desktop/share/classes/javax/sound/midi/spi/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/sound/midi/spi/package.html
rename to jdk/src/java.desktop/share/classes/javax/sound/midi/spi/package.html
diff --git a/jdk/src/share/classes/javax/sound/sampled/AudioFileFormat.java b/jdk/src/java.desktop/share/classes/javax/sound/sampled/AudioFileFormat.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/sampled/AudioFileFormat.java
rename to jdk/src/java.desktop/share/classes/javax/sound/sampled/AudioFileFormat.java
diff --git a/jdk/src/share/classes/javax/sound/sampled/AudioFormat.java b/jdk/src/java.desktop/share/classes/javax/sound/sampled/AudioFormat.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/sampled/AudioFormat.java
rename to jdk/src/java.desktop/share/classes/javax/sound/sampled/AudioFormat.java
diff --git a/jdk/src/share/classes/javax/sound/sampled/AudioInputStream.java b/jdk/src/java.desktop/share/classes/javax/sound/sampled/AudioInputStream.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/sampled/AudioInputStream.java
rename to jdk/src/java.desktop/share/classes/javax/sound/sampled/AudioInputStream.java
diff --git a/jdk/src/share/classes/javax/sound/sampled/AudioPermission.java b/jdk/src/java.desktop/share/classes/javax/sound/sampled/AudioPermission.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/sampled/AudioPermission.java
rename to jdk/src/java.desktop/share/classes/javax/sound/sampled/AudioPermission.java
diff --git a/jdk/src/share/classes/javax/sound/sampled/AudioSystem.java b/jdk/src/java.desktop/share/classes/javax/sound/sampled/AudioSystem.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/sampled/AudioSystem.java
rename to jdk/src/java.desktop/share/classes/javax/sound/sampled/AudioSystem.java
diff --git a/jdk/src/share/classes/javax/sound/sampled/BooleanControl.java b/jdk/src/java.desktop/share/classes/javax/sound/sampled/BooleanControl.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/sampled/BooleanControl.java
rename to jdk/src/java.desktop/share/classes/javax/sound/sampled/BooleanControl.java
diff --git a/jdk/src/share/classes/javax/sound/sampled/Clip.java b/jdk/src/java.desktop/share/classes/javax/sound/sampled/Clip.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/sampled/Clip.java
rename to jdk/src/java.desktop/share/classes/javax/sound/sampled/Clip.java
diff --git a/jdk/src/share/classes/javax/sound/sampled/CompoundControl.java b/jdk/src/java.desktop/share/classes/javax/sound/sampled/CompoundControl.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/sampled/CompoundControl.java
rename to jdk/src/java.desktop/share/classes/javax/sound/sampled/CompoundControl.java
diff --git a/jdk/src/share/classes/javax/sound/sampled/Control.java b/jdk/src/java.desktop/share/classes/javax/sound/sampled/Control.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/sampled/Control.java
rename to jdk/src/java.desktop/share/classes/javax/sound/sampled/Control.java
diff --git a/jdk/src/share/classes/javax/sound/sampled/DataLine.java b/jdk/src/java.desktop/share/classes/javax/sound/sampled/DataLine.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/sampled/DataLine.java
rename to jdk/src/java.desktop/share/classes/javax/sound/sampled/DataLine.java
diff --git a/jdk/src/share/classes/javax/sound/sampled/EnumControl.java b/jdk/src/java.desktop/share/classes/javax/sound/sampled/EnumControl.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/sampled/EnumControl.java
rename to jdk/src/java.desktop/share/classes/javax/sound/sampled/EnumControl.java
diff --git a/jdk/src/share/classes/javax/sound/sampled/FloatControl.java b/jdk/src/java.desktop/share/classes/javax/sound/sampled/FloatControl.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/sampled/FloatControl.java
rename to jdk/src/java.desktop/share/classes/javax/sound/sampled/FloatControl.java
diff --git a/jdk/src/share/classes/javax/sound/sampled/Line.java b/jdk/src/java.desktop/share/classes/javax/sound/sampled/Line.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/sampled/Line.java
rename to jdk/src/java.desktop/share/classes/javax/sound/sampled/Line.java
diff --git a/jdk/src/share/classes/javax/sound/sampled/LineEvent.java b/jdk/src/java.desktop/share/classes/javax/sound/sampled/LineEvent.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/sampled/LineEvent.java
rename to jdk/src/java.desktop/share/classes/javax/sound/sampled/LineEvent.java
diff --git a/jdk/src/share/classes/javax/sound/sampled/LineListener.java b/jdk/src/java.desktop/share/classes/javax/sound/sampled/LineListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/sampled/LineListener.java
rename to jdk/src/java.desktop/share/classes/javax/sound/sampled/LineListener.java
diff --git a/jdk/src/share/classes/javax/sound/sampled/LineUnavailableException.java b/jdk/src/java.desktop/share/classes/javax/sound/sampled/LineUnavailableException.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/sampled/LineUnavailableException.java
rename to jdk/src/java.desktop/share/classes/javax/sound/sampled/LineUnavailableException.java
diff --git a/jdk/src/share/classes/javax/sound/sampled/Mixer.java b/jdk/src/java.desktop/share/classes/javax/sound/sampled/Mixer.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/sampled/Mixer.java
rename to jdk/src/java.desktop/share/classes/javax/sound/sampled/Mixer.java
diff --git a/jdk/src/share/classes/javax/sound/sampled/Port.java b/jdk/src/java.desktop/share/classes/javax/sound/sampled/Port.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/sampled/Port.java
rename to jdk/src/java.desktop/share/classes/javax/sound/sampled/Port.java
diff --git a/jdk/src/share/classes/javax/sound/sampled/ReverbType.java b/jdk/src/java.desktop/share/classes/javax/sound/sampled/ReverbType.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/sampled/ReverbType.java
rename to jdk/src/java.desktop/share/classes/javax/sound/sampled/ReverbType.java
diff --git a/jdk/src/share/classes/javax/sound/sampled/SourceDataLine.java b/jdk/src/java.desktop/share/classes/javax/sound/sampled/SourceDataLine.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/sampled/SourceDataLine.java
rename to jdk/src/java.desktop/share/classes/javax/sound/sampled/SourceDataLine.java
diff --git a/jdk/src/share/classes/javax/sound/sampled/TargetDataLine.java b/jdk/src/java.desktop/share/classes/javax/sound/sampled/TargetDataLine.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/sampled/TargetDataLine.java
rename to jdk/src/java.desktop/share/classes/javax/sound/sampled/TargetDataLine.java
diff --git a/jdk/src/share/classes/javax/sound/sampled/UnsupportedAudioFileException.java b/jdk/src/java.desktop/share/classes/javax/sound/sampled/UnsupportedAudioFileException.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/sampled/UnsupportedAudioFileException.java
rename to jdk/src/java.desktop/share/classes/javax/sound/sampled/UnsupportedAudioFileException.java
diff --git a/jdk/src/share/classes/javax/sound/sampled/package.html b/jdk/src/java.desktop/share/classes/javax/sound/sampled/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/sound/sampled/package.html
rename to jdk/src/java.desktop/share/classes/javax/sound/sampled/package.html
diff --git a/jdk/src/share/classes/javax/sound/sampled/spi/AudioFileReader.java b/jdk/src/java.desktop/share/classes/javax/sound/sampled/spi/AudioFileReader.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/sampled/spi/AudioFileReader.java
rename to jdk/src/java.desktop/share/classes/javax/sound/sampled/spi/AudioFileReader.java
diff --git a/jdk/src/share/classes/javax/sound/sampled/spi/AudioFileWriter.java b/jdk/src/java.desktop/share/classes/javax/sound/sampled/spi/AudioFileWriter.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/sampled/spi/AudioFileWriter.java
rename to jdk/src/java.desktop/share/classes/javax/sound/sampled/spi/AudioFileWriter.java
diff --git a/jdk/src/share/classes/javax/sound/sampled/spi/FormatConversionProvider.java b/jdk/src/java.desktop/share/classes/javax/sound/sampled/spi/FormatConversionProvider.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/sampled/spi/FormatConversionProvider.java
rename to jdk/src/java.desktop/share/classes/javax/sound/sampled/spi/FormatConversionProvider.java
diff --git a/jdk/src/share/classes/javax/sound/sampled/spi/MixerProvider.java b/jdk/src/java.desktop/share/classes/javax/sound/sampled/spi/MixerProvider.java
similarity index 100%
rename from jdk/src/share/classes/javax/sound/sampled/spi/MixerProvider.java
rename to jdk/src/java.desktop/share/classes/javax/sound/sampled/spi/MixerProvider.java
diff --git a/jdk/src/share/classes/javax/sound/sampled/spi/package.html b/jdk/src/java.desktop/share/classes/javax/sound/sampled/spi/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/sound/sampled/spi/package.html
rename to jdk/src/java.desktop/share/classes/javax/sound/sampled/spi/package.html
diff --git a/jdk/src/share/classes/javax/swing/AbstractAction.java b/jdk/src/java.desktop/share/classes/javax/swing/AbstractAction.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/AbstractAction.java
rename to jdk/src/java.desktop/share/classes/javax/swing/AbstractAction.java
diff --git a/jdk/src/share/classes/javax/swing/AbstractButton.java b/jdk/src/java.desktop/share/classes/javax/swing/AbstractButton.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/AbstractButton.java
rename to jdk/src/java.desktop/share/classes/javax/swing/AbstractButton.java
diff --git a/jdk/src/share/classes/javax/swing/AbstractCellEditor.java b/jdk/src/java.desktop/share/classes/javax/swing/AbstractCellEditor.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/AbstractCellEditor.java
rename to jdk/src/java.desktop/share/classes/javax/swing/AbstractCellEditor.java
diff --git a/jdk/src/share/classes/javax/swing/AbstractListModel.java b/jdk/src/java.desktop/share/classes/javax/swing/AbstractListModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/AbstractListModel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/AbstractListModel.java
diff --git a/jdk/src/share/classes/javax/swing/AbstractSpinnerModel.java b/jdk/src/java.desktop/share/classes/javax/swing/AbstractSpinnerModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/AbstractSpinnerModel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/AbstractSpinnerModel.java
diff --git a/jdk/src/share/classes/javax/swing/Action.java b/jdk/src/java.desktop/share/classes/javax/swing/Action.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/Action.java
rename to jdk/src/java.desktop/share/classes/javax/swing/Action.java
diff --git a/jdk/src/share/classes/javax/swing/ActionMap.java b/jdk/src/java.desktop/share/classes/javax/swing/ActionMap.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/ActionMap.java
rename to jdk/src/java.desktop/share/classes/javax/swing/ActionMap.java
diff --git a/jdk/src/share/classes/javax/swing/ActionPropertyChangeListener.java b/jdk/src/java.desktop/share/classes/javax/swing/ActionPropertyChangeListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/ActionPropertyChangeListener.java
rename to jdk/src/java.desktop/share/classes/javax/swing/ActionPropertyChangeListener.java
diff --git a/jdk/src/share/classes/javax/swing/AncestorNotifier.java b/jdk/src/java.desktop/share/classes/javax/swing/AncestorNotifier.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/AncestorNotifier.java
rename to jdk/src/java.desktop/share/classes/javax/swing/AncestorNotifier.java
diff --git a/jdk/src/share/classes/javax/swing/ArrayTable.java b/jdk/src/java.desktop/share/classes/javax/swing/ArrayTable.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/ArrayTable.java
rename to jdk/src/java.desktop/share/classes/javax/swing/ArrayTable.java
diff --git a/jdk/src/share/classes/javax/swing/Autoscroller.java b/jdk/src/java.desktop/share/classes/javax/swing/Autoscroller.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/Autoscroller.java
rename to jdk/src/java.desktop/share/classes/javax/swing/Autoscroller.java
diff --git a/jdk/src/share/classes/javax/swing/BorderFactory.java b/jdk/src/java.desktop/share/classes/javax/swing/BorderFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/BorderFactory.java
rename to jdk/src/java.desktop/share/classes/javax/swing/BorderFactory.java
diff --git a/jdk/src/share/classes/javax/swing/BoundedRangeModel.java b/jdk/src/java.desktop/share/classes/javax/swing/BoundedRangeModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/BoundedRangeModel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/BoundedRangeModel.java
diff --git a/jdk/src/share/classes/javax/swing/Box.java b/jdk/src/java.desktop/share/classes/javax/swing/Box.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/Box.java
rename to jdk/src/java.desktop/share/classes/javax/swing/Box.java
diff --git a/jdk/src/share/classes/javax/swing/BoxLayout.java b/jdk/src/java.desktop/share/classes/javax/swing/BoxLayout.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/BoxLayout.java
rename to jdk/src/java.desktop/share/classes/javax/swing/BoxLayout.java
diff --git a/jdk/src/share/classes/javax/swing/BufferStrategyPaintManager.java b/jdk/src/java.desktop/share/classes/javax/swing/BufferStrategyPaintManager.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/BufferStrategyPaintManager.java
rename to jdk/src/java.desktop/share/classes/javax/swing/BufferStrategyPaintManager.java
diff --git a/jdk/src/share/classes/javax/swing/ButtonGroup.java b/jdk/src/java.desktop/share/classes/javax/swing/ButtonGroup.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/ButtonGroup.java
rename to jdk/src/java.desktop/share/classes/javax/swing/ButtonGroup.java
diff --git a/jdk/src/share/classes/javax/swing/ButtonModel.java b/jdk/src/java.desktop/share/classes/javax/swing/ButtonModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/ButtonModel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/ButtonModel.java
diff --git a/jdk/src/share/classes/javax/swing/CellEditor.java b/jdk/src/java.desktop/share/classes/javax/swing/CellEditor.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/CellEditor.java
rename to jdk/src/java.desktop/share/classes/javax/swing/CellEditor.java
diff --git a/jdk/src/share/classes/javax/swing/CellRendererPane.java b/jdk/src/java.desktop/share/classes/javax/swing/CellRendererPane.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/CellRendererPane.java
rename to jdk/src/java.desktop/share/classes/javax/swing/CellRendererPane.java
diff --git a/jdk/src/share/classes/javax/swing/ClientPropertyKey.java b/jdk/src/java.desktop/share/classes/javax/swing/ClientPropertyKey.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/ClientPropertyKey.java
rename to jdk/src/java.desktop/share/classes/javax/swing/ClientPropertyKey.java
diff --git a/jdk/src/share/classes/javax/swing/ComboBoxEditor.java b/jdk/src/java.desktop/share/classes/javax/swing/ComboBoxEditor.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/ComboBoxEditor.java
rename to jdk/src/java.desktop/share/classes/javax/swing/ComboBoxEditor.java
diff --git a/jdk/src/share/classes/javax/swing/ComboBoxModel.java b/jdk/src/java.desktop/share/classes/javax/swing/ComboBoxModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/ComboBoxModel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/ComboBoxModel.java
diff --git a/jdk/src/share/classes/javax/swing/ComponentInputMap.java b/jdk/src/java.desktop/share/classes/javax/swing/ComponentInputMap.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/ComponentInputMap.java
rename to jdk/src/java.desktop/share/classes/javax/swing/ComponentInputMap.java
diff --git a/jdk/src/share/classes/javax/swing/DebugGraphics.java b/jdk/src/java.desktop/share/classes/javax/swing/DebugGraphics.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/DebugGraphics.java
rename to jdk/src/java.desktop/share/classes/javax/swing/DebugGraphics.java
diff --git a/jdk/src/share/classes/javax/swing/DebugGraphicsFilter.java b/jdk/src/java.desktop/share/classes/javax/swing/DebugGraphicsFilter.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/DebugGraphicsFilter.java
rename to jdk/src/java.desktop/share/classes/javax/swing/DebugGraphicsFilter.java
diff --git a/jdk/src/share/classes/javax/swing/DebugGraphicsInfo.java b/jdk/src/java.desktop/share/classes/javax/swing/DebugGraphicsInfo.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/DebugGraphicsInfo.java
rename to jdk/src/java.desktop/share/classes/javax/swing/DebugGraphicsInfo.java
diff --git a/jdk/src/share/classes/javax/swing/DebugGraphicsObserver.java b/jdk/src/java.desktop/share/classes/javax/swing/DebugGraphicsObserver.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/DebugGraphicsObserver.java
rename to jdk/src/java.desktop/share/classes/javax/swing/DebugGraphicsObserver.java
diff --git a/jdk/src/share/classes/javax/swing/DefaultBoundedRangeModel.java b/jdk/src/java.desktop/share/classes/javax/swing/DefaultBoundedRangeModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/DefaultBoundedRangeModel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/DefaultBoundedRangeModel.java
diff --git a/jdk/src/share/classes/javax/swing/DefaultButtonModel.java b/jdk/src/java.desktop/share/classes/javax/swing/DefaultButtonModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/DefaultButtonModel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/DefaultButtonModel.java
diff --git a/jdk/src/share/classes/javax/swing/DefaultCellEditor.java b/jdk/src/java.desktop/share/classes/javax/swing/DefaultCellEditor.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/DefaultCellEditor.java
rename to jdk/src/java.desktop/share/classes/javax/swing/DefaultCellEditor.java
diff --git a/jdk/src/share/classes/javax/swing/DefaultComboBoxModel.java b/jdk/src/java.desktop/share/classes/javax/swing/DefaultComboBoxModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/DefaultComboBoxModel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/DefaultComboBoxModel.java
diff --git a/jdk/src/share/classes/javax/swing/DefaultDesktopManager.java b/jdk/src/java.desktop/share/classes/javax/swing/DefaultDesktopManager.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/DefaultDesktopManager.java
rename to jdk/src/java.desktop/share/classes/javax/swing/DefaultDesktopManager.java
diff --git a/jdk/src/share/classes/javax/swing/DefaultFocusManager.java b/jdk/src/java.desktop/share/classes/javax/swing/DefaultFocusManager.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/DefaultFocusManager.java
rename to jdk/src/java.desktop/share/classes/javax/swing/DefaultFocusManager.java
diff --git a/jdk/src/share/classes/javax/swing/DefaultListCellRenderer.java b/jdk/src/java.desktop/share/classes/javax/swing/DefaultListCellRenderer.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/DefaultListCellRenderer.java
rename to jdk/src/java.desktop/share/classes/javax/swing/DefaultListCellRenderer.java
diff --git a/jdk/src/share/classes/javax/swing/DefaultListModel.java b/jdk/src/java.desktop/share/classes/javax/swing/DefaultListModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/DefaultListModel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/DefaultListModel.java
diff --git a/jdk/src/share/classes/javax/swing/DefaultListSelectionModel.java b/jdk/src/java.desktop/share/classes/javax/swing/DefaultListSelectionModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/DefaultListSelectionModel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/DefaultListSelectionModel.java
diff --git a/jdk/src/share/classes/javax/swing/DefaultRowSorter.java b/jdk/src/java.desktop/share/classes/javax/swing/DefaultRowSorter.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/DefaultRowSorter.java
rename to jdk/src/java.desktop/share/classes/javax/swing/DefaultRowSorter.java
diff --git a/jdk/src/share/classes/javax/swing/DefaultSingleSelectionModel.java b/jdk/src/java.desktop/share/classes/javax/swing/DefaultSingleSelectionModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/DefaultSingleSelectionModel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/DefaultSingleSelectionModel.java
diff --git a/jdk/src/share/classes/javax/swing/DelegatingDefaultFocusManager.java b/jdk/src/java.desktop/share/classes/javax/swing/DelegatingDefaultFocusManager.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/DelegatingDefaultFocusManager.java
rename to jdk/src/java.desktop/share/classes/javax/swing/DelegatingDefaultFocusManager.java
diff --git a/jdk/src/share/classes/javax/swing/DesktopManager.java b/jdk/src/java.desktop/share/classes/javax/swing/DesktopManager.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/DesktopManager.java
rename to jdk/src/java.desktop/share/classes/javax/swing/DesktopManager.java
diff --git a/jdk/src/share/classes/javax/swing/DropMode.java b/jdk/src/java.desktop/share/classes/javax/swing/DropMode.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/DropMode.java
rename to jdk/src/java.desktop/share/classes/javax/swing/DropMode.java
diff --git a/jdk/src/share/classes/javax/swing/FocusManager.java b/jdk/src/java.desktop/share/classes/javax/swing/FocusManager.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/FocusManager.java
rename to jdk/src/java.desktop/share/classes/javax/swing/FocusManager.java
diff --git a/jdk/src/share/classes/javax/swing/GraphicsWrapper.java b/jdk/src/java.desktop/share/classes/javax/swing/GraphicsWrapper.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/GraphicsWrapper.java
rename to jdk/src/java.desktop/share/classes/javax/swing/GraphicsWrapper.java
diff --git a/jdk/src/share/classes/javax/swing/GrayFilter.java b/jdk/src/java.desktop/share/classes/javax/swing/GrayFilter.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/GrayFilter.java
rename to jdk/src/java.desktop/share/classes/javax/swing/GrayFilter.java
diff --git a/jdk/src/share/classes/javax/swing/GroupLayout.java b/jdk/src/java.desktop/share/classes/javax/swing/GroupLayout.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/GroupLayout.java
rename to jdk/src/java.desktop/share/classes/javax/swing/GroupLayout.java
diff --git a/jdk/src/share/classes/javax/swing/Icon.java b/jdk/src/java.desktop/share/classes/javax/swing/Icon.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/Icon.java
rename to jdk/src/java.desktop/share/classes/javax/swing/Icon.java
diff --git a/jdk/src/share/classes/javax/swing/ImageIcon.java b/jdk/src/java.desktop/share/classes/javax/swing/ImageIcon.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/ImageIcon.java
rename to jdk/src/java.desktop/share/classes/javax/swing/ImageIcon.java
diff --git a/jdk/src/share/classes/javax/swing/InputMap.java b/jdk/src/java.desktop/share/classes/javax/swing/InputMap.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/InputMap.java
rename to jdk/src/java.desktop/share/classes/javax/swing/InputMap.java
diff --git a/jdk/src/share/classes/javax/swing/InputVerifier.java b/jdk/src/java.desktop/share/classes/javax/swing/InputVerifier.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/InputVerifier.java
rename to jdk/src/java.desktop/share/classes/javax/swing/InputVerifier.java
diff --git a/jdk/src/share/classes/javax/swing/InternalFrameFocusTraversalPolicy.java b/jdk/src/java.desktop/share/classes/javax/swing/InternalFrameFocusTraversalPolicy.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/InternalFrameFocusTraversalPolicy.java
rename to jdk/src/java.desktop/share/classes/javax/swing/InternalFrameFocusTraversalPolicy.java
diff --git a/jdk/src/share/classes/javax/swing/JApplet.java b/jdk/src/java.desktop/share/classes/javax/swing/JApplet.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JApplet.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JApplet.java
diff --git a/jdk/src/share/classes/javax/swing/JButton.java b/jdk/src/java.desktop/share/classes/javax/swing/JButton.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JButton.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JButton.java
diff --git a/jdk/src/share/classes/javax/swing/JCheckBox.java b/jdk/src/java.desktop/share/classes/javax/swing/JCheckBox.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JCheckBox.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JCheckBox.java
diff --git a/jdk/src/share/classes/javax/swing/JCheckBoxMenuItem.java b/jdk/src/java.desktop/share/classes/javax/swing/JCheckBoxMenuItem.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JCheckBoxMenuItem.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JCheckBoxMenuItem.java
diff --git a/jdk/src/share/classes/javax/swing/JColorChooser.java b/jdk/src/java.desktop/share/classes/javax/swing/JColorChooser.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JColorChooser.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JColorChooser.java
diff --git a/jdk/src/share/classes/javax/swing/JComboBox.java b/jdk/src/java.desktop/share/classes/javax/swing/JComboBox.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JComboBox.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JComboBox.java
diff --git a/jdk/src/share/classes/javax/swing/JComponent.java b/jdk/src/java.desktop/share/classes/javax/swing/JComponent.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JComponent.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JComponent.java
diff --git a/jdk/src/share/classes/javax/swing/JDesktopPane.java b/jdk/src/java.desktop/share/classes/javax/swing/JDesktopPane.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JDesktopPane.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JDesktopPane.java
diff --git a/jdk/src/share/classes/javax/swing/JDialog.java b/jdk/src/java.desktop/share/classes/javax/swing/JDialog.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JDialog.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JDialog.java
diff --git a/jdk/src/share/classes/javax/swing/JEditorPane.java b/jdk/src/java.desktop/share/classes/javax/swing/JEditorPane.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JEditorPane.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JEditorPane.java
diff --git a/jdk/src/share/classes/javax/swing/JFileChooser.java b/jdk/src/java.desktop/share/classes/javax/swing/JFileChooser.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JFileChooser.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JFileChooser.java
diff --git a/jdk/src/share/classes/javax/swing/JFormattedTextField.java b/jdk/src/java.desktop/share/classes/javax/swing/JFormattedTextField.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JFormattedTextField.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JFormattedTextField.java
diff --git a/jdk/src/share/classes/javax/swing/JFrame.java b/jdk/src/java.desktop/share/classes/javax/swing/JFrame.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JFrame.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JFrame.java
diff --git a/jdk/src/share/classes/javax/swing/JInternalFrame.java b/jdk/src/java.desktop/share/classes/javax/swing/JInternalFrame.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JInternalFrame.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JInternalFrame.java
diff --git a/jdk/src/share/classes/javax/swing/JLabel.java b/jdk/src/java.desktop/share/classes/javax/swing/JLabel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JLabel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JLabel.java
diff --git a/jdk/src/share/classes/javax/swing/JLayer.java b/jdk/src/java.desktop/share/classes/javax/swing/JLayer.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JLayer.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JLayer.java
diff --git a/jdk/src/share/classes/javax/swing/JLayeredPane.java b/jdk/src/java.desktop/share/classes/javax/swing/JLayeredPane.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JLayeredPane.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JLayeredPane.java
diff --git a/jdk/src/share/classes/javax/swing/JList.java b/jdk/src/java.desktop/share/classes/javax/swing/JList.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JList.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JList.java
diff --git a/jdk/src/share/classes/javax/swing/JMenu.java b/jdk/src/java.desktop/share/classes/javax/swing/JMenu.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JMenu.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JMenu.java
diff --git a/jdk/src/share/classes/javax/swing/JMenuBar.java b/jdk/src/java.desktop/share/classes/javax/swing/JMenuBar.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JMenuBar.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JMenuBar.java
diff --git a/jdk/src/share/classes/javax/swing/JMenuItem.java b/jdk/src/java.desktop/share/classes/javax/swing/JMenuItem.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JMenuItem.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JMenuItem.java
diff --git a/jdk/src/share/classes/javax/swing/JOptionPane.java b/jdk/src/java.desktop/share/classes/javax/swing/JOptionPane.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JOptionPane.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JOptionPane.java
diff --git a/jdk/src/share/classes/javax/swing/JPanel.java b/jdk/src/java.desktop/share/classes/javax/swing/JPanel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JPanel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JPanel.java
diff --git a/jdk/src/share/classes/javax/swing/JPasswordField.java b/jdk/src/java.desktop/share/classes/javax/swing/JPasswordField.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JPasswordField.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JPasswordField.java
diff --git a/jdk/src/share/classes/javax/swing/JPopupMenu.java b/jdk/src/java.desktop/share/classes/javax/swing/JPopupMenu.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JPopupMenu.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JPopupMenu.java
diff --git a/jdk/src/share/classes/javax/swing/JProgressBar.java b/jdk/src/java.desktop/share/classes/javax/swing/JProgressBar.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JProgressBar.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JProgressBar.java
diff --git a/jdk/src/share/classes/javax/swing/JRadioButton.java b/jdk/src/java.desktop/share/classes/javax/swing/JRadioButton.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JRadioButton.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JRadioButton.java
diff --git a/jdk/src/share/classes/javax/swing/JRadioButtonMenuItem.java b/jdk/src/java.desktop/share/classes/javax/swing/JRadioButtonMenuItem.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JRadioButtonMenuItem.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JRadioButtonMenuItem.java
diff --git a/jdk/src/share/classes/javax/swing/JRootPane.java b/jdk/src/java.desktop/share/classes/javax/swing/JRootPane.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JRootPane.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JRootPane.java
diff --git a/jdk/src/share/classes/javax/swing/JScrollBar.java b/jdk/src/java.desktop/share/classes/javax/swing/JScrollBar.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JScrollBar.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JScrollBar.java
diff --git a/jdk/src/share/classes/javax/swing/JScrollPane.java b/jdk/src/java.desktop/share/classes/javax/swing/JScrollPane.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JScrollPane.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JScrollPane.java
diff --git a/jdk/src/share/classes/javax/swing/JSeparator.java b/jdk/src/java.desktop/share/classes/javax/swing/JSeparator.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JSeparator.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JSeparator.java
diff --git a/jdk/src/share/classes/javax/swing/JSlider.java b/jdk/src/java.desktop/share/classes/javax/swing/JSlider.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JSlider.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JSlider.java
diff --git a/jdk/src/share/classes/javax/swing/JSpinner.java b/jdk/src/java.desktop/share/classes/javax/swing/JSpinner.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JSpinner.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JSpinner.java
diff --git a/jdk/src/share/classes/javax/swing/JSplitPane.java b/jdk/src/java.desktop/share/classes/javax/swing/JSplitPane.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JSplitPane.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JSplitPane.java
diff --git a/jdk/src/share/classes/javax/swing/JTabbedPane.java b/jdk/src/java.desktop/share/classes/javax/swing/JTabbedPane.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JTabbedPane.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JTabbedPane.java
diff --git a/jdk/src/share/classes/javax/swing/JTable.java b/jdk/src/java.desktop/share/classes/javax/swing/JTable.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JTable.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JTable.java
diff --git a/jdk/src/share/classes/javax/swing/JTextArea.java b/jdk/src/java.desktop/share/classes/javax/swing/JTextArea.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JTextArea.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JTextArea.java
diff --git a/jdk/src/share/classes/javax/swing/JTextField.java b/jdk/src/java.desktop/share/classes/javax/swing/JTextField.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JTextField.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JTextField.java
diff --git a/jdk/src/share/classes/javax/swing/JTextPane.java b/jdk/src/java.desktop/share/classes/javax/swing/JTextPane.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JTextPane.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JTextPane.java
diff --git a/jdk/src/share/classes/javax/swing/JToggleButton.java b/jdk/src/java.desktop/share/classes/javax/swing/JToggleButton.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JToggleButton.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JToggleButton.java
diff --git a/jdk/src/share/classes/javax/swing/JToolBar.java b/jdk/src/java.desktop/share/classes/javax/swing/JToolBar.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JToolBar.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JToolBar.java
diff --git a/jdk/src/share/classes/javax/swing/JToolTip.java b/jdk/src/java.desktop/share/classes/javax/swing/JToolTip.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JToolTip.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JToolTip.java
diff --git a/jdk/src/share/classes/javax/swing/JTree.java b/jdk/src/java.desktop/share/classes/javax/swing/JTree.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JTree.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JTree.java
diff --git a/jdk/src/share/classes/javax/swing/JViewport.java b/jdk/src/java.desktop/share/classes/javax/swing/JViewport.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JViewport.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JViewport.java
diff --git a/jdk/src/share/classes/javax/swing/JWindow.java b/jdk/src/java.desktop/share/classes/javax/swing/JWindow.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/JWindow.java
rename to jdk/src/java.desktop/share/classes/javax/swing/JWindow.java
diff --git a/jdk/src/share/classes/javax/swing/KeyStroke.java b/jdk/src/java.desktop/share/classes/javax/swing/KeyStroke.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/KeyStroke.java
rename to jdk/src/java.desktop/share/classes/javax/swing/KeyStroke.java
diff --git a/jdk/src/share/classes/javax/swing/KeyboardManager.java b/jdk/src/java.desktop/share/classes/javax/swing/KeyboardManager.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/KeyboardManager.java
rename to jdk/src/java.desktop/share/classes/javax/swing/KeyboardManager.java
diff --git a/jdk/src/share/classes/javax/swing/LayoutComparator.java b/jdk/src/java.desktop/share/classes/javax/swing/LayoutComparator.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/LayoutComparator.java
rename to jdk/src/java.desktop/share/classes/javax/swing/LayoutComparator.java
diff --git a/jdk/src/share/classes/javax/swing/LayoutFocusTraversalPolicy.java b/jdk/src/java.desktop/share/classes/javax/swing/LayoutFocusTraversalPolicy.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/LayoutFocusTraversalPolicy.java
rename to jdk/src/java.desktop/share/classes/javax/swing/LayoutFocusTraversalPolicy.java
diff --git a/jdk/src/share/classes/javax/swing/LayoutStyle.java b/jdk/src/java.desktop/share/classes/javax/swing/LayoutStyle.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/LayoutStyle.java
rename to jdk/src/java.desktop/share/classes/javax/swing/LayoutStyle.java
diff --git a/jdk/src/share/classes/javax/swing/LegacyGlueFocusTraversalPolicy.java b/jdk/src/java.desktop/share/classes/javax/swing/LegacyGlueFocusTraversalPolicy.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/LegacyGlueFocusTraversalPolicy.java
rename to jdk/src/java.desktop/share/classes/javax/swing/LegacyGlueFocusTraversalPolicy.java
diff --git a/jdk/src/share/classes/javax/swing/ListCellRenderer.java b/jdk/src/java.desktop/share/classes/javax/swing/ListCellRenderer.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/ListCellRenderer.java
rename to jdk/src/java.desktop/share/classes/javax/swing/ListCellRenderer.java
diff --git a/jdk/src/share/classes/javax/swing/ListModel.java b/jdk/src/java.desktop/share/classes/javax/swing/ListModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/ListModel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/ListModel.java
diff --git a/jdk/src/share/classes/javax/swing/ListSelectionModel.java b/jdk/src/java.desktop/share/classes/javax/swing/ListSelectionModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/ListSelectionModel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/ListSelectionModel.java
diff --git a/jdk/src/share/classes/javax/swing/LookAndFeel.java b/jdk/src/java.desktop/share/classes/javax/swing/LookAndFeel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/LookAndFeel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/LookAndFeel.java
diff --git a/jdk/src/share/classes/javax/swing/MenuElement.java b/jdk/src/java.desktop/share/classes/javax/swing/MenuElement.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/MenuElement.java
rename to jdk/src/java.desktop/share/classes/javax/swing/MenuElement.java
diff --git a/jdk/src/share/classes/javax/swing/MenuSelectionManager.java b/jdk/src/java.desktop/share/classes/javax/swing/MenuSelectionManager.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/MenuSelectionManager.java
rename to jdk/src/java.desktop/share/classes/javax/swing/MenuSelectionManager.java
diff --git a/jdk/src/share/classes/javax/swing/MultiUIDefaults.java b/jdk/src/java.desktop/share/classes/javax/swing/MultiUIDefaults.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/MultiUIDefaults.java
rename to jdk/src/java.desktop/share/classes/javax/swing/MultiUIDefaults.java
diff --git a/jdk/src/share/classes/javax/swing/MutableComboBoxModel.java b/jdk/src/java.desktop/share/classes/javax/swing/MutableComboBoxModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/MutableComboBoxModel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/MutableComboBoxModel.java
diff --git a/jdk/src/share/classes/javax/swing/OverlayLayout.java b/jdk/src/java.desktop/share/classes/javax/swing/OverlayLayout.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/OverlayLayout.java
rename to jdk/src/java.desktop/share/classes/javax/swing/OverlayLayout.java
diff --git a/jdk/src/share/classes/javax/swing/Painter.java b/jdk/src/java.desktop/share/classes/javax/swing/Painter.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/Painter.java
rename to jdk/src/java.desktop/share/classes/javax/swing/Painter.java
diff --git a/jdk/src/share/classes/javax/swing/Popup.java b/jdk/src/java.desktop/share/classes/javax/swing/Popup.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/Popup.java
rename to jdk/src/java.desktop/share/classes/javax/swing/Popup.java
diff --git a/jdk/src/share/classes/javax/swing/PopupFactory.java b/jdk/src/java.desktop/share/classes/javax/swing/PopupFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/PopupFactory.java
rename to jdk/src/java.desktop/share/classes/javax/swing/PopupFactory.java
diff --git a/jdk/src/share/classes/javax/swing/ProgressMonitor.java b/jdk/src/java.desktop/share/classes/javax/swing/ProgressMonitor.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/ProgressMonitor.java
rename to jdk/src/java.desktop/share/classes/javax/swing/ProgressMonitor.java
diff --git a/jdk/src/share/classes/javax/swing/ProgressMonitorInputStream.java b/jdk/src/java.desktop/share/classes/javax/swing/ProgressMonitorInputStream.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/ProgressMonitorInputStream.java
rename to jdk/src/java.desktop/share/classes/javax/swing/ProgressMonitorInputStream.java
diff --git a/jdk/src/share/classes/javax/swing/Renderer.java b/jdk/src/java.desktop/share/classes/javax/swing/Renderer.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/Renderer.java
rename to jdk/src/java.desktop/share/classes/javax/swing/Renderer.java
diff --git a/jdk/src/share/classes/javax/swing/RepaintManager.java b/jdk/src/java.desktop/share/classes/javax/swing/RepaintManager.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/RepaintManager.java
rename to jdk/src/java.desktop/share/classes/javax/swing/RepaintManager.java
diff --git a/jdk/src/share/classes/javax/swing/RootPaneContainer.java b/jdk/src/java.desktop/share/classes/javax/swing/RootPaneContainer.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/RootPaneContainer.java
rename to jdk/src/java.desktop/share/classes/javax/swing/RootPaneContainer.java
diff --git a/jdk/src/share/classes/javax/swing/RowFilter.java b/jdk/src/java.desktop/share/classes/javax/swing/RowFilter.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/RowFilter.java
rename to jdk/src/java.desktop/share/classes/javax/swing/RowFilter.java
diff --git a/jdk/src/share/classes/javax/swing/RowSorter.java b/jdk/src/java.desktop/share/classes/javax/swing/RowSorter.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/RowSorter.java
rename to jdk/src/java.desktop/share/classes/javax/swing/RowSorter.java
diff --git a/jdk/src/share/classes/javax/swing/ScrollPaneConstants.java b/jdk/src/java.desktop/share/classes/javax/swing/ScrollPaneConstants.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/ScrollPaneConstants.java
rename to jdk/src/java.desktop/share/classes/javax/swing/ScrollPaneConstants.java
diff --git a/jdk/src/share/classes/javax/swing/ScrollPaneLayout.java b/jdk/src/java.desktop/share/classes/javax/swing/ScrollPaneLayout.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/ScrollPaneLayout.java
rename to jdk/src/java.desktop/share/classes/javax/swing/ScrollPaneLayout.java
diff --git a/jdk/src/share/classes/javax/swing/Scrollable.java b/jdk/src/java.desktop/share/classes/javax/swing/Scrollable.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/Scrollable.java
rename to jdk/src/java.desktop/share/classes/javax/swing/Scrollable.java
diff --git a/jdk/src/share/classes/javax/swing/SingleSelectionModel.java b/jdk/src/java.desktop/share/classes/javax/swing/SingleSelectionModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/SingleSelectionModel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/SingleSelectionModel.java
diff --git a/jdk/src/share/classes/javax/swing/SizeRequirements.java b/jdk/src/java.desktop/share/classes/javax/swing/SizeRequirements.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/SizeRequirements.java
rename to jdk/src/java.desktop/share/classes/javax/swing/SizeRequirements.java
diff --git a/jdk/src/share/classes/javax/swing/SizeSequence.java b/jdk/src/java.desktop/share/classes/javax/swing/SizeSequence.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/SizeSequence.java
rename to jdk/src/java.desktop/share/classes/javax/swing/SizeSequence.java
diff --git a/jdk/src/share/classes/javax/swing/SortOrder.java b/jdk/src/java.desktop/share/classes/javax/swing/SortOrder.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/SortOrder.java
rename to jdk/src/java.desktop/share/classes/javax/swing/SortOrder.java
diff --git a/jdk/src/share/classes/javax/swing/SortingFocusTraversalPolicy.java b/jdk/src/java.desktop/share/classes/javax/swing/SortingFocusTraversalPolicy.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/SortingFocusTraversalPolicy.java
rename to jdk/src/java.desktop/share/classes/javax/swing/SortingFocusTraversalPolicy.java
diff --git a/jdk/src/share/classes/javax/swing/SpinnerDateModel.java b/jdk/src/java.desktop/share/classes/javax/swing/SpinnerDateModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/SpinnerDateModel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/SpinnerDateModel.java
diff --git a/jdk/src/share/classes/javax/swing/SpinnerListModel.java b/jdk/src/java.desktop/share/classes/javax/swing/SpinnerListModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/SpinnerListModel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/SpinnerListModel.java
diff --git a/jdk/src/share/classes/javax/swing/SpinnerModel.java b/jdk/src/java.desktop/share/classes/javax/swing/SpinnerModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/SpinnerModel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/SpinnerModel.java
diff --git a/jdk/src/share/classes/javax/swing/SpinnerNumberModel.java b/jdk/src/java.desktop/share/classes/javax/swing/SpinnerNumberModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/SpinnerNumberModel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/SpinnerNumberModel.java
diff --git a/jdk/src/share/classes/javax/swing/Spring.java b/jdk/src/java.desktop/share/classes/javax/swing/Spring.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/Spring.java
rename to jdk/src/java.desktop/share/classes/javax/swing/Spring.java
diff --git a/jdk/src/share/classes/javax/swing/SpringLayout.java b/jdk/src/java.desktop/share/classes/javax/swing/SpringLayout.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/SpringLayout.java
rename to jdk/src/java.desktop/share/classes/javax/swing/SpringLayout.java
diff --git a/jdk/src/share/classes/javax/swing/SwingConstants.java b/jdk/src/java.desktop/share/classes/javax/swing/SwingConstants.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/SwingConstants.java
rename to jdk/src/java.desktop/share/classes/javax/swing/SwingConstants.java
diff --git a/jdk/src/share/classes/javax/swing/SwingContainer.java b/jdk/src/java.desktop/share/classes/javax/swing/SwingContainer.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/SwingContainer.java
rename to jdk/src/java.desktop/share/classes/javax/swing/SwingContainer.java
diff --git a/jdk/src/share/classes/javax/swing/SwingHeavyWeight.java b/jdk/src/java.desktop/share/classes/javax/swing/SwingHeavyWeight.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/SwingHeavyWeight.java
rename to jdk/src/java.desktop/share/classes/javax/swing/SwingHeavyWeight.java
diff --git a/jdk/src/share/classes/javax/swing/SwingPaintEventDispatcher.java b/jdk/src/java.desktop/share/classes/javax/swing/SwingPaintEventDispatcher.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/SwingPaintEventDispatcher.java
rename to jdk/src/java.desktop/share/classes/javax/swing/SwingPaintEventDispatcher.java
diff --git a/jdk/src/share/classes/javax/swing/SwingUtilities.java b/jdk/src/java.desktop/share/classes/javax/swing/SwingUtilities.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/SwingUtilities.java
rename to jdk/src/java.desktop/share/classes/javax/swing/SwingUtilities.java
diff --git a/jdk/src/share/classes/javax/swing/SwingWorker.java b/jdk/src/java.desktop/share/classes/javax/swing/SwingWorker.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/SwingWorker.java
rename to jdk/src/java.desktop/share/classes/javax/swing/SwingWorker.java
diff --git a/jdk/src/share/classes/javax/swing/TablePrintable.java b/jdk/src/java.desktop/share/classes/javax/swing/TablePrintable.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/TablePrintable.java
rename to jdk/src/java.desktop/share/classes/javax/swing/TablePrintable.java
diff --git a/jdk/src/share/classes/javax/swing/Timer.java b/jdk/src/java.desktop/share/classes/javax/swing/Timer.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/Timer.java
rename to jdk/src/java.desktop/share/classes/javax/swing/Timer.java
diff --git a/jdk/src/share/classes/javax/swing/TimerQueue.java b/jdk/src/java.desktop/share/classes/javax/swing/TimerQueue.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/TimerQueue.java
rename to jdk/src/java.desktop/share/classes/javax/swing/TimerQueue.java
diff --git a/jdk/src/share/classes/javax/swing/ToolTipManager.java b/jdk/src/java.desktop/share/classes/javax/swing/ToolTipManager.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/ToolTipManager.java
rename to jdk/src/java.desktop/share/classes/javax/swing/ToolTipManager.java
diff --git a/jdk/src/share/classes/javax/swing/TransferHandler.java b/jdk/src/java.desktop/share/classes/javax/swing/TransferHandler.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/TransferHandler.java
rename to jdk/src/java.desktop/share/classes/javax/swing/TransferHandler.java
diff --git a/jdk/src/share/classes/javax/swing/UIDefaults.java b/jdk/src/java.desktop/share/classes/javax/swing/UIDefaults.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/UIDefaults.java
rename to jdk/src/java.desktop/share/classes/javax/swing/UIDefaults.java
diff --git a/jdk/src/share/classes/javax/swing/UIManager.java b/jdk/src/java.desktop/share/classes/javax/swing/UIManager.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/UIManager.java
rename to jdk/src/java.desktop/share/classes/javax/swing/UIManager.java
diff --git a/jdk/src/share/classes/javax/swing/UnsupportedLookAndFeelException.java b/jdk/src/java.desktop/share/classes/javax/swing/UnsupportedLookAndFeelException.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/UnsupportedLookAndFeelException.java
rename to jdk/src/java.desktop/share/classes/javax/swing/UnsupportedLookAndFeelException.java
diff --git a/jdk/src/share/classes/javax/swing/ViewportLayout.java b/jdk/src/java.desktop/share/classes/javax/swing/ViewportLayout.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/ViewportLayout.java
rename to jdk/src/java.desktop/share/classes/javax/swing/ViewportLayout.java
diff --git a/jdk/src/share/classes/javax/swing/WindowConstants.java b/jdk/src/java.desktop/share/classes/javax/swing/WindowConstants.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/WindowConstants.java
rename to jdk/src/java.desktop/share/classes/javax/swing/WindowConstants.java
diff --git a/jdk/src/share/classes/javax/swing/border/AbstractBorder.java b/jdk/src/java.desktop/share/classes/javax/swing/border/AbstractBorder.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/border/AbstractBorder.java
rename to jdk/src/java.desktop/share/classes/javax/swing/border/AbstractBorder.java
diff --git a/jdk/src/share/classes/javax/swing/border/BevelBorder.java b/jdk/src/java.desktop/share/classes/javax/swing/border/BevelBorder.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/border/BevelBorder.java
rename to jdk/src/java.desktop/share/classes/javax/swing/border/BevelBorder.java
diff --git a/jdk/src/share/classes/javax/swing/border/Border.java b/jdk/src/java.desktop/share/classes/javax/swing/border/Border.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/border/Border.java
rename to jdk/src/java.desktop/share/classes/javax/swing/border/Border.java
diff --git a/jdk/src/share/classes/javax/swing/border/CompoundBorder.java b/jdk/src/java.desktop/share/classes/javax/swing/border/CompoundBorder.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/border/CompoundBorder.java
rename to jdk/src/java.desktop/share/classes/javax/swing/border/CompoundBorder.java
diff --git a/jdk/src/share/classes/javax/swing/border/EmptyBorder.java b/jdk/src/java.desktop/share/classes/javax/swing/border/EmptyBorder.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/border/EmptyBorder.java
rename to jdk/src/java.desktop/share/classes/javax/swing/border/EmptyBorder.java
diff --git a/jdk/src/share/classes/javax/swing/border/EtchedBorder.java b/jdk/src/java.desktop/share/classes/javax/swing/border/EtchedBorder.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/border/EtchedBorder.java
rename to jdk/src/java.desktop/share/classes/javax/swing/border/EtchedBorder.java
diff --git a/jdk/src/share/classes/javax/swing/border/LineBorder.java b/jdk/src/java.desktop/share/classes/javax/swing/border/LineBorder.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/border/LineBorder.java
rename to jdk/src/java.desktop/share/classes/javax/swing/border/LineBorder.java
diff --git a/jdk/src/share/classes/javax/swing/border/MatteBorder.java b/jdk/src/java.desktop/share/classes/javax/swing/border/MatteBorder.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/border/MatteBorder.java
rename to jdk/src/java.desktop/share/classes/javax/swing/border/MatteBorder.java
diff --git a/jdk/src/share/classes/javax/swing/border/SoftBevelBorder.java b/jdk/src/java.desktop/share/classes/javax/swing/border/SoftBevelBorder.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/border/SoftBevelBorder.java
rename to jdk/src/java.desktop/share/classes/javax/swing/border/SoftBevelBorder.java
diff --git a/jdk/src/share/classes/javax/swing/border/StrokeBorder.java b/jdk/src/java.desktop/share/classes/javax/swing/border/StrokeBorder.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/border/StrokeBorder.java
rename to jdk/src/java.desktop/share/classes/javax/swing/border/StrokeBorder.java
diff --git a/jdk/src/share/classes/javax/swing/border/TitledBorder.java b/jdk/src/java.desktop/share/classes/javax/swing/border/TitledBorder.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/border/TitledBorder.java
rename to jdk/src/java.desktop/share/classes/javax/swing/border/TitledBorder.java
diff --git a/jdk/src/share/classes/javax/swing/border/package.html b/jdk/src/java.desktop/share/classes/javax/swing/border/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/swing/border/package.html
rename to jdk/src/java.desktop/share/classes/javax/swing/border/package.html
diff --git a/jdk/src/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java b/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java
diff --git a/jdk/src/share/classes/javax/swing/colorchooser/CenterLayout.java b/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/CenterLayout.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/colorchooser/CenterLayout.java
rename to jdk/src/java.desktop/share/classes/javax/swing/colorchooser/CenterLayout.java
diff --git a/jdk/src/share/classes/javax/swing/colorchooser/ColorChooserComponentFactory.java b/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorChooserComponentFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/colorchooser/ColorChooserComponentFactory.java
rename to jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorChooserComponentFactory.java
diff --git a/jdk/src/share/classes/javax/swing/colorchooser/ColorChooserPanel.java b/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorChooserPanel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/colorchooser/ColorChooserPanel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorChooserPanel.java
diff --git a/jdk/src/share/classes/javax/swing/colorchooser/ColorModel.java b/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/colorchooser/ColorModel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorModel.java
diff --git a/jdk/src/share/classes/javax/swing/colorchooser/ColorModelCMYK.java b/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorModelCMYK.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/colorchooser/ColorModelCMYK.java
rename to jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorModelCMYK.java
diff --git a/jdk/src/share/classes/javax/swing/colorchooser/ColorModelHSL.java b/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorModelHSL.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/colorchooser/ColorModelHSL.java
rename to jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorModelHSL.java
diff --git a/jdk/src/share/classes/javax/swing/colorchooser/ColorModelHSV.java b/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorModelHSV.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/colorchooser/ColorModelHSV.java
rename to jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorModelHSV.java
diff --git a/jdk/src/share/classes/javax/swing/colorchooser/ColorPanel.java b/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorPanel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/colorchooser/ColorPanel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorPanel.java
diff --git a/jdk/src/share/classes/javax/swing/colorchooser/ColorSelectionModel.java b/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorSelectionModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/colorchooser/ColorSelectionModel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorSelectionModel.java
diff --git a/jdk/src/share/classes/javax/swing/colorchooser/DefaultColorSelectionModel.java b/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/DefaultColorSelectionModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/colorchooser/DefaultColorSelectionModel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/colorchooser/DefaultColorSelectionModel.java
diff --git a/jdk/src/share/classes/javax/swing/colorchooser/DefaultPreviewPanel.java b/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/DefaultPreviewPanel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/colorchooser/DefaultPreviewPanel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/colorchooser/DefaultPreviewPanel.java
diff --git a/jdk/src/share/classes/javax/swing/colorchooser/DefaultSwatchChooserPanel.java b/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/DefaultSwatchChooserPanel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/colorchooser/DefaultSwatchChooserPanel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/colorchooser/DefaultSwatchChooserPanel.java
diff --git a/jdk/src/share/classes/javax/swing/colorchooser/DiagramComponent.java b/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/DiagramComponent.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/colorchooser/DiagramComponent.java
rename to jdk/src/java.desktop/share/classes/javax/swing/colorchooser/DiagramComponent.java
diff --git a/jdk/src/share/classes/javax/swing/colorchooser/SlidingSpinner.java b/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/SlidingSpinner.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/colorchooser/SlidingSpinner.java
rename to jdk/src/java.desktop/share/classes/javax/swing/colorchooser/SlidingSpinner.java
diff --git a/jdk/src/share/classes/javax/swing/colorchooser/SmartGridLayout.java b/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/SmartGridLayout.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/colorchooser/SmartGridLayout.java
rename to jdk/src/java.desktop/share/classes/javax/swing/colorchooser/SmartGridLayout.java
diff --git a/jdk/src/share/classes/javax/swing/colorchooser/ValueFormatter.java b/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ValueFormatter.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/colorchooser/ValueFormatter.java
rename to jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ValueFormatter.java
diff --git a/jdk/src/share/classes/javax/swing/colorchooser/package.html b/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/swing/colorchooser/package.html
rename to jdk/src/java.desktop/share/classes/javax/swing/colorchooser/package.html
diff --git a/jdk/src/share/classes/javax/swing/doc-files/BoxLayout-1.gif b/jdk/src/java.desktop/share/classes/javax/swing/doc-files/BoxLayout-1.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/doc-files/BoxLayout-1.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/doc-files/BoxLayout-1.gif
diff --git a/jdk/src/share/classes/javax/swing/doc-files/JLayeredPane-1.gif b/jdk/src/java.desktop/share/classes/javax/swing/doc-files/JLayeredPane-1.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/doc-files/JLayeredPane-1.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/doc-files/JLayeredPane-1.gif
diff --git a/jdk/src/share/classes/javax/swing/doc-files/JRootPane-1.gif b/jdk/src/java.desktop/share/classes/javax/swing/doc-files/JRootPane-1.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/doc-files/JRootPane-1.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/doc-files/JRootPane-1.gif
diff --git a/jdk/src/share/classes/javax/swing/doc-files/JRootPane-2.gif b/jdk/src/java.desktop/share/classes/javax/swing/doc-files/JRootPane-2.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/doc-files/JRootPane-2.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/doc-files/JRootPane-2.gif
diff --git a/jdk/src/share/classes/javax/swing/doc-files/JScrollPane-1.gif b/jdk/src/java.desktop/share/classes/javax/swing/doc-files/JScrollPane-1.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/doc-files/JScrollPane-1.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/doc-files/JScrollPane-1.gif
diff --git a/jdk/src/share/classes/javax/swing/doc-files/SizeSequence-1.gif b/jdk/src/java.desktop/share/classes/javax/swing/doc-files/SizeSequence-1.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/doc-files/SizeSequence-1.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/doc-files/SizeSequence-1.gif
diff --git a/jdk/src/share/classes/javax/swing/doc-files/groupLayout.1.gif b/jdk/src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.1.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/doc-files/groupLayout.1.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.1.gif
diff --git a/jdk/src/share/classes/javax/swing/doc-files/groupLayout.2.gif b/jdk/src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.2.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/doc-files/groupLayout.2.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.2.gif
diff --git a/jdk/src/share/classes/javax/swing/doc-files/groupLayout.3.gif b/jdk/src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.3.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/doc-files/groupLayout.3.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.3.gif
diff --git a/jdk/src/share/classes/javax/swing/doc-files/groupLayout.example.png b/jdk/src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.example.png
similarity index 100%
rename from jdk/src/share/classes/javax/swing/doc-files/groupLayout.example.png
rename to jdk/src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.example.png
diff --git a/jdk/src/share/classes/javax/swing/doc-files/groupLayout.sequential.gif b/jdk/src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.sequential.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/doc-files/groupLayout.sequential.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.sequential.gif
diff --git a/jdk/src/share/classes/javax/swing/doc-files/groupLayout.sequential.horizontal.gif b/jdk/src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.sequential.horizontal.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/doc-files/groupLayout.sequential.horizontal.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.sequential.horizontal.gif
diff --git a/jdk/src/share/classes/javax/swing/doc-files/groupLayout.sequential.vertical.gif b/jdk/src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.sequential.vertical.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/doc-files/groupLayout.sequential.vertical.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.sequential.vertical.gif
diff --git a/jdk/src/share/classes/javax/swing/event/AncestorEvent.java b/jdk/src/java.desktop/share/classes/javax/swing/event/AncestorEvent.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/AncestorEvent.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/AncestorEvent.java
diff --git a/jdk/src/share/classes/javax/swing/event/AncestorListener.java b/jdk/src/java.desktop/share/classes/javax/swing/event/AncestorListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/AncestorListener.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/AncestorListener.java
diff --git a/jdk/src/share/classes/javax/swing/event/CaretEvent.java b/jdk/src/java.desktop/share/classes/javax/swing/event/CaretEvent.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/CaretEvent.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/CaretEvent.java
diff --git a/jdk/src/share/classes/javax/swing/event/CaretListener.java b/jdk/src/java.desktop/share/classes/javax/swing/event/CaretListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/CaretListener.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/CaretListener.java
diff --git a/jdk/src/share/classes/javax/swing/event/CellEditorListener.java b/jdk/src/java.desktop/share/classes/javax/swing/event/CellEditorListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/CellEditorListener.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/CellEditorListener.java
diff --git a/jdk/src/share/classes/javax/swing/event/ChangeEvent.java b/jdk/src/java.desktop/share/classes/javax/swing/event/ChangeEvent.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/ChangeEvent.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/ChangeEvent.java
diff --git a/jdk/src/share/classes/javax/swing/event/ChangeListener.java b/jdk/src/java.desktop/share/classes/javax/swing/event/ChangeListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/ChangeListener.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/ChangeListener.java
diff --git a/jdk/src/share/classes/javax/swing/event/DocumentEvent.java b/jdk/src/java.desktop/share/classes/javax/swing/event/DocumentEvent.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/DocumentEvent.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/DocumentEvent.java
diff --git a/jdk/src/share/classes/javax/swing/event/DocumentListener.java b/jdk/src/java.desktop/share/classes/javax/swing/event/DocumentListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/DocumentListener.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/DocumentListener.java
diff --git a/jdk/src/share/classes/javax/swing/event/EventListenerList.java b/jdk/src/java.desktop/share/classes/javax/swing/event/EventListenerList.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/EventListenerList.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/EventListenerList.java
diff --git a/jdk/src/share/classes/javax/swing/event/HyperlinkEvent.java b/jdk/src/java.desktop/share/classes/javax/swing/event/HyperlinkEvent.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/HyperlinkEvent.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/HyperlinkEvent.java
diff --git a/jdk/src/share/classes/javax/swing/event/HyperlinkListener.java b/jdk/src/java.desktop/share/classes/javax/swing/event/HyperlinkListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/HyperlinkListener.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/HyperlinkListener.java
diff --git a/jdk/src/share/classes/javax/swing/event/InternalFrameAdapter.java b/jdk/src/java.desktop/share/classes/javax/swing/event/InternalFrameAdapter.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/InternalFrameAdapter.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/InternalFrameAdapter.java
diff --git a/jdk/src/share/classes/javax/swing/event/InternalFrameEvent.java b/jdk/src/java.desktop/share/classes/javax/swing/event/InternalFrameEvent.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/InternalFrameEvent.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/InternalFrameEvent.java
diff --git a/jdk/src/share/classes/javax/swing/event/InternalFrameListener.java b/jdk/src/java.desktop/share/classes/javax/swing/event/InternalFrameListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/InternalFrameListener.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/InternalFrameListener.java
diff --git a/jdk/src/share/classes/javax/swing/event/ListDataEvent.java b/jdk/src/java.desktop/share/classes/javax/swing/event/ListDataEvent.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/ListDataEvent.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/ListDataEvent.java
diff --git a/jdk/src/share/classes/javax/swing/event/ListDataListener.java b/jdk/src/java.desktop/share/classes/javax/swing/event/ListDataListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/ListDataListener.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/ListDataListener.java
diff --git a/jdk/src/share/classes/javax/swing/event/ListSelectionEvent.java b/jdk/src/java.desktop/share/classes/javax/swing/event/ListSelectionEvent.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/ListSelectionEvent.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/ListSelectionEvent.java
diff --git a/jdk/src/share/classes/javax/swing/event/ListSelectionListener.java b/jdk/src/java.desktop/share/classes/javax/swing/event/ListSelectionListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/ListSelectionListener.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/ListSelectionListener.java
diff --git a/jdk/src/share/classes/javax/swing/event/MenuDragMouseEvent.java b/jdk/src/java.desktop/share/classes/javax/swing/event/MenuDragMouseEvent.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/MenuDragMouseEvent.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/MenuDragMouseEvent.java
diff --git a/jdk/src/share/classes/javax/swing/event/MenuDragMouseListener.java b/jdk/src/java.desktop/share/classes/javax/swing/event/MenuDragMouseListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/MenuDragMouseListener.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/MenuDragMouseListener.java
diff --git a/jdk/src/share/classes/javax/swing/event/MenuEvent.java b/jdk/src/java.desktop/share/classes/javax/swing/event/MenuEvent.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/MenuEvent.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/MenuEvent.java
diff --git a/jdk/src/share/classes/javax/swing/event/MenuKeyEvent.java b/jdk/src/java.desktop/share/classes/javax/swing/event/MenuKeyEvent.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/MenuKeyEvent.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/MenuKeyEvent.java
diff --git a/jdk/src/share/classes/javax/swing/event/MenuKeyListener.java b/jdk/src/java.desktop/share/classes/javax/swing/event/MenuKeyListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/MenuKeyListener.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/MenuKeyListener.java
diff --git a/jdk/src/share/classes/javax/swing/event/MenuListener.java b/jdk/src/java.desktop/share/classes/javax/swing/event/MenuListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/MenuListener.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/MenuListener.java
diff --git a/jdk/src/share/classes/javax/swing/event/MouseInputAdapter.java b/jdk/src/java.desktop/share/classes/javax/swing/event/MouseInputAdapter.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/MouseInputAdapter.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/MouseInputAdapter.java
diff --git a/jdk/src/share/classes/javax/swing/event/MouseInputListener.java b/jdk/src/java.desktop/share/classes/javax/swing/event/MouseInputListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/MouseInputListener.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/MouseInputListener.java
diff --git a/jdk/src/share/classes/javax/swing/event/PopupMenuEvent.java b/jdk/src/java.desktop/share/classes/javax/swing/event/PopupMenuEvent.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/PopupMenuEvent.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/PopupMenuEvent.java
diff --git a/jdk/src/share/classes/javax/swing/event/PopupMenuListener.java b/jdk/src/java.desktop/share/classes/javax/swing/event/PopupMenuListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/PopupMenuListener.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/PopupMenuListener.java
diff --git a/jdk/src/share/classes/javax/swing/event/RowSorterEvent.java b/jdk/src/java.desktop/share/classes/javax/swing/event/RowSorterEvent.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/RowSorterEvent.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/RowSorterEvent.java
diff --git a/jdk/src/share/classes/javax/swing/event/RowSorterListener.java b/jdk/src/java.desktop/share/classes/javax/swing/event/RowSorterListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/RowSorterListener.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/RowSorterListener.java
diff --git a/jdk/src/share/classes/javax/swing/event/SwingPropertyChangeSupport.java b/jdk/src/java.desktop/share/classes/javax/swing/event/SwingPropertyChangeSupport.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/SwingPropertyChangeSupport.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/SwingPropertyChangeSupport.java
diff --git a/jdk/src/share/classes/javax/swing/event/TableColumnModelEvent.java b/jdk/src/java.desktop/share/classes/javax/swing/event/TableColumnModelEvent.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/TableColumnModelEvent.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/TableColumnModelEvent.java
diff --git a/jdk/src/share/classes/javax/swing/event/TableColumnModelListener.java b/jdk/src/java.desktop/share/classes/javax/swing/event/TableColumnModelListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/TableColumnModelListener.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/TableColumnModelListener.java
diff --git a/jdk/src/share/classes/javax/swing/event/TableModelEvent.java b/jdk/src/java.desktop/share/classes/javax/swing/event/TableModelEvent.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/TableModelEvent.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/TableModelEvent.java
diff --git a/jdk/src/share/classes/javax/swing/event/TableModelListener.java b/jdk/src/java.desktop/share/classes/javax/swing/event/TableModelListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/TableModelListener.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/TableModelListener.java
diff --git a/jdk/src/share/classes/javax/swing/event/TreeExpansionEvent.java b/jdk/src/java.desktop/share/classes/javax/swing/event/TreeExpansionEvent.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/TreeExpansionEvent.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/TreeExpansionEvent.java
diff --git a/jdk/src/share/classes/javax/swing/event/TreeExpansionListener.java b/jdk/src/java.desktop/share/classes/javax/swing/event/TreeExpansionListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/TreeExpansionListener.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/TreeExpansionListener.java
diff --git a/jdk/src/share/classes/javax/swing/event/TreeModelEvent.java b/jdk/src/java.desktop/share/classes/javax/swing/event/TreeModelEvent.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/TreeModelEvent.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/TreeModelEvent.java
diff --git a/jdk/src/share/classes/javax/swing/event/TreeModelListener.java b/jdk/src/java.desktop/share/classes/javax/swing/event/TreeModelListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/TreeModelListener.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/TreeModelListener.java
diff --git a/jdk/src/share/classes/javax/swing/event/TreeSelectionEvent.java b/jdk/src/java.desktop/share/classes/javax/swing/event/TreeSelectionEvent.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/TreeSelectionEvent.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/TreeSelectionEvent.java
diff --git a/jdk/src/share/classes/javax/swing/event/TreeSelectionListener.java b/jdk/src/java.desktop/share/classes/javax/swing/event/TreeSelectionListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/TreeSelectionListener.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/TreeSelectionListener.java
diff --git a/jdk/src/share/classes/javax/swing/event/TreeWillExpandListener.java b/jdk/src/java.desktop/share/classes/javax/swing/event/TreeWillExpandListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/TreeWillExpandListener.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/TreeWillExpandListener.java
diff --git a/jdk/src/share/classes/javax/swing/event/UndoableEditEvent.java b/jdk/src/java.desktop/share/classes/javax/swing/event/UndoableEditEvent.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/UndoableEditEvent.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/UndoableEditEvent.java
diff --git a/jdk/src/share/classes/javax/swing/event/UndoableEditListener.java b/jdk/src/java.desktop/share/classes/javax/swing/event/UndoableEditListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/UndoableEditListener.java
rename to jdk/src/java.desktop/share/classes/javax/swing/event/UndoableEditListener.java
diff --git a/jdk/src/share/classes/javax/swing/event/package.html b/jdk/src/java.desktop/share/classes/javax/swing/event/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/swing/event/package.html
rename to jdk/src/java.desktop/share/classes/javax/swing/event/package.html
diff --git a/jdk/src/share/classes/javax/swing/filechooser/FileFilter.java b/jdk/src/java.desktop/share/classes/javax/swing/filechooser/FileFilter.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/filechooser/FileFilter.java
rename to jdk/src/java.desktop/share/classes/javax/swing/filechooser/FileFilter.java
diff --git a/jdk/src/share/classes/javax/swing/filechooser/FileNameExtensionFilter.java b/jdk/src/java.desktop/share/classes/javax/swing/filechooser/FileNameExtensionFilter.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/filechooser/FileNameExtensionFilter.java
rename to jdk/src/java.desktop/share/classes/javax/swing/filechooser/FileNameExtensionFilter.java
diff --git a/jdk/src/share/classes/javax/swing/filechooser/FileSystemView.java b/jdk/src/java.desktop/share/classes/javax/swing/filechooser/FileSystemView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/filechooser/FileSystemView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/filechooser/FileSystemView.java
diff --git a/jdk/src/share/classes/javax/swing/filechooser/FileView.java b/jdk/src/java.desktop/share/classes/javax/swing/filechooser/FileView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/filechooser/FileView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/filechooser/FileView.java
diff --git a/jdk/src/share/classes/javax/swing/filechooser/package.html b/jdk/src/java.desktop/share/classes/javax/swing/filechooser/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/swing/filechooser/package.html
rename to jdk/src/java.desktop/share/classes/javax/swing/filechooser/package.html
diff --git a/jdk/src/share/classes/javax/swing/package.html b/jdk/src/java.desktop/share/classes/javax/swing/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/swing/package.html
rename to jdk/src/java.desktop/share/classes/javax/swing/package.html
diff --git a/jdk/src/share/classes/javax/swing/plaf/ActionMapUIResource.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/ActionMapUIResource.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/ActionMapUIResource.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/ActionMapUIResource.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/BorderUIResource.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/BorderUIResource.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/BorderUIResource.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/BorderUIResource.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/ButtonUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/ButtonUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/ButtonUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/ButtonUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/ColorChooserUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/ColorChooserUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/ColorChooserUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/ColorChooserUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/ColorUIResource.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/ColorUIResource.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/ColorUIResource.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/ColorUIResource.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/ComboBoxUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/ComboBoxUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/ComboBoxUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/ComboBoxUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/ComponentInputMapUIResource.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/ComponentInputMapUIResource.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/ComponentInputMapUIResource.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/ComponentInputMapUIResource.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/ComponentUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/ComponentUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/ComponentUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/ComponentUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/DesktopIconUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/DesktopIconUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/DesktopIconUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/DesktopIconUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/DesktopPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/DesktopPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/DesktopPaneUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/DesktopPaneUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/DimensionUIResource.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/DimensionUIResource.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/DimensionUIResource.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/DimensionUIResource.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/FileChooserUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/FileChooserUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/FileChooserUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/FileChooserUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/FontUIResource.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/FontUIResource.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/FontUIResource.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/FontUIResource.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/IconUIResource.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/IconUIResource.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/IconUIResource.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/IconUIResource.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/InputMapUIResource.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/InputMapUIResource.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/InputMapUIResource.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/InputMapUIResource.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/InsetsUIResource.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/InsetsUIResource.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/InsetsUIResource.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/InsetsUIResource.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/InternalFrameUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/InternalFrameUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/InternalFrameUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/InternalFrameUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/LabelUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/LabelUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/LabelUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/LabelUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/LayerUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/LayerUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/LayerUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/LayerUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/ListUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/ListUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/ListUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/ListUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/MenuBarUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/MenuBarUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/MenuBarUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/MenuBarUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/MenuItemUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/MenuItemUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/MenuItemUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/MenuItemUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/OptionPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/OptionPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/OptionPaneUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/OptionPaneUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/PanelUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/PanelUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/PanelUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/PanelUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/PopupMenuUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/PopupMenuUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/PopupMenuUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/PopupMenuUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/ProgressBarUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/ProgressBarUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/ProgressBarUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/ProgressBarUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/RootPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/RootPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/RootPaneUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/RootPaneUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/ScrollBarUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/ScrollBarUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/ScrollBarUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/ScrollBarUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/ScrollPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/ScrollPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/ScrollPaneUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/ScrollPaneUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/SeparatorUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/SeparatorUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/SeparatorUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/SeparatorUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/SliderUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/SliderUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/SliderUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/SliderUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/SpinnerUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/SpinnerUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/SpinnerUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/SpinnerUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/SplitPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/SplitPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/SplitPaneUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/SplitPaneUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/TabbedPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/TabbedPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/TabbedPaneUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/TabbedPaneUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/TableHeaderUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/TableHeaderUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/TableHeaderUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/TableHeaderUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/TableUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/TableUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/TableUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/TableUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/TextUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/TextUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/TextUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/TextUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/ToolBarUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/ToolBarUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/ToolBarUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/ToolBarUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/ToolTipUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/ToolTipUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/ToolTipUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/ToolTipUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/TreeUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/TreeUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/TreeUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/TreeUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/UIResource.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/UIResource.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/UIResource.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/UIResource.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/ViewportUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/ViewportUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/ViewportUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/ViewportUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicArrowButton.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicArrowButton.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicArrowButton.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicArrowButton.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicBorders.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicBorders.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicBorders.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicBorders.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicButtonListener.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicButtonListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicButtonListener.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicButtonListener.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicButtonUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicButtonUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicButtonUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicButtonUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicCheckBoxUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicCheckBoxUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicCheckBoxUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicCheckBoxUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicColorChooserUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicColorChooserUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicColorChooserUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicColorChooserUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicComboBoxEditor.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxEditor.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicComboBoxEditor.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxEditor.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicComboBoxUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicComboBoxUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicComboPopup.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboPopup.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicComboPopup.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboPopup.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicDesktopIconUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicDesktopIconUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicDesktopIconUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicDesktopIconUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicDesktopPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicDesktopPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicDesktopPaneUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicDesktopPaneUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicDirectoryModel.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicDirectoryModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicDirectoryModel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicDirectoryModel.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicEditorPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicEditorPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicEditorPaneUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicEditorPaneUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicFormattedTextFieldUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicFormattedTextFieldUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicFormattedTextFieldUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicFormattedTextFieldUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicGraphicsUtils.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicGraphicsUtils.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicGraphicsUtils.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicGraphicsUtils.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicHTML.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicHTML.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicHTML.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicHTML.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicIconFactory.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicIconFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicIconFactory.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicIconFactory.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicInternalFrameUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicInternalFrameUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicLabelUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLabelUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicLabelUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLabelUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicListUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicListUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicListUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicListUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicMenuBarUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuBarUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicMenuBarUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuBarUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicMenuItemUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuItemUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicMenuItemUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuItemUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicMenuUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicMenuUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicPanelUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPanelUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicPanelUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPanelUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicPasswordFieldUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPasswordFieldUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicPasswordFieldUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPasswordFieldUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicProgressBarUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicProgressBarUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicProgressBarUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicProgressBarUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicRadioButtonUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicRadioButtonUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicRadioButtonUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicRadioButtonUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicRootPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicRootPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicRootPaneUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicRootPaneUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicScrollPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicScrollPaneUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollPaneUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicSeparatorUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSeparatorUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicSeparatorUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSeparatorUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSliderUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSliderUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicSpinnerUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSpinnerUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicSpinnerUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSpinnerUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSplitPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSplitPaneUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTableHeaderUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTableHeaderUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicTableHeaderUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTableHeaderUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTableUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTableUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicTableUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTableUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTextAreaUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextAreaUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicTextAreaUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextAreaUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTextPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicTextPaneUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextPaneUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicToggleButtonUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToggleButtonUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicToggleButtonUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToggleButtonUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicToolBarSeparatorUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToolBarSeparatorUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicToolBarSeparatorUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToolBarSeparatorUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicToolBarUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToolBarUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicToolBarUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToolBarUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicToolTipUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToolTipUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicToolTipUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToolTipUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTransferable.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTransferable.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicTransferable.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTransferable.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTreeUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTreeUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicViewportUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicViewportUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/BasicViewportUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicViewportUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/CenterLayout.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/CenterLayout.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/CenterLayout.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/CenterLayout.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/ComboPopup.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/ComboPopup.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/ComboPopup.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/ComboPopup.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/DefaultMenuLayout.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/DefaultMenuLayout.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/DefaultMenuLayout.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/DefaultMenuLayout.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/DragRecognitionSupport.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/DragRecognitionSupport.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/DragRecognitionSupport.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/DragRecognitionSupport.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/LazyActionMap.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/LazyActionMap.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/LazyActionMap.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/LazyActionMap.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/icons/JavaCup16.png b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/icons/JavaCup16.png
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/icons/JavaCup16.png
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/icons/JavaCup16.png
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/icons/image-delayed.png b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/icons/image-delayed.png
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/icons/image-delayed.png
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/icons/image-delayed.png
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/icons/image-failed.png b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/icons/image-failed.png
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/icons/image-failed.png
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/icons/image-failed.png
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/package.html b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/basic/package.html
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/package.html
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalBorders.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalBorders.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalBorders.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalBorders.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalBumps.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalBumps.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalBumps.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalBumps.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalButtonUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalButtonUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalButtonUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalButtonUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalCheckBoxIcon.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalCheckBoxIcon.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalCheckBoxIcon.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalCheckBoxIcon.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalCheckBoxUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalCheckBoxUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalCheckBoxUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalCheckBoxUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalComboBoxButton.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxButton.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalComboBoxButton.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxButton.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalComboBoxEditor.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxEditor.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalComboBoxEditor.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxEditor.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalComboBoxIcon.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxIcon.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalComboBoxIcon.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxIcon.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalComboBoxUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalComboBoxUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalDesktopIconUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalDesktopIconUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalDesktopIconUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalDesktopIconUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalFontDesktopProperty.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFontDesktopProperty.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalFontDesktopProperty.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFontDesktopProperty.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalHighContrastTheme.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalHighContrastTheme.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalHighContrastTheme.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalHighContrastTheme.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalIconFactory.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalIconFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalIconFactory.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalIconFactory.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalInternalFrameTitlePane.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalInternalFrameTitlePane.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalInternalFrameTitlePane.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalInternalFrameTitlePane.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalInternalFrameUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalInternalFrameUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalInternalFrameUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalInternalFrameUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalLabelUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalLabelUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalLabelUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalLabelUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalMenuBarUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalMenuBarUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalMenuBarUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalMenuBarUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalProgressBarUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalProgressBarUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalProgressBarUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalProgressBarUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalRadioButtonUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalRadioButtonUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalRadioButtonUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalRadioButtonUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalRootPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalRootPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalRootPaneUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalRootPaneUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalScrollBarUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalScrollBarUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalScrollBarUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalScrollBarUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalScrollButton.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalScrollButton.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalScrollButton.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalScrollButton.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalScrollPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalScrollPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalScrollPaneUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalScrollPaneUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalSeparatorUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSeparatorUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalSeparatorUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSeparatorUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalSliderUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSliderUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalSliderUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSliderUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalSplitPaneDivider.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSplitPaneDivider.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalSplitPaneDivider.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSplitPaneDivider.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalSplitPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSplitPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalSplitPaneUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSplitPaneUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalTextFieldUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTextFieldUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalTextFieldUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTextFieldUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalTheme.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTheme.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalTheme.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTheme.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalTitlePane.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTitlePane.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalTitlePane.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTitlePane.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalToggleButtonUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToggleButtonUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalToggleButtonUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToggleButtonUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalToolBarUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToolBarUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalToolBarUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToolBarUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalToolTipUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToolTipUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalToolTipUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToolTipUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalTreeUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTreeUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalTreeUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTreeUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalUtils.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalUtils.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/MetalUtils.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalUtils.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/OceanTheme.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/OceanTheme.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/OceanTheme.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/OceanTheme.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/icons/Error.gif b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/Error.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/icons/Error.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/Error.gif
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/icons/Inform.gif b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/Inform.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/icons/Inform.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/Inform.gif
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/icons/Question.gif b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/Question.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/icons/Question.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/Question.gif
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/icons/Warn.gif b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/Warn.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/icons/Warn.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/Warn.gif
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/close-pressed.gif b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/close-pressed.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/close-pressed.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/close-pressed.gif
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/close.gif b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/close.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/close.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/close.gif
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/collapsed-rtl.gif b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/collapsed-rtl.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/collapsed-rtl.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/collapsed-rtl.gif
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/collapsed.gif b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/collapsed.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/collapsed.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/collapsed.gif
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/computer.gif b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/computer.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/computer.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/computer.gif
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/directory.gif b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/directory.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/directory.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/directory.gif
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/error.png b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/error.png
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/error.png
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/error.png
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/expanded.gif b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/expanded.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/expanded.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/expanded.gif
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/file.gif b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/file.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/file.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/file.gif
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/floppy.gif b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/floppy.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/floppy.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/floppy.gif
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/hardDrive.gif b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/hardDrive.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/hardDrive.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/hardDrive.gif
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/homeFolder.gif b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/homeFolder.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/homeFolder.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/homeFolder.gif
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/iconify-pressed.gif b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/iconify-pressed.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/iconify-pressed.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/iconify-pressed.gif
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/iconify.gif b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/iconify.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/iconify.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/iconify.gif
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/info.png b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/info.png
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/info.png
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/info.png
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/maximize-pressed.gif b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/maximize-pressed.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/maximize-pressed.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/maximize-pressed.gif
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/maximize.gif b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/maximize.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/maximize.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/maximize.gif
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/menu.gif b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/menu.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/menu.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/menu.gif
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/minimize-pressed.gif b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/minimize-pressed.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/minimize-pressed.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/minimize-pressed.gif
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/minimize.gif b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/minimize.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/minimize.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/minimize.gif
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/newFolder.gif b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/newFolder.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/newFolder.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/newFolder.gif
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/paletteClose-pressed.gif b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/paletteClose-pressed.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/paletteClose-pressed.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/paletteClose-pressed.gif
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/paletteClose.gif b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/paletteClose.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/paletteClose.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/paletteClose.gif
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/question.png b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/question.png
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/question.png
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/question.png
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/upFolder.gif b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/upFolder.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/upFolder.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/upFolder.gif
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/warning.png b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/warning.png
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/icons/ocean/warning.png
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/warning.png
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/icons/sortDown.png b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/sortDown.png
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/icons/sortDown.png
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/sortDown.png
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/icons/sortUp.png b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/sortUp.png
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/icons/sortUp.png
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/sortUp.png
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/package.html b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/package.html
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/package.html
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/sounds/FrameClose.wav b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/FrameClose.wav
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/sounds/FrameClose.wav
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/FrameClose.wav
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/sounds/FrameMaximize.wav b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/FrameMaximize.wav
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/sounds/FrameMaximize.wav
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/FrameMaximize.wav
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/sounds/FrameMinimize.wav b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/FrameMinimize.wav
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/sounds/FrameMinimize.wav
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/FrameMinimize.wav
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/sounds/FrameRestoreDown.wav b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/FrameRestoreDown.wav
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/sounds/FrameRestoreDown.wav
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/FrameRestoreDown.wav
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/sounds/FrameRestoreUp.wav b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/FrameRestoreUp.wav
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/sounds/FrameRestoreUp.wav
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/FrameRestoreUp.wav
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/sounds/MenuItemCommand.wav b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/MenuItemCommand.wav
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/sounds/MenuItemCommand.wav
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/MenuItemCommand.wav
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/sounds/OptionPaneError.wav b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/OptionPaneError.wav
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/sounds/OptionPaneError.wav
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/OptionPaneError.wav
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/sounds/OptionPaneInformation.wav b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/OptionPaneInformation.wav
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/sounds/OptionPaneInformation.wav
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/OptionPaneInformation.wav
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/sounds/OptionPaneQuestion.wav b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/OptionPaneQuestion.wav
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/sounds/OptionPaneQuestion.wav
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/OptionPaneQuestion.wav
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/sounds/OptionPaneWarning.wav b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/OptionPaneWarning.wav
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/sounds/OptionPaneWarning.wav
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/OptionPaneWarning.wav
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/sounds/PopupMenuPopup.wav b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/PopupMenuPopup.wav
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/metal/sounds/PopupMenuPopup.wav
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/PopupMenuPopup.wav
diff --git a/jdk/src/share/classes/javax/swing/plaf/multi/MultiButtonUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiButtonUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/multi/MultiButtonUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiButtonUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/multi/MultiColorChooserUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiColorChooserUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/multi/MultiColorChooserUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiColorChooserUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/multi/MultiComboBoxUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiComboBoxUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/multi/MultiComboBoxUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiComboBoxUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/multi/MultiDesktopIconUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiDesktopIconUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/multi/MultiDesktopIconUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiDesktopIconUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/multi/MultiDesktopPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiDesktopPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/multi/MultiDesktopPaneUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiDesktopPaneUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/multi/MultiFileChooserUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiFileChooserUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/multi/MultiFileChooserUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiFileChooserUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/multi/MultiInternalFrameUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiInternalFrameUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/multi/MultiInternalFrameUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiInternalFrameUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/multi/MultiLabelUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiLabelUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/multi/MultiLabelUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiLabelUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/multi/MultiListUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiListUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/multi/MultiListUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiListUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/multi/MultiLookAndFeel.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiLookAndFeel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/multi/MultiLookAndFeel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiLookAndFeel.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/multi/MultiMenuBarUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiMenuBarUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/multi/MultiMenuBarUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiMenuBarUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/multi/MultiMenuItemUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiMenuItemUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/multi/MultiMenuItemUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiMenuItemUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/multi/MultiOptionPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiOptionPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/multi/MultiOptionPaneUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiOptionPaneUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/multi/MultiPanelUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiPanelUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/multi/MultiPanelUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiPanelUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/multi/MultiPopupMenuUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiPopupMenuUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/multi/MultiPopupMenuUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiPopupMenuUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/multi/MultiProgressBarUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiProgressBarUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/multi/MultiProgressBarUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiProgressBarUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/multi/MultiRootPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiRootPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/multi/MultiRootPaneUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiRootPaneUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/multi/MultiScrollBarUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiScrollBarUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/multi/MultiScrollBarUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiScrollBarUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/multi/MultiScrollPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiScrollPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/multi/MultiScrollPaneUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiScrollPaneUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/multi/MultiSeparatorUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiSeparatorUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/multi/MultiSeparatorUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiSeparatorUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/multi/MultiSliderUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiSliderUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/multi/MultiSliderUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiSliderUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/multi/MultiSpinnerUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiSpinnerUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/multi/MultiSpinnerUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiSpinnerUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/multi/MultiSplitPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiSplitPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/multi/MultiSplitPaneUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiSplitPaneUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/multi/MultiTabbedPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiTabbedPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/multi/MultiTabbedPaneUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiTabbedPaneUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/multi/MultiTableHeaderUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiTableHeaderUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/multi/MultiTableHeaderUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiTableHeaderUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/multi/MultiTableUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiTableUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/multi/MultiTableUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiTableUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/multi/MultiTextUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiTextUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/multi/MultiTextUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiTextUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/multi/MultiToolBarUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiToolBarUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/multi/MultiToolBarUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiToolBarUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/multi/MultiToolTipUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiToolTipUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/multi/MultiToolTipUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiToolTipUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/multi/MultiTreeUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiTreeUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/multi/MultiTreeUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiTreeUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/multi/MultiViewportUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiViewportUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/multi/MultiViewportUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiViewportUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/multi/doc-files/multi_tsc.html b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/doc-files/multi_tsc.html
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/multi/doc-files/multi_tsc.html
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/doc-files/multi_tsc.html
diff --git a/jdk/src/share/classes/javax/swing/plaf/multi/package.html b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/multi/package.html
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/package.html
diff --git a/jdk/src/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/nimbus/Defaults.template b/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/Defaults.template
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/nimbus/Defaults.template
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/Defaults.template
diff --git a/jdk/src/share/classes/javax/swing/plaf/nimbus/DerivedColor.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/DerivedColor.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/nimbus/DerivedColor.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/DerivedColor.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/nimbus/DropShadowEffect.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/DropShadowEffect.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/nimbus/DropShadowEffect.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/DropShadowEffect.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/nimbus/Effect.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/Effect.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/nimbus/Effect.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/Effect.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/nimbus/EffectUtils.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/EffectUtils.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/nimbus/EffectUtils.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/EffectUtils.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/nimbus/ImageCache.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/ImageCache.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/nimbus/ImageCache.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/ImageCache.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/nimbus/ImageScalingHelper.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/ImageScalingHelper.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/nimbus/ImageScalingHelper.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/ImageScalingHelper.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/nimbus/InnerGlowEffect.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/InnerGlowEffect.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/nimbus/InnerGlowEffect.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/InnerGlowEffect.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/nimbus/InnerShadowEffect.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/InnerShadowEffect.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/nimbus/InnerShadowEffect.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/InnerShadowEffect.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/nimbus/LoweredBorder.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/LoweredBorder.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/nimbus/LoweredBorder.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/LoweredBorder.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusIcon.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/NimbusIcon.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusIcon.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/NimbusIcon.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusStyle.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/NimbusStyle.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusStyle.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/NimbusStyle.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/nimbus/OuterGlowEffect.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/OuterGlowEffect.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/nimbus/OuterGlowEffect.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/OuterGlowEffect.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/nimbus/PainterImpl.template b/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/PainterImpl.template
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/nimbus/PainterImpl.template
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/PainterImpl.template
diff --git a/jdk/src/share/classes/javax/swing/plaf/nimbus/ShadowEffect.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/ShadowEffect.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/nimbus/ShadowEffect.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/ShadowEffect.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/nimbus/State.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/State.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/nimbus/State.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/State.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/nimbus/StateImpl.template b/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/StateImpl.template
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/nimbus/StateImpl.template
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/StateImpl.template
diff --git a/jdk/src/share/classes/javax/swing/plaf/nimbus/SynthPainterImpl.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/SynthPainterImpl.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/nimbus/SynthPainterImpl.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/SynthPainterImpl.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/nimbus/TableScrollPaneCorner.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/TableScrollPaneCorner.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/nimbus/TableScrollPaneCorner.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/TableScrollPaneCorner.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/nimbus/ToolBarSeparatorPainter.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/ToolBarSeparatorPainter.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/nimbus/ToolBarSeparatorPainter.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/ToolBarSeparatorPainter.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/nimbus/doc-files/properties.html b/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/doc-files/properties.html
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/nimbus/doc-files/properties.html
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/doc-files/properties.html
diff --git a/jdk/src/share/classes/javax/swing/plaf/nimbus/package.html b/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/nimbus/package.html
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/package.html
diff --git a/jdk/src/share/classes/javax/swing/plaf/nimbus/skin.laf b/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/skin.laf
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/nimbus/skin.laf
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/skin.laf
diff --git a/jdk/src/share/classes/javax/swing/plaf/package.html b/jdk/src/java.desktop/share/classes/javax/swing/plaf/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/package.html
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/package.html
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/ColorType.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/ColorType.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/ColorType.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/ColorType.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/DefaultSynthStyleFactory.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/DefaultSynthStyleFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/DefaultSynthStyleFactory.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/DefaultSynthStyleFactory.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/ImagePainter.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/ImagePainter.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/ImagePainter.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/ImagePainter.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/ParsedSynthStyle.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/ParsedSynthStyle.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/ParsedSynthStyle.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/ParsedSynthStyle.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/Region.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/Region.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/Region.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/Region.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthArrowButton.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthArrowButton.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthArrowButton.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthArrowButton.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthBorder.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthBorder.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthBorder.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthBorder.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthButtonUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthButtonUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthButtonUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthButtonUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthCheckBoxMenuItemUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthCheckBoxMenuItemUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthCheckBoxMenuItemUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthCheckBoxMenuItemUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthCheckBoxUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthCheckBoxUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthCheckBoxUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthCheckBoxUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthColorChooserUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthColorChooserUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthColorChooserUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthColorChooserUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboPopup.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthComboPopup.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthComboPopup.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthComboPopup.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthConstants.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthConstants.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthConstants.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthConstants.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthContext.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthContext.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthContext.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthContext.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthDefaultLookup.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthDefaultLookup.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthDefaultLookup.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthDefaultLookup.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthDesktopIconUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthDesktopIconUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthDesktopIconUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthDesktopIconUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthDesktopPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthDesktopPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthDesktopPaneUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthDesktopPaneUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthEditorPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthEditorPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthEditorPaneUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthEditorPaneUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthFormattedTextFieldUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthFormattedTextFieldUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthFormattedTextFieldUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthFormattedTextFieldUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthGraphicsUtils.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthGraphicsUtils.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthGraphicsUtils.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthGraphicsUtils.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthInternalFrameTitlePane.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthInternalFrameTitlePane.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthInternalFrameTitlePane.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthInternalFrameTitlePane.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthInternalFrameUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthInternalFrameUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthInternalFrameUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthInternalFrameUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthLabelUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthLabelUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthLabelUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthLabelUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthListUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthListUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthListUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthListUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuBarUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthMenuBarUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuBarUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthMenuBarUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuItemLayoutHelper.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthMenuItemLayoutHelper.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuItemLayoutHelper.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthMenuItemLayoutHelper.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuItemUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthMenuItemUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuItemUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthMenuItemUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuLayout.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthMenuLayout.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuLayout.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthMenuLayout.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthMenuUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthMenuUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthOptionPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthOptionPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthOptionPaneUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthOptionPaneUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthPainter.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthPainter.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthPainter.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthPainter.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthPanelUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthPanelUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthPanelUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthPanelUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthParser.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthParser.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthParser.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthParser.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthPasswordFieldUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthPasswordFieldUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthPasswordFieldUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthPasswordFieldUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthPopupMenuUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthPopupMenuUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthPopupMenuUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthPopupMenuUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthProgressBarUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthProgressBarUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthProgressBarUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthProgressBarUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthRadioButtonMenuItemUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthRadioButtonMenuItemUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthRadioButtonMenuItemUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthRadioButtonMenuItemUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthRadioButtonUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthRadioButtonUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthRadioButtonUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthRadioButtonUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthRootPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthRootPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthRootPaneUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthRootPaneUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthScrollBarUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthScrollBarUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthScrollBarUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthScrollBarUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthScrollPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthScrollPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthScrollPaneUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthScrollPaneUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthSeparatorUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSeparatorUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthSeparatorUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSeparatorUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthSliderUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSliderUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthSliderUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSliderUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthSpinnerUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSpinnerUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthSpinnerUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSpinnerUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthSplitPaneDivider.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSplitPaneDivider.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthSplitPaneDivider.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSplitPaneDivider.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthSplitPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSplitPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthSplitPaneUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSplitPaneUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthStyle.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthStyle.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthStyle.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthStyle.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthStyleFactory.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthStyleFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthStyleFactory.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthStyleFactory.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthTableHeaderUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTableHeaderUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthTableHeaderUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTableHeaderUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthTableUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTableUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthTableUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTableUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthTextAreaUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTextAreaUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthTextAreaUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTextAreaUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthTextFieldUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTextFieldUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthTextFieldUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTextFieldUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthTextPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTextPaneUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthTextPaneUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTextPaneUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthToggleButtonUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthToggleButtonUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthToggleButtonUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthToggleButtonUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthToolBarUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthToolBarUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthToolBarUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthToolBarUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthToolTipUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthToolTipUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthToolTipUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthToolTipUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTreeUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTreeUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthViewportUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthViewportUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/SynthViewportUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthViewportUI.java
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/doc-files/synth.dtd b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synth.dtd
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/doc-files/synth.dtd
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synth.dtd
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/package.html b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/swing/plaf/synth/package.html
rename to jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/package.html
diff --git a/jdk/src/share/classes/javax/swing/table/AbstractTableModel.java b/jdk/src/java.desktop/share/classes/javax/swing/table/AbstractTableModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/table/AbstractTableModel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/table/AbstractTableModel.java
diff --git a/jdk/src/share/classes/javax/swing/table/DefaultTableCellRenderer.java b/jdk/src/java.desktop/share/classes/javax/swing/table/DefaultTableCellRenderer.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/table/DefaultTableCellRenderer.java
rename to jdk/src/java.desktop/share/classes/javax/swing/table/DefaultTableCellRenderer.java
diff --git a/jdk/src/share/classes/javax/swing/table/DefaultTableColumnModel.java b/jdk/src/java.desktop/share/classes/javax/swing/table/DefaultTableColumnModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/table/DefaultTableColumnModel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/table/DefaultTableColumnModel.java
diff --git a/jdk/src/share/classes/javax/swing/table/DefaultTableModel.java b/jdk/src/java.desktop/share/classes/javax/swing/table/DefaultTableModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/table/DefaultTableModel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/table/DefaultTableModel.java
diff --git a/jdk/src/share/classes/javax/swing/table/JTableHeader.java b/jdk/src/java.desktop/share/classes/javax/swing/table/JTableHeader.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/table/JTableHeader.java
rename to jdk/src/java.desktop/share/classes/javax/swing/table/JTableHeader.java
diff --git a/jdk/src/share/classes/javax/swing/table/TableCellEditor.java b/jdk/src/java.desktop/share/classes/javax/swing/table/TableCellEditor.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/table/TableCellEditor.java
rename to jdk/src/java.desktop/share/classes/javax/swing/table/TableCellEditor.java
diff --git a/jdk/src/share/classes/javax/swing/table/TableCellRenderer.java b/jdk/src/java.desktop/share/classes/javax/swing/table/TableCellRenderer.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/table/TableCellRenderer.java
rename to jdk/src/java.desktop/share/classes/javax/swing/table/TableCellRenderer.java
diff --git a/jdk/src/share/classes/javax/swing/table/TableColumn.java b/jdk/src/java.desktop/share/classes/javax/swing/table/TableColumn.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/table/TableColumn.java
rename to jdk/src/java.desktop/share/classes/javax/swing/table/TableColumn.java
diff --git a/jdk/src/share/classes/javax/swing/table/TableColumnModel.java b/jdk/src/java.desktop/share/classes/javax/swing/table/TableColumnModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/table/TableColumnModel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/table/TableColumnModel.java
diff --git a/jdk/src/share/classes/javax/swing/table/TableModel.java b/jdk/src/java.desktop/share/classes/javax/swing/table/TableModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/table/TableModel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/table/TableModel.java
diff --git a/jdk/src/share/classes/javax/swing/table/TableRowSorter.java b/jdk/src/java.desktop/share/classes/javax/swing/table/TableRowSorter.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/table/TableRowSorter.java
rename to jdk/src/java.desktop/share/classes/javax/swing/table/TableRowSorter.java
diff --git a/jdk/src/share/classes/javax/swing/table/TableStringConverter.java b/jdk/src/java.desktop/share/classes/javax/swing/table/TableStringConverter.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/table/TableStringConverter.java
rename to jdk/src/java.desktop/share/classes/javax/swing/table/TableStringConverter.java
diff --git a/jdk/src/share/classes/javax/swing/table/package.html b/jdk/src/java.desktop/share/classes/javax/swing/table/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/swing/table/package.html
rename to jdk/src/java.desktop/share/classes/javax/swing/table/package.html
diff --git a/jdk/src/share/classes/javax/swing/text/AbstractDocument.java b/jdk/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/AbstractDocument.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java
diff --git a/jdk/src/share/classes/javax/swing/text/AbstractWriter.java b/jdk/src/java.desktop/share/classes/javax/swing/text/AbstractWriter.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/AbstractWriter.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/AbstractWriter.java
diff --git a/jdk/src/share/classes/javax/swing/text/AsyncBoxView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/AsyncBoxView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/AsyncBoxView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/AsyncBoxView.java
diff --git a/jdk/src/share/classes/javax/swing/text/AttributeSet.java b/jdk/src/java.desktop/share/classes/javax/swing/text/AttributeSet.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/AttributeSet.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/AttributeSet.java
diff --git a/jdk/src/share/classes/javax/swing/text/BadLocationException.java b/jdk/src/java.desktop/share/classes/javax/swing/text/BadLocationException.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/BadLocationException.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/BadLocationException.java
diff --git a/jdk/src/share/classes/javax/swing/text/BoxView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/BoxView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/BoxView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/BoxView.java
diff --git a/jdk/src/share/classes/javax/swing/text/Caret.java b/jdk/src/java.desktop/share/classes/javax/swing/text/Caret.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/Caret.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/Caret.java
diff --git a/jdk/src/share/classes/javax/swing/text/ChangedCharSetException.java b/jdk/src/java.desktop/share/classes/javax/swing/text/ChangedCharSetException.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/ChangedCharSetException.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/ChangedCharSetException.java
diff --git a/jdk/src/share/classes/javax/swing/text/ComponentView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/ComponentView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/ComponentView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/ComponentView.java
diff --git a/jdk/src/share/classes/javax/swing/text/CompositeView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/CompositeView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/CompositeView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/CompositeView.java
diff --git a/jdk/src/share/classes/javax/swing/text/DateFormatter.java b/jdk/src/java.desktop/share/classes/javax/swing/text/DateFormatter.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/DateFormatter.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/DateFormatter.java
diff --git a/jdk/src/share/classes/javax/swing/text/DefaultCaret.java b/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/DefaultCaret.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java
diff --git a/jdk/src/share/classes/javax/swing/text/DefaultEditorKit.java b/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultEditorKit.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/DefaultEditorKit.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/DefaultEditorKit.java
diff --git a/jdk/src/share/classes/javax/swing/text/DefaultFormatter.java b/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultFormatter.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/DefaultFormatter.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/DefaultFormatter.java
diff --git a/jdk/src/share/classes/javax/swing/text/DefaultFormatterFactory.java b/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultFormatterFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/DefaultFormatterFactory.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/DefaultFormatterFactory.java
diff --git a/jdk/src/share/classes/javax/swing/text/DefaultHighlighter.java b/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultHighlighter.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/DefaultHighlighter.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/DefaultHighlighter.java
diff --git a/jdk/src/share/classes/javax/swing/text/DefaultStyledDocument.java b/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultStyledDocument.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/DefaultStyledDocument.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/DefaultStyledDocument.java
diff --git a/jdk/src/share/classes/javax/swing/text/DefaultTextUI.java b/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultTextUI.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/DefaultTextUI.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/DefaultTextUI.java
diff --git a/jdk/src/share/classes/javax/swing/text/Document.java b/jdk/src/java.desktop/share/classes/javax/swing/text/Document.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/Document.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/Document.java
diff --git a/jdk/src/share/classes/javax/swing/text/DocumentFilter.java b/jdk/src/java.desktop/share/classes/javax/swing/text/DocumentFilter.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/DocumentFilter.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/DocumentFilter.java
diff --git a/jdk/src/share/classes/javax/swing/text/EditorKit.java b/jdk/src/java.desktop/share/classes/javax/swing/text/EditorKit.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/EditorKit.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/EditorKit.java
diff --git a/jdk/src/share/classes/javax/swing/text/Element.java b/jdk/src/java.desktop/share/classes/javax/swing/text/Element.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/Element.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/Element.java
diff --git a/jdk/src/share/classes/javax/swing/text/ElementIterator.java b/jdk/src/java.desktop/share/classes/javax/swing/text/ElementIterator.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/ElementIterator.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/ElementIterator.java
diff --git a/jdk/src/share/classes/javax/swing/text/FieldView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/FieldView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/FieldView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/FieldView.java
diff --git a/jdk/src/share/classes/javax/swing/text/FlowView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/FlowView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/FlowView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/FlowView.java
diff --git a/jdk/src/share/classes/javax/swing/text/GapContent.java b/jdk/src/java.desktop/share/classes/javax/swing/text/GapContent.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/GapContent.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/GapContent.java
diff --git a/jdk/src/share/classes/javax/swing/text/GapVector.java b/jdk/src/java.desktop/share/classes/javax/swing/text/GapVector.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/GapVector.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/GapVector.java
diff --git a/jdk/src/share/classes/javax/swing/text/GlyphPainter1.java b/jdk/src/java.desktop/share/classes/javax/swing/text/GlyphPainter1.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/GlyphPainter1.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/GlyphPainter1.java
diff --git a/jdk/src/share/classes/javax/swing/text/GlyphPainter2.java b/jdk/src/java.desktop/share/classes/javax/swing/text/GlyphPainter2.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/GlyphPainter2.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/GlyphPainter2.java
diff --git a/jdk/src/share/classes/javax/swing/text/GlyphView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/GlyphView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/GlyphView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/GlyphView.java
diff --git a/jdk/src/share/classes/javax/swing/text/Highlighter.java b/jdk/src/java.desktop/share/classes/javax/swing/text/Highlighter.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/Highlighter.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/Highlighter.java
diff --git a/jdk/src/share/classes/javax/swing/text/IconView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/IconView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/IconView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/IconView.java
diff --git a/jdk/src/share/classes/javax/swing/text/InternationalFormatter.java b/jdk/src/java.desktop/share/classes/javax/swing/text/InternationalFormatter.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/InternationalFormatter.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/InternationalFormatter.java
diff --git a/jdk/src/share/classes/javax/swing/text/JTextComponent.java b/jdk/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/JTextComponent.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java
diff --git a/jdk/src/share/classes/javax/swing/text/Keymap.java b/jdk/src/java.desktop/share/classes/javax/swing/text/Keymap.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/Keymap.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/Keymap.java
diff --git a/jdk/src/share/classes/javax/swing/text/LabelView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/LabelView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/LabelView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/LabelView.java
diff --git a/jdk/src/share/classes/javax/swing/text/LayeredHighlighter.java b/jdk/src/java.desktop/share/classes/javax/swing/text/LayeredHighlighter.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/LayeredHighlighter.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/LayeredHighlighter.java
diff --git a/jdk/src/share/classes/javax/swing/text/LayoutQueue.java b/jdk/src/java.desktop/share/classes/javax/swing/text/LayoutQueue.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/LayoutQueue.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/LayoutQueue.java
diff --git a/jdk/src/share/classes/javax/swing/text/MaskFormatter.java b/jdk/src/java.desktop/share/classes/javax/swing/text/MaskFormatter.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/MaskFormatter.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/MaskFormatter.java
diff --git a/jdk/src/share/classes/javax/swing/text/MutableAttributeSet.java b/jdk/src/java.desktop/share/classes/javax/swing/text/MutableAttributeSet.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/MutableAttributeSet.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/MutableAttributeSet.java
diff --git a/jdk/src/share/classes/javax/swing/text/NavigationFilter.java b/jdk/src/java.desktop/share/classes/javax/swing/text/NavigationFilter.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/NavigationFilter.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/NavigationFilter.java
diff --git a/jdk/src/share/classes/javax/swing/text/NumberFormatter.java b/jdk/src/java.desktop/share/classes/javax/swing/text/NumberFormatter.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/NumberFormatter.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/NumberFormatter.java
diff --git a/jdk/src/share/classes/javax/swing/text/ParagraphView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/ParagraphView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/ParagraphView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/ParagraphView.java
diff --git a/jdk/src/share/classes/javax/swing/text/PasswordView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/PasswordView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/PasswordView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/PasswordView.java
diff --git a/jdk/src/share/classes/javax/swing/text/PlainDocument.java b/jdk/src/java.desktop/share/classes/javax/swing/text/PlainDocument.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/PlainDocument.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/PlainDocument.java
diff --git a/jdk/src/share/classes/javax/swing/text/PlainView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/PlainView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/PlainView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/PlainView.java
diff --git a/jdk/src/share/classes/javax/swing/text/Position.java b/jdk/src/java.desktop/share/classes/javax/swing/text/Position.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/Position.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/Position.java
diff --git a/jdk/src/share/classes/javax/swing/text/Segment.java b/jdk/src/java.desktop/share/classes/javax/swing/text/Segment.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/Segment.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/Segment.java
diff --git a/jdk/src/share/classes/javax/swing/text/SegmentCache.java b/jdk/src/java.desktop/share/classes/javax/swing/text/SegmentCache.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/SegmentCache.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/SegmentCache.java
diff --git a/jdk/src/share/classes/javax/swing/text/SimpleAttributeSet.java b/jdk/src/java.desktop/share/classes/javax/swing/text/SimpleAttributeSet.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/SimpleAttributeSet.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/SimpleAttributeSet.java
diff --git a/jdk/src/share/classes/javax/swing/text/StateInvariantError.java b/jdk/src/java.desktop/share/classes/javax/swing/text/StateInvariantError.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/StateInvariantError.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/StateInvariantError.java
diff --git a/jdk/src/share/classes/javax/swing/text/StringContent.java b/jdk/src/java.desktop/share/classes/javax/swing/text/StringContent.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/StringContent.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/StringContent.java
diff --git a/jdk/src/share/classes/javax/swing/text/Style.java b/jdk/src/java.desktop/share/classes/javax/swing/text/Style.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/Style.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/Style.java
diff --git a/jdk/src/share/classes/javax/swing/text/StyleConstants.java b/jdk/src/java.desktop/share/classes/javax/swing/text/StyleConstants.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/StyleConstants.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/StyleConstants.java
diff --git a/jdk/src/share/classes/javax/swing/text/StyleContext.java b/jdk/src/java.desktop/share/classes/javax/swing/text/StyleContext.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/StyleContext.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/StyleContext.java
diff --git a/jdk/src/share/classes/javax/swing/text/StyledDocument.java b/jdk/src/java.desktop/share/classes/javax/swing/text/StyledDocument.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/StyledDocument.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/StyledDocument.java
diff --git a/jdk/src/share/classes/javax/swing/text/StyledEditorKit.java b/jdk/src/java.desktop/share/classes/javax/swing/text/StyledEditorKit.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/StyledEditorKit.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/StyledEditorKit.java
diff --git a/jdk/src/share/classes/javax/swing/text/TabExpander.java b/jdk/src/java.desktop/share/classes/javax/swing/text/TabExpander.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/TabExpander.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/TabExpander.java
diff --git a/jdk/src/share/classes/javax/swing/text/TabSet.java b/jdk/src/java.desktop/share/classes/javax/swing/text/TabSet.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/TabSet.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/TabSet.java
diff --git a/jdk/src/share/classes/javax/swing/text/TabStop.java b/jdk/src/java.desktop/share/classes/javax/swing/text/TabStop.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/TabStop.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/TabStop.java
diff --git a/jdk/src/share/classes/javax/swing/text/TabableView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/TabableView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/TabableView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/TabableView.java
diff --git a/jdk/src/share/classes/javax/swing/text/TableView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/TableView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/TableView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/TableView.java
diff --git a/jdk/src/share/classes/javax/swing/text/TextAction.java b/jdk/src/java.desktop/share/classes/javax/swing/text/TextAction.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/TextAction.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/TextAction.java
diff --git a/jdk/src/share/classes/javax/swing/text/TextLayoutStrategy.java b/jdk/src/java.desktop/share/classes/javax/swing/text/TextLayoutStrategy.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/TextLayoutStrategy.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/TextLayoutStrategy.java
diff --git a/jdk/src/share/classes/javax/swing/text/Utilities.java b/jdk/src/java.desktop/share/classes/javax/swing/text/Utilities.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/Utilities.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/Utilities.java
diff --git a/jdk/src/share/classes/javax/swing/text/View.java b/jdk/src/java.desktop/share/classes/javax/swing/text/View.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/View.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/View.java
diff --git a/jdk/src/share/classes/javax/swing/text/ViewFactory.java b/jdk/src/java.desktop/share/classes/javax/swing/text/ViewFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/ViewFactory.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/ViewFactory.java
diff --git a/jdk/src/share/classes/javax/swing/text/WhitespaceBasedBreakIterator.java b/jdk/src/java.desktop/share/classes/javax/swing/text/WhitespaceBasedBreakIterator.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/WhitespaceBasedBreakIterator.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/WhitespaceBasedBreakIterator.java
diff --git a/jdk/src/share/classes/javax/swing/text/WrappedPlainView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/WrappedPlainView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/WrappedPlainView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/WrappedPlainView.java
diff --git a/jdk/src/share/classes/javax/swing/text/ZoneView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/ZoneView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/ZoneView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/ZoneView.java
diff --git a/jdk/src/share/classes/javax/swing/text/doc-files/Document-coord.gif b/jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/Document-coord.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/doc-files/Document-coord.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/Document-coord.gif
diff --git a/jdk/src/share/classes/javax/swing/text/doc-files/Document-insert.gif b/jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/Document-insert.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/doc-files/Document-insert.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/Document-insert.gif
diff --git a/jdk/src/share/classes/javax/swing/text/doc-files/Document-notification.gif b/jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/Document-notification.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/doc-files/Document-notification.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/Document-notification.gif
diff --git a/jdk/src/share/classes/javax/swing/text/doc-files/Document-remove.gif b/jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/Document-remove.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/doc-files/Document-remove.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/Document-remove.gif
diff --git a/jdk/src/share/classes/javax/swing/text/doc-files/Document-structure.gif b/jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/Document-structure.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/doc-files/Document-structure.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/Document-structure.gif
diff --git a/jdk/src/share/classes/javax/swing/text/doc-files/OpenBookIcon.gif b/jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/OpenBookIcon.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/doc-files/OpenBookIcon.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/OpenBookIcon.gif
diff --git a/jdk/src/share/classes/javax/swing/text/doc-files/View-flexibility.jpg b/jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/View-flexibility.jpg
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/doc-files/View-flexibility.jpg
rename to jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/View-flexibility.jpg
diff --git a/jdk/src/share/classes/javax/swing/text/doc-files/View-layout.jpg b/jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/View-layout.jpg
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/doc-files/View-layout.jpg
rename to jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/View-layout.jpg
diff --git a/jdk/src/share/classes/javax/swing/text/doc-files/editor.gif b/jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/editor.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/doc-files/editor.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/editor.gif
diff --git a/jdk/src/share/classes/javax/swing/text/doc-files/paragraph.gif b/jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/paragraph.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/doc-files/paragraph.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/paragraph.gif
diff --git a/jdk/src/share/classes/javax/swing/text/html/AccessibleHTML.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/AccessibleHTML.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/AccessibleHTML.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/AccessibleHTML.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/BRView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/BRView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/BRView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/BRView.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/BlockView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/BlockView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/BlockView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/BlockView.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/CSS.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/CSS.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/CSS.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/CSS.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/CSSBorder.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/CSSBorder.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/CSSBorder.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/CSSBorder.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/CSSParser.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/CSSParser.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/CSSParser.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/CSSParser.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/CommentView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/CommentView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/CommentView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/CommentView.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/EditableView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/EditableView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/EditableView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/EditableView.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/FormSubmitEvent.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/FormSubmitEvent.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/FormSubmitEvent.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/FormSubmitEvent.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/FormView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/FormView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/FormView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/FormView.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/FrameSetView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/FrameSetView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/FrameSetView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/FrameSetView.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/FrameView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/FrameView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/FrameView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/FrameView.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/HRuleView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/HRuleView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/HRuleView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/HRuleView.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/HTML.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/HTML.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/HTML.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/HTML.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/HTMLDocument.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/HTMLDocument.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/HTMLEditorKit.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/HTMLEditorKit.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/HTMLEditorKit.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/HTMLEditorKit.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/HTMLFrameHyperlinkEvent.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/HTMLFrameHyperlinkEvent.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/HTMLFrameHyperlinkEvent.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/HTMLFrameHyperlinkEvent.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/HTMLWriter.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/HTMLWriter.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/HTMLWriter.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/HTMLWriter.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/HiddenTagView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/HiddenTagView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/HiddenTagView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/HiddenTagView.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/ImageView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/ImageView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/ImageView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/ImageView.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/InlineView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/InlineView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/InlineView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/InlineView.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/IsindexView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/IsindexView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/IsindexView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/IsindexView.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/LineView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/LineView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/LineView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/LineView.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/ListView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/ListView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/ListView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/ListView.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/Map.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/Map.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/Map.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/Map.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/MinimalHTMLWriter.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/MinimalHTMLWriter.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/MinimalHTMLWriter.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/MinimalHTMLWriter.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/MuxingAttributeSet.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/MuxingAttributeSet.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/MuxingAttributeSet.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/MuxingAttributeSet.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/NoFramesView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/NoFramesView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/NoFramesView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/NoFramesView.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/ObjectView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/ObjectView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/ObjectView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/ObjectView.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/Option.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/Option.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/Option.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/Option.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/OptionComboBoxModel.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/OptionComboBoxModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/OptionComboBoxModel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/OptionComboBoxModel.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/OptionListModel.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/OptionListModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/OptionListModel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/OptionListModel.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/ParagraphView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/ParagraphView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/ParagraphView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/ParagraphView.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/StyleSheet.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/StyleSheet.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/TableView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/TableView.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/TableView.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/TableView.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/TextAreaDocument.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/TextAreaDocument.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/TextAreaDocument.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/TextAreaDocument.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/default.css b/jdk/src/java.desktop/share/classes/javax/swing/text/html/default.css
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/default.css
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/default.css
diff --git a/jdk/src/share/classes/javax/swing/text/html/package.html b/jdk/src/java.desktop/share/classes/javax/swing/text/html/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/package.html
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/package.html
diff --git a/jdk/src/share/classes/javax/swing/text/html/parser/AttributeList.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/AttributeList.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/parser/AttributeList.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/AttributeList.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/parser/ContentModel.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/ContentModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/parser/ContentModel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/ContentModel.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/parser/ContentModelState.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/ContentModelState.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/parser/ContentModelState.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/ContentModelState.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/parser/DTD.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/DTD.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/parser/DTD.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/DTD.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/parser/DTDConstants.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/DTDConstants.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/parser/DTDConstants.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/DTDConstants.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/parser/DocumentParser.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/DocumentParser.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/parser/DocumentParser.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/DocumentParser.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/parser/Element.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/Element.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/parser/Element.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/Element.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/parser/Entity.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/Entity.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/parser/Entity.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/Entity.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/parser/Parser.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/Parser.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/parser/Parser.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/Parser.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/parser/ParserDelegator.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/ParserDelegator.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/parser/ParserDelegator.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/ParserDelegator.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/parser/TagElement.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/TagElement.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/parser/TagElement.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/TagElement.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/parser/TagStack.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/TagStack.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/parser/TagStack.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/TagStack.java
diff --git a/jdk/src/share/classes/javax/swing/text/html/parser/package.html b/jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/html/parser/package.html
rename to jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/package.html
diff --git a/jdk/src/share/classes/javax/swing/text/package.html b/jdk/src/java.desktop/share/classes/javax/swing/text/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/package.html
rename to jdk/src/java.desktop/share/classes/javax/swing/text/package.html
diff --git a/jdk/src/share/classes/javax/swing/text/rtf/AbstractFilter.java b/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/AbstractFilter.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/rtf/AbstractFilter.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/rtf/AbstractFilter.java
diff --git a/jdk/src/share/classes/javax/swing/text/rtf/Constants.java b/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/Constants.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/rtf/Constants.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/rtf/Constants.java
diff --git a/jdk/src/share/classes/javax/swing/text/rtf/MockAttributeSet.java b/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/MockAttributeSet.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/rtf/MockAttributeSet.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/rtf/MockAttributeSet.java
diff --git a/jdk/src/share/classes/javax/swing/text/rtf/RTFAttribute.java b/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFAttribute.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/rtf/RTFAttribute.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFAttribute.java
diff --git a/jdk/src/share/classes/javax/swing/text/rtf/RTFAttributes.java b/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFAttributes.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/rtf/RTFAttributes.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFAttributes.java
diff --git a/jdk/src/share/classes/javax/swing/text/rtf/RTFEditorKit.java b/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFEditorKit.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/rtf/RTFEditorKit.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFEditorKit.java
diff --git a/jdk/src/share/classes/javax/swing/text/rtf/RTFGenerator.java b/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFGenerator.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/rtf/RTFGenerator.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFGenerator.java
diff --git a/jdk/src/share/classes/javax/swing/text/rtf/RTFParser.java b/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFParser.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/rtf/RTFParser.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFParser.java
diff --git a/jdk/src/share/classes/javax/swing/text/rtf/RTFReader.java b/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFReader.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/rtf/RTFReader.java
rename to jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFReader.java
diff --git a/jdk/src/share/classes/javax/swing/text/rtf/charsets/NeXT.txt b/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/charsets/NeXT.txt
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/rtf/charsets/NeXT.txt
rename to jdk/src/java.desktop/share/classes/javax/swing/text/rtf/charsets/NeXT.txt
diff --git a/jdk/src/share/classes/javax/swing/text/rtf/charsets/ansi.txt b/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/charsets/ansi.txt
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/rtf/charsets/ansi.txt
rename to jdk/src/java.desktop/share/classes/javax/swing/text/rtf/charsets/ansi.txt
diff --git a/jdk/src/share/classes/javax/swing/text/rtf/charsets/cpg437.txt b/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/charsets/cpg437.txt
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/rtf/charsets/cpg437.txt
rename to jdk/src/java.desktop/share/classes/javax/swing/text/rtf/charsets/cpg437.txt
diff --git a/jdk/src/share/classes/javax/swing/text/rtf/charsets/cpg850.txt b/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/charsets/cpg850.txt
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/rtf/charsets/cpg850.txt
rename to jdk/src/java.desktop/share/classes/javax/swing/text/rtf/charsets/cpg850.txt
diff --git a/jdk/src/share/classes/javax/swing/text/rtf/charsets/mac.txt b/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/charsets/mac.txt
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/rtf/charsets/mac.txt
rename to jdk/src/java.desktop/share/classes/javax/swing/text/rtf/charsets/mac.txt
diff --git a/jdk/src/share/classes/javax/swing/text/rtf/package.html b/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/swing/text/rtf/package.html
rename to jdk/src/java.desktop/share/classes/javax/swing/text/rtf/package.html
diff --git a/jdk/src/share/classes/javax/swing/tree/AbstractLayoutCache.java b/jdk/src/java.desktop/share/classes/javax/swing/tree/AbstractLayoutCache.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/tree/AbstractLayoutCache.java
rename to jdk/src/java.desktop/share/classes/javax/swing/tree/AbstractLayoutCache.java
diff --git a/jdk/src/share/classes/javax/swing/tree/DefaultMutableTreeNode.java b/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultMutableTreeNode.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/tree/DefaultMutableTreeNode.java
rename to jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultMutableTreeNode.java
diff --git a/jdk/src/share/classes/javax/swing/tree/DefaultTreeCellEditor.java b/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellEditor.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/tree/DefaultTreeCellEditor.java
rename to jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellEditor.java
diff --git a/jdk/src/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java b/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java
rename to jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java
diff --git a/jdk/src/share/classes/javax/swing/tree/DefaultTreeModel.java b/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/tree/DefaultTreeModel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeModel.java
diff --git a/jdk/src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java b/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java
diff --git a/jdk/src/share/classes/javax/swing/tree/ExpandVetoException.java b/jdk/src/java.desktop/share/classes/javax/swing/tree/ExpandVetoException.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/tree/ExpandVetoException.java
rename to jdk/src/java.desktop/share/classes/javax/swing/tree/ExpandVetoException.java
diff --git a/jdk/src/share/classes/javax/swing/tree/FixedHeightLayoutCache.java b/jdk/src/java.desktop/share/classes/javax/swing/tree/FixedHeightLayoutCache.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/tree/FixedHeightLayoutCache.java
rename to jdk/src/java.desktop/share/classes/javax/swing/tree/FixedHeightLayoutCache.java
diff --git a/jdk/src/share/classes/javax/swing/tree/MutableTreeNode.java b/jdk/src/java.desktop/share/classes/javax/swing/tree/MutableTreeNode.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/tree/MutableTreeNode.java
rename to jdk/src/java.desktop/share/classes/javax/swing/tree/MutableTreeNode.java
diff --git a/jdk/src/share/classes/javax/swing/tree/RowMapper.java b/jdk/src/java.desktop/share/classes/javax/swing/tree/RowMapper.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/tree/RowMapper.java
rename to jdk/src/java.desktop/share/classes/javax/swing/tree/RowMapper.java
diff --git a/jdk/src/share/classes/javax/swing/tree/TreeCellEditor.java b/jdk/src/java.desktop/share/classes/javax/swing/tree/TreeCellEditor.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/tree/TreeCellEditor.java
rename to jdk/src/java.desktop/share/classes/javax/swing/tree/TreeCellEditor.java
diff --git a/jdk/src/share/classes/javax/swing/tree/TreeCellRenderer.java b/jdk/src/java.desktop/share/classes/javax/swing/tree/TreeCellRenderer.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/tree/TreeCellRenderer.java
rename to jdk/src/java.desktop/share/classes/javax/swing/tree/TreeCellRenderer.java
diff --git a/jdk/src/share/classes/javax/swing/tree/TreeModel.java b/jdk/src/java.desktop/share/classes/javax/swing/tree/TreeModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/tree/TreeModel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/tree/TreeModel.java
diff --git a/jdk/src/share/classes/javax/swing/tree/TreeNode.java b/jdk/src/java.desktop/share/classes/javax/swing/tree/TreeNode.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/tree/TreeNode.java
rename to jdk/src/java.desktop/share/classes/javax/swing/tree/TreeNode.java
diff --git a/jdk/src/share/classes/javax/swing/tree/TreePath.java b/jdk/src/java.desktop/share/classes/javax/swing/tree/TreePath.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/tree/TreePath.java
rename to jdk/src/java.desktop/share/classes/javax/swing/tree/TreePath.java
diff --git a/jdk/src/share/classes/javax/swing/tree/TreeSelectionModel.java b/jdk/src/java.desktop/share/classes/javax/swing/tree/TreeSelectionModel.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/tree/TreeSelectionModel.java
rename to jdk/src/java.desktop/share/classes/javax/swing/tree/TreeSelectionModel.java
diff --git a/jdk/src/share/classes/javax/swing/tree/VariableHeightLayoutCache.java b/jdk/src/java.desktop/share/classes/javax/swing/tree/VariableHeightLayoutCache.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/tree/VariableHeightLayoutCache.java
rename to jdk/src/java.desktop/share/classes/javax/swing/tree/VariableHeightLayoutCache.java
diff --git a/jdk/src/share/classes/javax/swing/tree/package.html b/jdk/src/java.desktop/share/classes/javax/swing/tree/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/swing/tree/package.html
rename to jdk/src/java.desktop/share/classes/javax/swing/tree/package.html
diff --git a/jdk/src/share/classes/javax/swing/undo/AbstractUndoableEdit.java b/jdk/src/java.desktop/share/classes/javax/swing/undo/AbstractUndoableEdit.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/undo/AbstractUndoableEdit.java
rename to jdk/src/java.desktop/share/classes/javax/swing/undo/AbstractUndoableEdit.java
diff --git a/jdk/src/share/classes/javax/swing/undo/CannotRedoException.java b/jdk/src/java.desktop/share/classes/javax/swing/undo/CannotRedoException.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/undo/CannotRedoException.java
rename to jdk/src/java.desktop/share/classes/javax/swing/undo/CannotRedoException.java
diff --git a/jdk/src/share/classes/javax/swing/undo/CannotUndoException.java b/jdk/src/java.desktop/share/classes/javax/swing/undo/CannotUndoException.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/undo/CannotUndoException.java
rename to jdk/src/java.desktop/share/classes/javax/swing/undo/CannotUndoException.java
diff --git a/jdk/src/share/classes/javax/swing/undo/CompoundEdit.java b/jdk/src/java.desktop/share/classes/javax/swing/undo/CompoundEdit.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/undo/CompoundEdit.java
rename to jdk/src/java.desktop/share/classes/javax/swing/undo/CompoundEdit.java
diff --git a/jdk/src/share/classes/javax/swing/undo/StateEdit.java b/jdk/src/java.desktop/share/classes/javax/swing/undo/StateEdit.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/undo/StateEdit.java
rename to jdk/src/java.desktop/share/classes/javax/swing/undo/StateEdit.java
diff --git a/jdk/src/share/classes/javax/swing/undo/StateEditable.java b/jdk/src/java.desktop/share/classes/javax/swing/undo/StateEditable.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/undo/StateEditable.java
rename to jdk/src/java.desktop/share/classes/javax/swing/undo/StateEditable.java
diff --git a/jdk/src/share/classes/javax/swing/undo/UndoManager.java b/jdk/src/java.desktop/share/classes/javax/swing/undo/UndoManager.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/undo/UndoManager.java
rename to jdk/src/java.desktop/share/classes/javax/swing/undo/UndoManager.java
diff --git a/jdk/src/share/classes/javax/swing/undo/UndoableEdit.java b/jdk/src/java.desktop/share/classes/javax/swing/undo/UndoableEdit.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/undo/UndoableEdit.java
rename to jdk/src/java.desktop/share/classes/javax/swing/undo/UndoableEdit.java
diff --git a/jdk/src/share/classes/javax/swing/undo/UndoableEditSupport.java b/jdk/src/java.desktop/share/classes/javax/swing/undo/UndoableEditSupport.java
similarity index 100%
rename from jdk/src/share/classes/javax/swing/undo/UndoableEditSupport.java
rename to jdk/src/java.desktop/share/classes/javax/swing/undo/UndoableEditSupport.java
diff --git a/jdk/src/share/classes/javax/swing/undo/doc-files/UndoManager-1.gif b/jdk/src/java.desktop/share/classes/javax/swing/undo/doc-files/UndoManager-1.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/undo/doc-files/UndoManager-1.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/undo/doc-files/UndoManager-1.gif
diff --git a/jdk/src/share/classes/javax/swing/undo/doc-files/UndoManager-2.gif b/jdk/src/java.desktop/share/classes/javax/swing/undo/doc-files/UndoManager-2.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/undo/doc-files/UndoManager-2.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/undo/doc-files/UndoManager-2.gif
diff --git a/jdk/src/share/classes/javax/swing/undo/doc-files/UndoManager-3.gif b/jdk/src/java.desktop/share/classes/javax/swing/undo/doc-files/UndoManager-3.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/undo/doc-files/UndoManager-3.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/undo/doc-files/UndoManager-3.gif
diff --git a/jdk/src/share/classes/javax/swing/undo/doc-files/UndoManager-4.gif b/jdk/src/java.desktop/share/classes/javax/swing/undo/doc-files/UndoManager-4.gif
similarity index 100%
rename from jdk/src/share/classes/javax/swing/undo/doc-files/UndoManager-4.gif
rename to jdk/src/java.desktop/share/classes/javax/swing/undo/doc-files/UndoManager-4.gif
diff --git a/jdk/src/share/classes/javax/swing/undo/package.html b/jdk/src/java.desktop/share/classes/javax/swing/undo/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/swing/undo/package.html
rename to jdk/src/java.desktop/share/classes/javax/swing/undo/package.html
diff --git a/jdk/src/share/classes/sun/applet/AppletAudioClip.java b/jdk/src/java.desktop/share/classes/sun/applet/AppletAudioClip.java
similarity index 100%
rename from jdk/src/share/classes/sun/applet/AppletAudioClip.java
rename to jdk/src/java.desktop/share/classes/sun/applet/AppletAudioClip.java
diff --git a/jdk/src/share/classes/sun/applet/AppletClassLoader.java b/jdk/src/java.desktop/share/classes/sun/applet/AppletClassLoader.java
similarity index 100%
rename from jdk/src/share/classes/sun/applet/AppletClassLoader.java
rename to jdk/src/java.desktop/share/classes/sun/applet/AppletClassLoader.java
diff --git a/jdk/src/share/classes/sun/applet/AppletEvent.java b/jdk/src/java.desktop/share/classes/sun/applet/AppletEvent.java
similarity index 100%
rename from jdk/src/share/classes/sun/applet/AppletEvent.java
rename to jdk/src/java.desktop/share/classes/sun/applet/AppletEvent.java
diff --git a/jdk/src/share/classes/sun/applet/AppletEventMulticaster.java b/jdk/src/java.desktop/share/classes/sun/applet/AppletEventMulticaster.java
similarity index 100%
rename from jdk/src/share/classes/sun/applet/AppletEventMulticaster.java
rename to jdk/src/java.desktop/share/classes/sun/applet/AppletEventMulticaster.java
diff --git a/jdk/src/share/classes/sun/applet/AppletIOException.java b/jdk/src/java.desktop/share/classes/sun/applet/AppletIOException.java
similarity index 100%
rename from jdk/src/share/classes/sun/applet/AppletIOException.java
rename to jdk/src/java.desktop/share/classes/sun/applet/AppletIOException.java
diff --git a/jdk/src/share/classes/sun/applet/AppletIllegalArgumentException.java b/jdk/src/java.desktop/share/classes/sun/applet/AppletIllegalArgumentException.java
similarity index 100%
rename from jdk/src/share/classes/sun/applet/AppletIllegalArgumentException.java
rename to jdk/src/java.desktop/share/classes/sun/applet/AppletIllegalArgumentException.java
diff --git a/jdk/src/share/classes/sun/applet/AppletImageRef.java b/jdk/src/java.desktop/share/classes/sun/applet/AppletImageRef.java
similarity index 100%
rename from jdk/src/share/classes/sun/applet/AppletImageRef.java
rename to jdk/src/java.desktop/share/classes/sun/applet/AppletImageRef.java
diff --git a/jdk/src/share/classes/sun/applet/AppletListener.java b/jdk/src/java.desktop/share/classes/sun/applet/AppletListener.java
similarity index 100%
rename from jdk/src/share/classes/sun/applet/AppletListener.java
rename to jdk/src/java.desktop/share/classes/sun/applet/AppletListener.java
diff --git a/jdk/src/share/classes/sun/applet/AppletMessageHandler.java b/jdk/src/java.desktop/share/classes/sun/applet/AppletMessageHandler.java
similarity index 100%
rename from jdk/src/share/classes/sun/applet/AppletMessageHandler.java
rename to jdk/src/java.desktop/share/classes/sun/applet/AppletMessageHandler.java
diff --git a/jdk/src/share/classes/sun/applet/AppletObjectInputStream.java b/jdk/src/java.desktop/share/classes/sun/applet/AppletObjectInputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/applet/AppletObjectInputStream.java
rename to jdk/src/java.desktop/share/classes/sun/applet/AppletObjectInputStream.java
diff --git a/jdk/src/share/classes/sun/applet/AppletPanel.java b/jdk/src/java.desktop/share/classes/sun/applet/AppletPanel.java
similarity index 100%
rename from jdk/src/share/classes/sun/applet/AppletPanel.java
rename to jdk/src/java.desktop/share/classes/sun/applet/AppletPanel.java
diff --git a/jdk/src/share/classes/sun/applet/AppletProps.java b/jdk/src/java.desktop/share/classes/sun/applet/AppletProps.java
similarity index 100%
rename from jdk/src/share/classes/sun/applet/AppletProps.java
rename to jdk/src/java.desktop/share/classes/sun/applet/AppletProps.java
diff --git a/jdk/src/share/classes/sun/applet/AppletResourceLoader.java b/jdk/src/java.desktop/share/classes/sun/applet/AppletResourceLoader.java
similarity index 100%
rename from jdk/src/share/classes/sun/applet/AppletResourceLoader.java
rename to jdk/src/java.desktop/share/classes/sun/applet/AppletResourceLoader.java
diff --git a/jdk/src/share/classes/sun/applet/AppletSecurity.java b/jdk/src/java.desktop/share/classes/sun/applet/AppletSecurity.java
similarity index 100%
rename from jdk/src/share/classes/sun/applet/AppletSecurity.java
rename to jdk/src/java.desktop/share/classes/sun/applet/AppletSecurity.java
diff --git a/jdk/src/share/classes/sun/applet/AppletSecurityException.java b/jdk/src/java.desktop/share/classes/sun/applet/AppletSecurityException.java
similarity index 100%
rename from jdk/src/share/classes/sun/applet/AppletSecurityException.java
rename to jdk/src/java.desktop/share/classes/sun/applet/AppletSecurityException.java
diff --git a/jdk/src/share/classes/sun/applet/AppletThreadGroup.java b/jdk/src/java.desktop/share/classes/sun/applet/AppletThreadGroup.java
similarity index 100%
rename from jdk/src/share/classes/sun/applet/AppletThreadGroup.java
rename to jdk/src/java.desktop/share/classes/sun/applet/AppletThreadGroup.java
diff --git a/jdk/src/share/classes/sun/applet/AppletViewer.java b/jdk/src/java.desktop/share/classes/sun/applet/AppletViewer.java
similarity index 100%
rename from jdk/src/share/classes/sun/applet/AppletViewer.java
rename to jdk/src/java.desktop/share/classes/sun/applet/AppletViewer.java
diff --git a/jdk/src/share/classes/sun/applet/AppletViewerFactory.java b/jdk/src/java.desktop/share/classes/sun/applet/AppletViewerFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/applet/AppletViewerFactory.java
rename to jdk/src/java.desktop/share/classes/sun/applet/AppletViewerFactory.java
diff --git a/jdk/src/share/classes/sun/applet/AppletViewerPanel.java b/jdk/src/java.desktop/share/classes/sun/applet/AppletViewerPanel.java
similarity index 100%
rename from jdk/src/share/classes/sun/applet/AppletViewerPanel.java
rename to jdk/src/java.desktop/share/classes/sun/applet/AppletViewerPanel.java
diff --git a/jdk/src/share/classes/sun/applet/Main.java b/jdk/src/java.desktop/share/classes/sun/applet/Main.java
similarity index 100%
rename from jdk/src/share/classes/sun/applet/Main.java
rename to jdk/src/java.desktop/share/classes/sun/applet/Main.java
diff --git a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer.java b/jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer.java
similarity index 100%
rename from jdk/src/share/classes/sun/applet/resources/MsgAppletViewer.java
rename to jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer.java
diff --git a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_de.java b/jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_de.java
similarity index 100%
rename from jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_de.java
rename to jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_de.java
diff --git a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_es.java b/jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_es.java
similarity index 100%
rename from jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_es.java
rename to jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_es.java
diff --git a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_fr.java b/jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_fr.java
similarity index 100%
rename from jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_fr.java
rename to jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_fr.java
diff --git a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_it.java b/jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_it.java
similarity index 100%
rename from jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_it.java
rename to jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_it.java
diff --git a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_ja.java b/jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_ja.java
similarity index 100%
rename from jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_ja.java
rename to jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_ja.java
diff --git a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_ko.java b/jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_ko.java
similarity index 100%
rename from jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_ko.java
rename to jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_ko.java
diff --git a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java b/jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java
similarity index 100%
rename from jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java
rename to jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java
diff --git a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_sv.java b/jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_sv.java
similarity index 100%
rename from jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_sv.java
rename to jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_sv.java
diff --git a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_zh_CN.java b/jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_zh_CN.java
similarity index 100%
rename from jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_zh_CN.java
rename to jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_zh_CN.java
diff --git a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_zh_TW.java b/jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_zh_TW.java
similarity index 100%
rename from jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_zh_TW.java
rename to jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_zh_TW.java
diff --git a/jdk/src/share/classes/sun/awt/AWTAccessor.java b/jdk/src/java.desktop/share/classes/sun/awt/AWTAccessor.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/AWTAccessor.java
rename to jdk/src/java.desktop/share/classes/sun/awt/AWTAccessor.java
diff --git a/jdk/src/share/classes/sun/awt/AWTAutoShutdown.java b/jdk/src/java.desktop/share/classes/sun/awt/AWTAutoShutdown.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/AWTAutoShutdown.java
rename to jdk/src/java.desktop/share/classes/sun/awt/AWTAutoShutdown.java
diff --git a/jdk/src/share/classes/sun/awt/AWTCharset.java b/jdk/src/java.desktop/share/classes/sun/awt/AWTCharset.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/AWTCharset.java
rename to jdk/src/java.desktop/share/classes/sun/awt/AWTCharset.java
diff --git a/jdk/src/share/classes/sun/awt/AWTPermissions.java b/jdk/src/java.desktop/share/classes/sun/awt/AWTPermissions.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/AWTPermissions.java
rename to jdk/src/java.desktop/share/classes/sun/awt/AWTPermissions.java
diff --git a/jdk/src/share/classes/sun/awt/AWTSecurityManager.java b/jdk/src/java.desktop/share/classes/sun/awt/AWTSecurityManager.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/AWTSecurityManager.java
rename to jdk/src/java.desktop/share/classes/sun/awt/AWTSecurityManager.java
diff --git a/jdk/src/share/classes/sun/awt/AppContext.java b/jdk/src/java.desktop/share/classes/sun/awt/AppContext.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/AppContext.java
rename to jdk/src/java.desktop/share/classes/sun/awt/AppContext.java
diff --git a/jdk/src/share/classes/sun/awt/CausedFocusEvent.java b/jdk/src/java.desktop/share/classes/sun/awt/CausedFocusEvent.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/CausedFocusEvent.java
rename to jdk/src/java.desktop/share/classes/sun/awt/CausedFocusEvent.java
diff --git a/jdk/src/share/classes/sun/awt/CharsetString.java b/jdk/src/java.desktop/share/classes/sun/awt/CharsetString.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/CharsetString.java
rename to jdk/src/java.desktop/share/classes/sun/awt/CharsetString.java
diff --git a/jdk/src/share/classes/sun/awt/ComponentFactory.java b/jdk/src/java.desktop/share/classes/sun/awt/ComponentFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/ComponentFactory.java
rename to jdk/src/java.desktop/share/classes/sun/awt/ComponentFactory.java
diff --git a/jdk/src/share/classes/sun/awt/ConstrainableGraphics.java b/jdk/src/java.desktop/share/classes/sun/awt/ConstrainableGraphics.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/ConstrainableGraphics.java
rename to jdk/src/java.desktop/share/classes/sun/awt/ConstrainableGraphics.java
diff --git a/jdk/src/share/classes/sun/awt/CustomCursor.java b/jdk/src/java.desktop/share/classes/sun/awt/CustomCursor.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/CustomCursor.java
rename to jdk/src/java.desktop/share/classes/sun/awt/CustomCursor.java
diff --git a/jdk/src/share/classes/sun/awt/DebugSettings.java b/jdk/src/java.desktop/share/classes/sun/awt/DebugSettings.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/DebugSettings.java
rename to jdk/src/java.desktop/share/classes/sun/awt/DebugSettings.java
diff --git a/jdk/src/share/classes/sun/awt/DefaultMouseInfoPeer.java b/jdk/src/java.desktop/share/classes/sun/awt/DefaultMouseInfoPeer.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/DefaultMouseInfoPeer.java
rename to jdk/src/java.desktop/share/classes/sun/awt/DefaultMouseInfoPeer.java
diff --git a/jdk/src/share/classes/sun/awt/DesktopBrowse.java b/jdk/src/java.desktop/share/classes/sun/awt/DesktopBrowse.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/DesktopBrowse.java
rename to jdk/src/java.desktop/share/classes/sun/awt/DesktopBrowse.java
diff --git a/jdk/src/share/classes/sun/awt/DisplayChangedListener.java b/jdk/src/java.desktop/share/classes/sun/awt/DisplayChangedListener.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/DisplayChangedListener.java
rename to jdk/src/java.desktop/share/classes/sun/awt/DisplayChangedListener.java
diff --git a/jdk/src/share/classes/sun/awt/EmbeddedFrame.java b/jdk/src/java.desktop/share/classes/sun/awt/EmbeddedFrame.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/EmbeddedFrame.java
rename to jdk/src/java.desktop/share/classes/sun/awt/EmbeddedFrame.java
diff --git a/jdk/src/share/classes/sun/awt/EventQueueItem.java b/jdk/src/java.desktop/share/classes/sun/awt/EventQueueItem.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/EventQueueItem.java
rename to jdk/src/java.desktop/share/classes/sun/awt/EventQueueItem.java
diff --git a/jdk/src/share/classes/sun/awt/ExtendedKeyCodes.java b/jdk/src/java.desktop/share/classes/sun/awt/ExtendedKeyCodes.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/ExtendedKeyCodes.java
rename to jdk/src/java.desktop/share/classes/sun/awt/ExtendedKeyCodes.java
diff --git a/jdk/src/share/classes/sun/awt/FontConfiguration.java b/jdk/src/java.desktop/share/classes/sun/awt/FontConfiguration.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/FontConfiguration.java
rename to jdk/src/java.desktop/share/classes/sun/awt/FontConfiguration.java
diff --git a/jdk/src/share/classes/sun/awt/FontDescriptor.java b/jdk/src/java.desktop/share/classes/sun/awt/FontDescriptor.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/FontDescriptor.java
rename to jdk/src/java.desktop/share/classes/sun/awt/FontDescriptor.java
diff --git a/jdk/src/share/classes/sun/awt/FwDispatcher.java b/jdk/src/java.desktop/share/classes/sun/awt/FwDispatcher.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/FwDispatcher.java
rename to jdk/src/java.desktop/share/classes/sun/awt/FwDispatcher.java
diff --git a/jdk/src/share/classes/sun/awt/GlobalCursorManager.java b/jdk/src/java.desktop/share/classes/sun/awt/GlobalCursorManager.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/GlobalCursorManager.java
rename to jdk/src/java.desktop/share/classes/sun/awt/GlobalCursorManager.java
diff --git a/jdk/src/share/classes/sun/awt/Graphics2Delegate.java b/jdk/src/java.desktop/share/classes/sun/awt/Graphics2Delegate.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/Graphics2Delegate.java
rename to jdk/src/java.desktop/share/classes/sun/awt/Graphics2Delegate.java
diff --git a/jdk/src/share/classes/sun/awt/HKSCS.java b/jdk/src/java.desktop/share/classes/sun/awt/HKSCS.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/HKSCS.java
rename to jdk/src/java.desktop/share/classes/sun/awt/HKSCS.java
diff --git a/jdk/src/share/classes/sun/awt/HToolkit.java b/jdk/src/java.desktop/share/classes/sun/awt/HToolkit.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/HToolkit.java
rename to jdk/src/java.desktop/share/classes/sun/awt/HToolkit.java
diff --git a/jdk/src/share/classes/sun/awt/HeadlessToolkit.java b/jdk/src/java.desktop/share/classes/sun/awt/HeadlessToolkit.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/HeadlessToolkit.java
rename to jdk/src/java.desktop/share/classes/sun/awt/HeadlessToolkit.java
diff --git a/jdk/src/share/classes/sun/awt/IconInfo.java b/jdk/src/java.desktop/share/classes/sun/awt/IconInfo.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/IconInfo.java
rename to jdk/src/java.desktop/share/classes/sun/awt/IconInfo.java
diff --git a/jdk/src/share/classes/sun/awt/InputMethodSupport.java b/jdk/src/java.desktop/share/classes/sun/awt/InputMethodSupport.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/InputMethodSupport.java
rename to jdk/src/java.desktop/share/classes/sun/awt/InputMethodSupport.java
diff --git a/jdk/src/share/classes/sun/awt/KeyboardFocusManagerPeerImpl.java b/jdk/src/java.desktop/share/classes/sun/awt/KeyboardFocusManagerPeerImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/KeyboardFocusManagerPeerImpl.java
rename to jdk/src/java.desktop/share/classes/sun/awt/KeyboardFocusManagerPeerImpl.java
diff --git a/jdk/src/share/classes/sun/awt/KeyboardFocusManagerPeerProvider.java b/jdk/src/java.desktop/share/classes/sun/awt/KeyboardFocusManagerPeerProvider.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/KeyboardFocusManagerPeerProvider.java
rename to jdk/src/java.desktop/share/classes/sun/awt/KeyboardFocusManagerPeerProvider.java
diff --git a/jdk/src/share/classes/sun/awt/LightweightFrame.java b/jdk/src/java.desktop/share/classes/sun/awt/LightweightFrame.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/LightweightFrame.java
rename to jdk/src/java.desktop/share/classes/sun/awt/LightweightFrame.java
diff --git a/jdk/src/share/classes/sun/awt/ModalExclude.java b/jdk/src/java.desktop/share/classes/sun/awt/ModalExclude.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/ModalExclude.java
rename to jdk/src/java.desktop/share/classes/sun/awt/ModalExclude.java
diff --git a/jdk/src/share/classes/sun/awt/ModalityEvent.java b/jdk/src/java.desktop/share/classes/sun/awt/ModalityEvent.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/ModalityEvent.java
rename to jdk/src/java.desktop/share/classes/sun/awt/ModalityEvent.java
diff --git a/jdk/src/share/classes/sun/awt/ModalityListener.java b/jdk/src/java.desktop/share/classes/sun/awt/ModalityListener.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/ModalityListener.java
rename to jdk/src/java.desktop/share/classes/sun/awt/ModalityListener.java
diff --git a/jdk/src/share/classes/sun/awt/Mutex.java b/jdk/src/java.desktop/share/classes/sun/awt/Mutex.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/Mutex.java
rename to jdk/src/java.desktop/share/classes/sun/awt/Mutex.java
diff --git a/jdk/src/share/classes/sun/awt/NativeLibLoader.java b/jdk/src/java.desktop/share/classes/sun/awt/NativeLibLoader.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/NativeLibLoader.java
rename to jdk/src/java.desktop/share/classes/sun/awt/NativeLibLoader.java
diff --git a/jdk/src/share/classes/sun/awt/NullComponentPeer.java b/jdk/src/java.desktop/share/classes/sun/awt/NullComponentPeer.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/NullComponentPeer.java
rename to jdk/src/java.desktop/share/classes/sun/awt/NullComponentPeer.java
diff --git a/jdk/src/share/classes/sun/awt/OSInfo.java b/jdk/src/java.desktop/share/classes/sun/awt/OSInfo.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/OSInfo.java
rename to jdk/src/java.desktop/share/classes/sun/awt/OSInfo.java
diff --git a/jdk/src/share/classes/sun/awt/PaintEventDispatcher.java b/jdk/src/java.desktop/share/classes/sun/awt/PaintEventDispatcher.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/PaintEventDispatcher.java
rename to jdk/src/java.desktop/share/classes/sun/awt/PaintEventDispatcher.java
diff --git a/jdk/src/share/classes/sun/awt/PeerEvent.java b/jdk/src/java.desktop/share/classes/sun/awt/PeerEvent.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/PeerEvent.java
rename to jdk/src/java.desktop/share/classes/sun/awt/PeerEvent.java
diff --git a/jdk/src/share/classes/sun/awt/PlatformFont.java b/jdk/src/java.desktop/share/classes/sun/awt/PlatformFont.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/PlatformFont.java
rename to jdk/src/java.desktop/share/classes/sun/awt/PlatformFont.java
diff --git a/jdk/src/share/classes/sun/awt/RepaintArea.java b/jdk/src/java.desktop/share/classes/sun/awt/RepaintArea.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/RepaintArea.java
rename to jdk/src/java.desktop/share/classes/sun/awt/RepaintArea.java
diff --git a/jdk/src/share/classes/sun/awt/RequestFocusController.java b/jdk/src/java.desktop/share/classes/sun/awt/RequestFocusController.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/RequestFocusController.java
rename to jdk/src/java.desktop/share/classes/sun/awt/RequestFocusController.java
diff --git a/jdk/src/share/classes/sun/awt/ScrollPaneWheelScroller.java b/jdk/src/java.desktop/share/classes/sun/awt/ScrollPaneWheelScroller.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/ScrollPaneWheelScroller.java
rename to jdk/src/java.desktop/share/classes/sun/awt/ScrollPaneWheelScroller.java
diff --git a/jdk/src/share/classes/sun/awt/SubRegionShowable.java b/jdk/src/java.desktop/share/classes/sun/awt/SubRegionShowable.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/SubRegionShowable.java
rename to jdk/src/java.desktop/share/classes/sun/awt/SubRegionShowable.java
diff --git a/jdk/src/share/classes/sun/awt/SunDisplayChanger.java b/jdk/src/java.desktop/share/classes/sun/awt/SunDisplayChanger.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/SunDisplayChanger.java
rename to jdk/src/java.desktop/share/classes/sun/awt/SunDisplayChanger.java
diff --git a/jdk/src/share/classes/sun/awt/SunGraphicsCallback.java b/jdk/src/java.desktop/share/classes/sun/awt/SunGraphicsCallback.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/SunGraphicsCallback.java
rename to jdk/src/java.desktop/share/classes/sun/awt/SunGraphicsCallback.java
diff --git a/jdk/src/share/classes/sun/awt/SunHints.java b/jdk/src/java.desktop/share/classes/sun/awt/SunHints.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/SunHints.java
rename to jdk/src/java.desktop/share/classes/sun/awt/SunHints.java
diff --git a/jdk/src/share/classes/sun/awt/SunToolkit.java b/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/SunToolkit.java
rename to jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java
diff --git a/jdk/src/share/classes/sun/awt/Symbol.java b/jdk/src/java.desktop/share/classes/sun/awt/Symbol.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/Symbol.java
rename to jdk/src/java.desktop/share/classes/sun/awt/Symbol.java
diff --git a/jdk/src/share/classes/sun/awt/TimedWindowEvent.java b/jdk/src/java.desktop/share/classes/sun/awt/TimedWindowEvent.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/TimedWindowEvent.java
rename to jdk/src/java.desktop/share/classes/sun/awt/TimedWindowEvent.java
diff --git a/jdk/src/share/classes/sun/awt/TracedEventQueue.java b/jdk/src/java.desktop/share/classes/sun/awt/TracedEventQueue.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/TracedEventQueue.java
rename to jdk/src/java.desktop/share/classes/sun/awt/TracedEventQueue.java
diff --git a/jdk/src/share/classes/sun/awt/UngrabEvent.java b/jdk/src/java.desktop/share/classes/sun/awt/UngrabEvent.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/UngrabEvent.java
rename to jdk/src/java.desktop/share/classes/sun/awt/UngrabEvent.java
diff --git a/jdk/src/share/classes/sun/awt/WindowIDProvider.java b/jdk/src/java.desktop/share/classes/sun/awt/WindowIDProvider.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/WindowIDProvider.java
rename to jdk/src/java.desktop/share/classes/sun/awt/WindowIDProvider.java
diff --git a/jdk/src/share/classes/sun/awt/datatransfer/ClipboardTransferable.java b/jdk/src/java.desktop/share/classes/sun/awt/datatransfer/ClipboardTransferable.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/datatransfer/ClipboardTransferable.java
rename to jdk/src/java.desktop/share/classes/sun/awt/datatransfer/ClipboardTransferable.java
diff --git a/jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java b/jdk/src/java.desktop/share/classes/sun/awt/datatransfer/DataTransferer.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java
rename to jdk/src/java.desktop/share/classes/sun/awt/datatransfer/DataTransferer.java
diff --git a/jdk/src/share/classes/sun/awt/datatransfer/DesktopDatatransferServiceImpl.java b/jdk/src/java.desktop/share/classes/sun/awt/datatransfer/DesktopDatatransferServiceImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/datatransfer/DesktopDatatransferServiceImpl.java
rename to jdk/src/java.desktop/share/classes/sun/awt/datatransfer/DesktopDatatransferServiceImpl.java
diff --git a/jdk/src/share/classes/sun/awt/datatransfer/META-INF/services/sun.datatransfer.DesktopDatatransferService b/jdk/src/java.desktop/share/classes/sun/awt/datatransfer/META-INF/services/sun.datatransfer.DesktopDatatransferService
similarity index 100%
rename from jdk/src/share/classes/sun/awt/datatransfer/META-INF/services/sun.datatransfer.DesktopDatatransferService
rename to jdk/src/java.desktop/share/classes/sun/awt/datatransfer/META-INF/services/sun.datatransfer.DesktopDatatransferService
diff --git a/jdk/src/share/classes/sun/awt/datatransfer/SunClipboard.java b/jdk/src/java.desktop/share/classes/sun/awt/datatransfer/SunClipboard.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/datatransfer/SunClipboard.java
rename to jdk/src/java.desktop/share/classes/sun/awt/datatransfer/SunClipboard.java
diff --git a/jdk/src/share/classes/sun/awt/datatransfer/ToolkitThreadBlockedHandler.java b/jdk/src/java.desktop/share/classes/sun/awt/datatransfer/ToolkitThreadBlockedHandler.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/datatransfer/ToolkitThreadBlockedHandler.java
rename to jdk/src/java.desktop/share/classes/sun/awt/datatransfer/ToolkitThreadBlockedHandler.java
diff --git a/jdk/src/share/classes/sun/awt/datatransfer/TransferableProxy.java b/jdk/src/java.desktop/share/classes/sun/awt/datatransfer/TransferableProxy.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/datatransfer/TransferableProxy.java
rename to jdk/src/java.desktop/share/classes/sun/awt/datatransfer/TransferableProxy.java
diff --git a/jdk/src/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java b/jdk/src/java.desktop/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java
rename to jdk/src/java.desktop/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java
diff --git a/jdk/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java b/jdk/src/java.desktop/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java
rename to jdk/src/java.desktop/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java
diff --git a/jdk/src/share/classes/sun/awt/dnd/SunDropTargetEvent.java b/jdk/src/java.desktop/share/classes/sun/awt/dnd/SunDropTargetEvent.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/dnd/SunDropTargetEvent.java
rename to jdk/src/java.desktop/share/classes/sun/awt/dnd/SunDropTargetEvent.java
diff --git a/jdk/src/share/classes/sun/awt/event/IgnorePaintEvent.java b/jdk/src/java.desktop/share/classes/sun/awt/event/IgnorePaintEvent.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/event/IgnorePaintEvent.java
rename to jdk/src/java.desktop/share/classes/sun/awt/event/IgnorePaintEvent.java
diff --git a/jdk/src/share/classes/sun/awt/geom/AreaOp.java b/jdk/src/java.desktop/share/classes/sun/awt/geom/AreaOp.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/geom/AreaOp.java
rename to jdk/src/java.desktop/share/classes/sun/awt/geom/AreaOp.java
diff --git a/jdk/src/share/classes/sun/awt/geom/ChainEnd.java b/jdk/src/java.desktop/share/classes/sun/awt/geom/ChainEnd.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/geom/ChainEnd.java
rename to jdk/src/java.desktop/share/classes/sun/awt/geom/ChainEnd.java
diff --git a/jdk/src/share/classes/sun/awt/geom/Crossings.java b/jdk/src/java.desktop/share/classes/sun/awt/geom/Crossings.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/geom/Crossings.java
rename to jdk/src/java.desktop/share/classes/sun/awt/geom/Crossings.java
diff --git a/jdk/src/share/classes/sun/awt/geom/Curve.java b/jdk/src/java.desktop/share/classes/sun/awt/geom/Curve.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/geom/Curve.java
rename to jdk/src/java.desktop/share/classes/sun/awt/geom/Curve.java
diff --git a/jdk/src/share/classes/sun/awt/geom/CurveLink.java b/jdk/src/java.desktop/share/classes/sun/awt/geom/CurveLink.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/geom/CurveLink.java
rename to jdk/src/java.desktop/share/classes/sun/awt/geom/CurveLink.java
diff --git a/jdk/src/share/classes/sun/awt/geom/Edge.java b/jdk/src/java.desktop/share/classes/sun/awt/geom/Edge.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/geom/Edge.java
rename to jdk/src/java.desktop/share/classes/sun/awt/geom/Edge.java
diff --git a/jdk/src/share/classes/sun/awt/geom/Order0.java b/jdk/src/java.desktop/share/classes/sun/awt/geom/Order0.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/geom/Order0.java
rename to jdk/src/java.desktop/share/classes/sun/awt/geom/Order0.java
diff --git a/jdk/src/share/classes/sun/awt/geom/Order1.java b/jdk/src/java.desktop/share/classes/sun/awt/geom/Order1.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/geom/Order1.java
rename to jdk/src/java.desktop/share/classes/sun/awt/geom/Order1.java
diff --git a/jdk/src/share/classes/sun/awt/geom/Order2.java b/jdk/src/java.desktop/share/classes/sun/awt/geom/Order2.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/geom/Order2.java
rename to jdk/src/java.desktop/share/classes/sun/awt/geom/Order2.java
diff --git a/jdk/src/share/classes/sun/awt/geom/Order3.java b/jdk/src/java.desktop/share/classes/sun/awt/geom/Order3.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/geom/Order3.java
rename to jdk/src/java.desktop/share/classes/sun/awt/geom/Order3.java
diff --git a/jdk/src/share/classes/sun/awt/geom/PathConsumer2D.java b/jdk/src/java.desktop/share/classes/sun/awt/geom/PathConsumer2D.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/geom/PathConsumer2D.java
rename to jdk/src/java.desktop/share/classes/sun/awt/geom/PathConsumer2D.java
diff --git a/jdk/src/share/classes/sun/awt/im/CompositionArea.java b/jdk/src/java.desktop/share/classes/sun/awt/im/CompositionArea.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/im/CompositionArea.java
rename to jdk/src/java.desktop/share/classes/sun/awt/im/CompositionArea.java
diff --git a/jdk/src/share/classes/sun/awt/im/CompositionAreaHandler.java b/jdk/src/java.desktop/share/classes/sun/awt/im/CompositionAreaHandler.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/im/CompositionAreaHandler.java
rename to jdk/src/java.desktop/share/classes/sun/awt/im/CompositionAreaHandler.java
diff --git a/jdk/src/share/classes/sun/awt/im/ExecutableInputMethodManager.java b/jdk/src/java.desktop/share/classes/sun/awt/im/ExecutableInputMethodManager.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/im/ExecutableInputMethodManager.java
rename to jdk/src/java.desktop/share/classes/sun/awt/im/ExecutableInputMethodManager.java
diff --git a/jdk/src/share/classes/sun/awt/im/InputContext.java b/jdk/src/java.desktop/share/classes/sun/awt/im/InputContext.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/im/InputContext.java
rename to jdk/src/java.desktop/share/classes/sun/awt/im/InputContext.java
diff --git a/jdk/src/share/classes/sun/awt/im/InputMethodAdapter.java b/jdk/src/java.desktop/share/classes/sun/awt/im/InputMethodAdapter.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/im/InputMethodAdapter.java
rename to jdk/src/java.desktop/share/classes/sun/awt/im/InputMethodAdapter.java
diff --git a/jdk/src/share/classes/sun/awt/im/InputMethodContext.java b/jdk/src/java.desktop/share/classes/sun/awt/im/InputMethodContext.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/im/InputMethodContext.java
rename to jdk/src/java.desktop/share/classes/sun/awt/im/InputMethodContext.java
diff --git a/jdk/src/share/classes/sun/awt/im/InputMethodJFrame.java b/jdk/src/java.desktop/share/classes/sun/awt/im/InputMethodJFrame.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/im/InputMethodJFrame.java
rename to jdk/src/java.desktop/share/classes/sun/awt/im/InputMethodJFrame.java
diff --git a/jdk/src/share/classes/sun/awt/im/InputMethodLocator.java b/jdk/src/java.desktop/share/classes/sun/awt/im/InputMethodLocator.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/im/InputMethodLocator.java
rename to jdk/src/java.desktop/share/classes/sun/awt/im/InputMethodLocator.java
diff --git a/jdk/src/share/classes/sun/awt/im/InputMethodManager.java b/jdk/src/java.desktop/share/classes/sun/awt/im/InputMethodManager.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/im/InputMethodManager.java
rename to jdk/src/java.desktop/share/classes/sun/awt/im/InputMethodManager.java
diff --git a/jdk/src/share/classes/sun/awt/im/InputMethodPopupMenu.java b/jdk/src/java.desktop/share/classes/sun/awt/im/InputMethodPopupMenu.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/im/InputMethodPopupMenu.java
rename to jdk/src/java.desktop/share/classes/sun/awt/im/InputMethodPopupMenu.java
diff --git a/jdk/src/share/classes/sun/awt/im/InputMethodWindow.java b/jdk/src/java.desktop/share/classes/sun/awt/im/InputMethodWindow.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/im/InputMethodWindow.java
rename to jdk/src/java.desktop/share/classes/sun/awt/im/InputMethodWindow.java
diff --git a/jdk/src/share/classes/sun/awt/im/SimpleInputMethodWindow.java b/jdk/src/java.desktop/share/classes/sun/awt/im/SimpleInputMethodWindow.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/im/SimpleInputMethodWindow.java
rename to jdk/src/java.desktop/share/classes/sun/awt/im/SimpleInputMethodWindow.java
diff --git a/jdk/src/share/classes/sun/awt/image/AbstractMultiResolutionImage.java b/jdk/src/java.desktop/share/classes/sun/awt/image/AbstractMultiResolutionImage.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/AbstractMultiResolutionImage.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/AbstractMultiResolutionImage.java
diff --git a/jdk/src/share/classes/sun/awt/image/BadDepthException.java b/jdk/src/java.desktop/share/classes/sun/awt/image/BadDepthException.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/BadDepthException.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/BadDepthException.java
diff --git a/jdk/src/share/classes/sun/awt/image/BufImgSurfaceData.java b/jdk/src/java.desktop/share/classes/sun/awt/image/BufImgSurfaceData.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/BufImgSurfaceData.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/BufImgSurfaceData.java
diff --git a/jdk/src/share/classes/sun/awt/image/BufImgSurfaceManager.java b/jdk/src/java.desktop/share/classes/sun/awt/image/BufImgSurfaceManager.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/BufImgSurfaceManager.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/BufImgSurfaceManager.java
diff --git a/jdk/src/share/classes/sun/awt/image/BufImgVolatileSurfaceManager.java b/jdk/src/java.desktop/share/classes/sun/awt/image/BufImgVolatileSurfaceManager.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/BufImgVolatileSurfaceManager.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/BufImgVolatileSurfaceManager.java
diff --git a/jdk/src/share/classes/sun/awt/image/BufferedImageDevice.java b/jdk/src/java.desktop/share/classes/sun/awt/image/BufferedImageDevice.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/BufferedImageDevice.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/BufferedImageDevice.java
diff --git a/jdk/src/share/classes/sun/awt/image/BufferedImageGraphicsConfig.java b/jdk/src/java.desktop/share/classes/sun/awt/image/BufferedImageGraphicsConfig.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/BufferedImageGraphicsConfig.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/BufferedImageGraphicsConfig.java
diff --git a/jdk/src/share/classes/sun/awt/image/ByteArrayImageSource.java b/jdk/src/java.desktop/share/classes/sun/awt/image/ByteArrayImageSource.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/ByteArrayImageSource.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/ByteArrayImageSource.java
diff --git a/jdk/src/share/classes/sun/awt/image/ByteBandedRaster.java b/jdk/src/java.desktop/share/classes/sun/awt/image/ByteBandedRaster.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/ByteBandedRaster.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/ByteBandedRaster.java
diff --git a/jdk/src/share/classes/sun/awt/image/ByteComponentRaster.java b/jdk/src/java.desktop/share/classes/sun/awt/image/ByteComponentRaster.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/ByteComponentRaster.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/ByteComponentRaster.java
diff --git a/jdk/src/share/classes/sun/awt/image/ByteInterleavedRaster.java b/jdk/src/java.desktop/share/classes/sun/awt/image/ByteInterleavedRaster.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/ByteInterleavedRaster.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/ByteInterleavedRaster.java
diff --git a/jdk/src/share/classes/sun/awt/image/BytePackedRaster.java b/jdk/src/java.desktop/share/classes/sun/awt/image/BytePackedRaster.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/BytePackedRaster.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/BytePackedRaster.java
diff --git a/jdk/src/share/classes/sun/awt/image/DataBufferNative.java b/jdk/src/java.desktop/share/classes/sun/awt/image/DataBufferNative.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/DataBufferNative.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/DataBufferNative.java
diff --git a/jdk/src/share/classes/sun/awt/image/FileImageSource.java b/jdk/src/java.desktop/share/classes/sun/awt/image/FileImageSource.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/FileImageSource.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/FileImageSource.java
diff --git a/jdk/src/share/classes/sun/awt/image/GifImageDecoder.java b/jdk/src/java.desktop/share/classes/sun/awt/image/GifImageDecoder.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/GifImageDecoder.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/GifImageDecoder.java
diff --git a/jdk/src/share/classes/sun/awt/image/ImageAccessException.java b/jdk/src/java.desktop/share/classes/sun/awt/image/ImageAccessException.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/ImageAccessException.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/ImageAccessException.java
diff --git a/jdk/src/share/classes/sun/awt/image/ImageCache.java b/jdk/src/java.desktop/share/classes/sun/awt/image/ImageCache.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/ImageCache.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/ImageCache.java
diff --git a/jdk/src/share/classes/sun/awt/image/ImageConsumerQueue.java b/jdk/src/java.desktop/share/classes/sun/awt/image/ImageConsumerQueue.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/ImageConsumerQueue.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/ImageConsumerQueue.java
diff --git a/jdk/src/share/classes/sun/awt/image/ImageDecoder.java b/jdk/src/java.desktop/share/classes/sun/awt/image/ImageDecoder.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/ImageDecoder.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/ImageDecoder.java
diff --git a/jdk/src/share/classes/sun/awt/image/ImageFetchable.java b/jdk/src/java.desktop/share/classes/sun/awt/image/ImageFetchable.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/ImageFetchable.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/ImageFetchable.java
diff --git a/jdk/src/share/classes/sun/awt/image/ImageFetcher.java b/jdk/src/java.desktop/share/classes/sun/awt/image/ImageFetcher.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/ImageFetcher.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/ImageFetcher.java
diff --git a/jdk/src/share/classes/sun/awt/image/ImageFormatException.java b/jdk/src/java.desktop/share/classes/sun/awt/image/ImageFormatException.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/ImageFormatException.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/ImageFormatException.java
diff --git a/jdk/src/share/classes/sun/awt/image/ImageRepresentation.java b/jdk/src/java.desktop/share/classes/sun/awt/image/ImageRepresentation.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/ImageRepresentation.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/ImageRepresentation.java
diff --git a/jdk/src/share/classes/sun/awt/image/ImageWatched.java b/jdk/src/java.desktop/share/classes/sun/awt/image/ImageWatched.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/ImageWatched.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/ImageWatched.java
diff --git a/jdk/src/share/classes/sun/awt/image/ImagingLib.java b/jdk/src/java.desktop/share/classes/sun/awt/image/ImagingLib.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/ImagingLib.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/ImagingLib.java
diff --git a/jdk/src/share/classes/sun/awt/image/InputStreamImageSource.java b/jdk/src/java.desktop/share/classes/sun/awt/image/InputStreamImageSource.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/InputStreamImageSource.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/InputStreamImageSource.java
diff --git a/jdk/src/share/classes/sun/awt/image/IntegerComponentRaster.java b/jdk/src/java.desktop/share/classes/sun/awt/image/IntegerComponentRaster.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/IntegerComponentRaster.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/IntegerComponentRaster.java
diff --git a/jdk/src/share/classes/sun/awt/image/IntegerInterleavedRaster.java b/jdk/src/java.desktop/share/classes/sun/awt/image/IntegerInterleavedRaster.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/IntegerInterleavedRaster.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/IntegerInterleavedRaster.java
diff --git a/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java b/jdk/src/java.desktop/share/classes/sun/awt/image/JPEGImageDecoder.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/JPEGImageDecoder.java
diff --git a/jdk/src/share/classes/sun/awt/image/MultiResolutionCachedImage.java b/jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionCachedImage.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/MultiResolutionCachedImage.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionCachedImage.java
diff --git a/jdk/src/share/classes/sun/awt/image/MultiResolutionImage.java b/jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionImage.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/MultiResolutionImage.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionImage.java
diff --git a/jdk/src/share/classes/sun/awt/image/MultiResolutionToolkitImage.java b/jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionToolkitImage.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/MultiResolutionToolkitImage.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionToolkitImage.java
diff --git a/jdk/src/share/classes/sun/awt/image/NativeLibLoader.java b/jdk/src/java.desktop/share/classes/sun/awt/image/NativeLibLoader.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/NativeLibLoader.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/NativeLibLoader.java
diff --git a/jdk/src/share/classes/sun/awt/image/OffScreenImage.java b/jdk/src/java.desktop/share/classes/sun/awt/image/OffScreenImage.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/OffScreenImage.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/OffScreenImage.java
diff --git a/jdk/src/share/classes/sun/awt/image/OffScreenImageSource.java b/jdk/src/java.desktop/share/classes/sun/awt/image/OffScreenImageSource.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/OffScreenImageSource.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/OffScreenImageSource.java
diff --git a/jdk/src/share/classes/sun/awt/image/PNGImageDecoder.java b/jdk/src/java.desktop/share/classes/sun/awt/image/PNGImageDecoder.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/PNGImageDecoder.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/PNGImageDecoder.java
diff --git a/jdk/src/share/classes/sun/awt/image/PixelConverter.java b/jdk/src/java.desktop/share/classes/sun/awt/image/PixelConverter.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/PixelConverter.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/PixelConverter.java
diff --git a/jdk/src/share/classes/sun/awt/image/ShortBandedRaster.java b/jdk/src/java.desktop/share/classes/sun/awt/image/ShortBandedRaster.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/ShortBandedRaster.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/ShortBandedRaster.java
diff --git a/jdk/src/share/classes/sun/awt/image/ShortComponentRaster.java b/jdk/src/java.desktop/share/classes/sun/awt/image/ShortComponentRaster.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/ShortComponentRaster.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/ShortComponentRaster.java
diff --git a/jdk/src/share/classes/sun/awt/image/ShortInterleavedRaster.java b/jdk/src/java.desktop/share/classes/sun/awt/image/ShortInterleavedRaster.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/ShortInterleavedRaster.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/ShortInterleavedRaster.java
diff --git a/jdk/src/share/classes/sun/awt/image/SunVolatileImage.java b/jdk/src/java.desktop/share/classes/sun/awt/image/SunVolatileImage.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/SunVolatileImage.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/SunVolatileImage.java
diff --git a/jdk/src/share/classes/sun/awt/image/SunWritableRaster.java b/jdk/src/java.desktop/share/classes/sun/awt/image/SunWritableRaster.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/SunWritableRaster.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/SunWritableRaster.java
diff --git a/jdk/src/share/classes/sun/awt/image/SurfaceManager.java b/jdk/src/java.desktop/share/classes/sun/awt/image/SurfaceManager.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/SurfaceManager.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/SurfaceManager.java
diff --git a/jdk/src/share/classes/sun/awt/image/ToolkitImage.java b/jdk/src/java.desktop/share/classes/sun/awt/image/ToolkitImage.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/ToolkitImage.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/ToolkitImage.java
diff --git a/jdk/src/share/classes/sun/awt/image/URLImageSource.java b/jdk/src/java.desktop/share/classes/sun/awt/image/URLImageSource.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/URLImageSource.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/URLImageSource.java
diff --git a/jdk/src/share/classes/sun/awt/image/VSyncedBSManager.java b/jdk/src/java.desktop/share/classes/sun/awt/image/VSyncedBSManager.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/VSyncedBSManager.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/VSyncedBSManager.java
diff --git a/jdk/src/share/classes/sun/awt/image/VolatileSurfaceManager.java b/jdk/src/java.desktop/share/classes/sun/awt/image/VolatileSurfaceManager.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/VolatileSurfaceManager.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/VolatileSurfaceManager.java
diff --git a/jdk/src/share/classes/sun/awt/image/WritableRasterNative.java b/jdk/src/java.desktop/share/classes/sun/awt/image/WritableRasterNative.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/WritableRasterNative.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/WritableRasterNative.java
diff --git a/jdk/src/share/classes/sun/awt/image/XbmImageDecoder.java b/jdk/src/java.desktop/share/classes/sun/awt/image/XbmImageDecoder.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/image/XbmImageDecoder.java
rename to jdk/src/java.desktop/share/classes/sun/awt/image/XbmImageDecoder.java
diff --git a/jdk/src/share/classes/sun/awt/resources/awt.properties b/jdk/src/java.desktop/share/classes/sun/awt/resources/awt.properties
similarity index 100%
rename from jdk/src/share/classes/sun/awt/resources/awt.properties
rename to jdk/src/java.desktop/share/classes/sun/awt/resources/awt.properties
diff --git a/jdk/src/share/classes/sun/awt/resources/awt_de.properties b/jdk/src/java.desktop/share/classes/sun/awt/resources/awt_de.properties
similarity index 100%
rename from jdk/src/share/classes/sun/awt/resources/awt_de.properties
rename to jdk/src/java.desktop/share/classes/sun/awt/resources/awt_de.properties
diff --git a/jdk/src/share/classes/sun/awt/resources/awt_es.properties b/jdk/src/java.desktop/share/classes/sun/awt/resources/awt_es.properties
similarity index 100%
rename from jdk/src/share/classes/sun/awt/resources/awt_es.properties
rename to jdk/src/java.desktop/share/classes/sun/awt/resources/awt_es.properties
diff --git a/jdk/src/share/classes/sun/awt/resources/awt_fr.properties b/jdk/src/java.desktop/share/classes/sun/awt/resources/awt_fr.properties
similarity index 100%
rename from jdk/src/share/classes/sun/awt/resources/awt_fr.properties
rename to jdk/src/java.desktop/share/classes/sun/awt/resources/awt_fr.properties
diff --git a/jdk/src/share/classes/sun/awt/resources/awt_it.properties b/jdk/src/java.desktop/share/classes/sun/awt/resources/awt_it.properties
similarity index 100%
rename from jdk/src/share/classes/sun/awt/resources/awt_it.properties
rename to jdk/src/java.desktop/share/classes/sun/awt/resources/awt_it.properties
diff --git a/jdk/src/share/classes/sun/awt/resources/awt_ja.properties b/jdk/src/java.desktop/share/classes/sun/awt/resources/awt_ja.properties
similarity index 100%
rename from jdk/src/share/classes/sun/awt/resources/awt_ja.properties
rename to jdk/src/java.desktop/share/classes/sun/awt/resources/awt_ja.properties
diff --git a/jdk/src/share/classes/sun/awt/resources/awt_ko.properties b/jdk/src/java.desktop/share/classes/sun/awt/resources/awt_ko.properties
similarity index 100%
rename from jdk/src/share/classes/sun/awt/resources/awt_ko.properties
rename to jdk/src/java.desktop/share/classes/sun/awt/resources/awt_ko.properties
diff --git a/jdk/src/share/classes/sun/awt/resources/awt_pt_BR.properties b/jdk/src/java.desktop/share/classes/sun/awt/resources/awt_pt_BR.properties
similarity index 100%
rename from jdk/src/share/classes/sun/awt/resources/awt_pt_BR.properties
rename to jdk/src/java.desktop/share/classes/sun/awt/resources/awt_pt_BR.properties
diff --git a/jdk/src/share/classes/sun/awt/resources/awt_sv.properties b/jdk/src/java.desktop/share/classes/sun/awt/resources/awt_sv.properties
similarity index 100%
rename from jdk/src/share/classes/sun/awt/resources/awt_sv.properties
rename to jdk/src/java.desktop/share/classes/sun/awt/resources/awt_sv.properties
diff --git a/jdk/src/share/classes/sun/awt/resources/awt_zh_CN.properties b/jdk/src/java.desktop/share/classes/sun/awt/resources/awt_zh_CN.properties
similarity index 100%
rename from jdk/src/share/classes/sun/awt/resources/awt_zh_CN.properties
rename to jdk/src/java.desktop/share/classes/sun/awt/resources/awt_zh_CN.properties
diff --git a/jdk/src/share/classes/sun/awt/resources/awt_zh_TW.properties b/jdk/src/java.desktop/share/classes/sun/awt/resources/awt_zh_TW.properties
similarity index 100%
rename from jdk/src/share/classes/sun/awt/resources/awt_zh_TW.properties
rename to jdk/src/java.desktop/share/classes/sun/awt/resources/awt_zh_TW.properties
diff --git a/jdk/src/share/classes/sun/awt/resources/security-icon-bw16.png b/jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-bw16.png
similarity index 100%
rename from jdk/src/share/classes/sun/awt/resources/security-icon-bw16.png
rename to jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-bw16.png
diff --git a/jdk/src/share/classes/sun/awt/resources/security-icon-bw24.png b/jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-bw24.png
similarity index 100%
rename from jdk/src/share/classes/sun/awt/resources/security-icon-bw24.png
rename to jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-bw24.png
diff --git a/jdk/src/share/classes/sun/awt/resources/security-icon-bw32.png b/jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-bw32.png
similarity index 100%
rename from jdk/src/share/classes/sun/awt/resources/security-icon-bw32.png
rename to jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-bw32.png
diff --git a/jdk/src/share/classes/sun/awt/resources/security-icon-bw48.png b/jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-bw48.png
similarity index 100%
rename from jdk/src/share/classes/sun/awt/resources/security-icon-bw48.png
rename to jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-bw48.png
diff --git a/jdk/src/share/classes/sun/awt/resources/security-icon-interim16.png b/jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-interim16.png
similarity index 100%
rename from jdk/src/share/classes/sun/awt/resources/security-icon-interim16.png
rename to jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-interim16.png
diff --git a/jdk/src/share/classes/sun/awt/resources/security-icon-interim24.png b/jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-interim24.png
similarity index 100%
rename from jdk/src/share/classes/sun/awt/resources/security-icon-interim24.png
rename to jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-interim24.png
diff --git a/jdk/src/share/classes/sun/awt/resources/security-icon-interim32.png b/jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-interim32.png
similarity index 100%
rename from jdk/src/share/classes/sun/awt/resources/security-icon-interim32.png
rename to jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-interim32.png
diff --git a/jdk/src/share/classes/sun/awt/resources/security-icon-interim48.png b/jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-interim48.png
similarity index 100%
rename from jdk/src/share/classes/sun/awt/resources/security-icon-interim48.png
rename to jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-interim48.png
diff --git a/jdk/src/share/classes/sun/awt/resources/security-icon-yellow16.png b/jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-yellow16.png
similarity index 100%
rename from jdk/src/share/classes/sun/awt/resources/security-icon-yellow16.png
rename to jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-yellow16.png
diff --git a/jdk/src/share/classes/sun/awt/resources/security-icon-yellow24.png b/jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-yellow24.png
similarity index 100%
rename from jdk/src/share/classes/sun/awt/resources/security-icon-yellow24.png
rename to jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-yellow24.png
diff --git a/jdk/src/share/classes/sun/awt/resources/security-icon-yellow32.png b/jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-yellow32.png
similarity index 100%
rename from jdk/src/share/classes/sun/awt/resources/security-icon-yellow32.png
rename to jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-yellow32.png
diff --git a/jdk/src/share/classes/sun/awt/resources/security-icon-yellow48.png b/jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-yellow48.png
similarity index 100%
rename from jdk/src/share/classes/sun/awt/resources/security-icon-yellow48.png
rename to jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-yellow48.png
diff --git a/jdk/src/share/classes/sun/awt/shell/DefaultShellFolder.java b/jdk/src/java.desktop/share/classes/sun/awt/shell/DefaultShellFolder.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/shell/DefaultShellFolder.java
rename to jdk/src/java.desktop/share/classes/sun/awt/shell/DefaultShellFolder.java
diff --git a/jdk/src/share/classes/sun/awt/shell/ShellFolder.java b/jdk/src/java.desktop/share/classes/sun/awt/shell/ShellFolder.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/shell/ShellFolder.java
rename to jdk/src/java.desktop/share/classes/sun/awt/shell/ShellFolder.java
diff --git a/jdk/src/share/classes/sun/awt/shell/ShellFolderColumnInfo.java b/jdk/src/java.desktop/share/classes/sun/awt/shell/ShellFolderColumnInfo.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/shell/ShellFolderColumnInfo.java
rename to jdk/src/java.desktop/share/classes/sun/awt/shell/ShellFolderColumnInfo.java
diff --git a/jdk/src/share/classes/sun/awt/shell/ShellFolderManager.java b/jdk/src/java.desktop/share/classes/sun/awt/shell/ShellFolderManager.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/shell/ShellFolderManager.java
rename to jdk/src/java.desktop/share/classes/sun/awt/shell/ShellFolderManager.java
diff --git a/jdk/src/share/classes/sun/awt/util/IdentityArrayList.java b/jdk/src/java.desktop/share/classes/sun/awt/util/IdentityArrayList.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/util/IdentityArrayList.java
rename to jdk/src/java.desktop/share/classes/sun/awt/util/IdentityArrayList.java
diff --git a/jdk/src/share/classes/sun/awt/util/IdentityLinkedList.java b/jdk/src/java.desktop/share/classes/sun/awt/util/IdentityLinkedList.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/util/IdentityLinkedList.java
rename to jdk/src/java.desktop/share/classes/sun/awt/util/IdentityLinkedList.java
diff --git a/jdk/src/share/classes/sun/awt/util/ThreadGroupUtils.java b/jdk/src/java.desktop/share/classes/sun/awt/util/ThreadGroupUtils.java
similarity index 100%
rename from jdk/src/share/classes/sun/awt/util/ThreadGroupUtils.java
rename to jdk/src/java.desktop/share/classes/sun/awt/util/ThreadGroupUtils.java
diff --git a/jdk/src/share/classes/sun/datatransfer/DataFlavorUtil.java b/jdk/src/java.desktop/share/classes/sun/datatransfer/DataFlavorUtil.java
similarity index 100%
rename from jdk/src/share/classes/sun/datatransfer/DataFlavorUtil.java
rename to jdk/src/java.desktop/share/classes/sun/datatransfer/DataFlavorUtil.java
diff --git a/jdk/src/share/classes/sun/datatransfer/DesktopDatatransferService.java b/jdk/src/java.desktop/share/classes/sun/datatransfer/DesktopDatatransferService.java
similarity index 100%
rename from jdk/src/share/classes/sun/datatransfer/DesktopDatatransferService.java
rename to jdk/src/java.desktop/share/classes/sun/datatransfer/DesktopDatatransferService.java
diff --git a/jdk/src/share/classes/sun/dc/DuctusRenderingEngine.java b/jdk/src/java.desktop/share/classes/sun/dc/DuctusRenderingEngine.java
similarity index 100%
rename from jdk/src/share/classes/sun/dc/DuctusRenderingEngine.java
rename to jdk/src/java.desktop/share/classes/sun/dc/DuctusRenderingEngine.java
diff --git a/jdk/src/share/classes/sun/font/AttributeMap.java b/jdk/src/java.desktop/share/classes/sun/font/AttributeMap.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/AttributeMap.java
rename to jdk/src/java.desktop/share/classes/sun/font/AttributeMap.java
diff --git a/jdk/src/share/classes/sun/font/AttributeValues.java b/jdk/src/java.desktop/share/classes/sun/font/AttributeValues.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/AttributeValues.java
rename to jdk/src/java.desktop/share/classes/sun/font/AttributeValues.java
diff --git a/jdk/src/share/classes/sun/font/BidiUtils.java b/jdk/src/java.desktop/share/classes/sun/font/BidiUtils.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/BidiUtils.java
rename to jdk/src/java.desktop/share/classes/sun/font/BidiUtils.java
diff --git a/jdk/src/share/classes/sun/font/CMap.java b/jdk/src/java.desktop/share/classes/sun/font/CMap.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/CMap.java
rename to jdk/src/java.desktop/share/classes/sun/font/CMap.java
diff --git a/jdk/src/share/classes/sun/font/CharToGlyphMapper.java b/jdk/src/java.desktop/share/classes/sun/font/CharToGlyphMapper.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/CharToGlyphMapper.java
rename to jdk/src/java.desktop/share/classes/sun/font/CharToGlyphMapper.java
diff --git a/jdk/src/share/classes/sun/font/CodePointIterator.java b/jdk/src/java.desktop/share/classes/sun/font/CodePointIterator.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/CodePointIterator.java
rename to jdk/src/java.desktop/share/classes/sun/font/CodePointIterator.java
diff --git a/jdk/src/share/classes/sun/font/CompositeFont.java b/jdk/src/java.desktop/share/classes/sun/font/CompositeFont.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/CompositeFont.java
rename to jdk/src/java.desktop/share/classes/sun/font/CompositeFont.java
diff --git a/jdk/src/share/classes/sun/font/CompositeFontDescriptor.java b/jdk/src/java.desktop/share/classes/sun/font/CompositeFontDescriptor.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/CompositeFontDescriptor.java
rename to jdk/src/java.desktop/share/classes/sun/font/CompositeFontDescriptor.java
diff --git a/jdk/src/share/classes/sun/font/CompositeGlyphMapper.java b/jdk/src/java.desktop/share/classes/sun/font/CompositeGlyphMapper.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/CompositeGlyphMapper.java
rename to jdk/src/java.desktop/share/classes/sun/font/CompositeGlyphMapper.java
diff --git a/jdk/src/share/classes/sun/font/CompositeStrike.java b/jdk/src/java.desktop/share/classes/sun/font/CompositeStrike.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/CompositeStrike.java
rename to jdk/src/java.desktop/share/classes/sun/font/CompositeStrike.java
diff --git a/jdk/src/share/classes/sun/font/CoreMetrics.java b/jdk/src/java.desktop/share/classes/sun/font/CoreMetrics.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/CoreMetrics.java
rename to jdk/src/java.desktop/share/classes/sun/font/CoreMetrics.java
diff --git a/jdk/src/share/classes/sun/font/CreatedFontTracker.java b/jdk/src/java.desktop/share/classes/sun/font/CreatedFontTracker.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/CreatedFontTracker.java
rename to jdk/src/java.desktop/share/classes/sun/font/CreatedFontTracker.java
diff --git a/jdk/src/share/classes/sun/font/Decoration.java b/jdk/src/java.desktop/share/classes/sun/font/Decoration.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/Decoration.java
rename to jdk/src/java.desktop/share/classes/sun/font/Decoration.java
diff --git a/jdk/src/share/classes/sun/font/DelegatingShape.java b/jdk/src/java.desktop/share/classes/sun/font/DelegatingShape.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/DelegatingShape.java
rename to jdk/src/java.desktop/share/classes/sun/font/DelegatingShape.java
diff --git a/jdk/src/share/classes/sun/font/EAttribute.java b/jdk/src/java.desktop/share/classes/sun/font/EAttribute.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/EAttribute.java
rename to jdk/src/java.desktop/share/classes/sun/font/EAttribute.java
diff --git a/jdk/src/share/classes/sun/font/ExtendedTextLabel.java b/jdk/src/java.desktop/share/classes/sun/font/ExtendedTextLabel.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/ExtendedTextLabel.java
rename to jdk/src/java.desktop/share/classes/sun/font/ExtendedTextLabel.java
diff --git a/jdk/src/share/classes/sun/font/ExtendedTextSourceLabel.java b/jdk/src/java.desktop/share/classes/sun/font/ExtendedTextSourceLabel.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/ExtendedTextSourceLabel.java
rename to jdk/src/java.desktop/share/classes/sun/font/ExtendedTextSourceLabel.java
diff --git a/jdk/src/share/classes/sun/font/FileFont.java b/jdk/src/java.desktop/share/classes/sun/font/FileFont.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/FileFont.java
rename to jdk/src/java.desktop/share/classes/sun/font/FileFont.java
diff --git a/jdk/src/share/classes/sun/font/FileFontStrike.java b/jdk/src/java.desktop/share/classes/sun/font/FileFontStrike.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/FileFontStrike.java
rename to jdk/src/java.desktop/share/classes/sun/font/FileFontStrike.java
diff --git a/jdk/src/share/classes/sun/font/Font2D.java b/jdk/src/java.desktop/share/classes/sun/font/Font2D.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/Font2D.java
rename to jdk/src/java.desktop/share/classes/sun/font/Font2D.java
diff --git a/jdk/src/share/classes/sun/font/Font2DHandle.java b/jdk/src/java.desktop/share/classes/sun/font/Font2DHandle.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/Font2DHandle.java
rename to jdk/src/java.desktop/share/classes/sun/font/Font2DHandle.java
diff --git a/jdk/src/share/classes/sun/font/FontAccess.java b/jdk/src/java.desktop/share/classes/sun/font/FontAccess.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/FontAccess.java
rename to jdk/src/java.desktop/share/classes/sun/font/FontAccess.java
diff --git a/jdk/src/share/classes/sun/font/FontDesignMetrics.java b/jdk/src/java.desktop/share/classes/sun/font/FontDesignMetrics.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/FontDesignMetrics.java
rename to jdk/src/java.desktop/share/classes/sun/font/FontDesignMetrics.java
diff --git a/jdk/src/share/classes/sun/font/FontFamily.java b/jdk/src/java.desktop/share/classes/sun/font/FontFamily.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/FontFamily.java
rename to jdk/src/java.desktop/share/classes/sun/font/FontFamily.java
diff --git a/jdk/src/share/classes/sun/font/FontLineMetrics.java b/jdk/src/java.desktop/share/classes/sun/font/FontLineMetrics.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/FontLineMetrics.java
rename to jdk/src/java.desktop/share/classes/sun/font/FontLineMetrics.java
diff --git a/jdk/src/share/classes/sun/font/FontManager.java b/jdk/src/java.desktop/share/classes/sun/font/FontManager.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/FontManager.java
rename to jdk/src/java.desktop/share/classes/sun/font/FontManager.java
diff --git a/jdk/src/share/classes/sun/font/FontManagerFactory.java b/jdk/src/java.desktop/share/classes/sun/font/FontManagerFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/FontManagerFactory.java
rename to jdk/src/java.desktop/share/classes/sun/font/FontManagerFactory.java
diff --git a/jdk/src/share/classes/sun/font/FontManagerForSGE.java b/jdk/src/java.desktop/share/classes/sun/font/FontManagerForSGE.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/FontManagerForSGE.java
rename to jdk/src/java.desktop/share/classes/sun/font/FontManagerForSGE.java
diff --git a/jdk/src/share/classes/sun/font/FontManagerNativeLibrary.java b/jdk/src/java.desktop/share/classes/sun/font/FontManagerNativeLibrary.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/FontManagerNativeLibrary.java
rename to jdk/src/java.desktop/share/classes/sun/font/FontManagerNativeLibrary.java
diff --git a/jdk/src/share/classes/sun/font/FontResolver.java b/jdk/src/java.desktop/share/classes/sun/font/FontResolver.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/FontResolver.java
rename to jdk/src/java.desktop/share/classes/sun/font/FontResolver.java
diff --git a/jdk/src/share/classes/sun/font/FontRunIterator.java b/jdk/src/java.desktop/share/classes/sun/font/FontRunIterator.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/FontRunIterator.java
rename to jdk/src/java.desktop/share/classes/sun/font/FontRunIterator.java
diff --git a/jdk/src/share/classes/sun/font/FontScaler.java b/jdk/src/java.desktop/share/classes/sun/font/FontScaler.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/FontScaler.java
rename to jdk/src/java.desktop/share/classes/sun/font/FontScaler.java
diff --git a/jdk/src/share/classes/sun/font/FontScalerException.java b/jdk/src/java.desktop/share/classes/sun/font/FontScalerException.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/FontScalerException.java
rename to jdk/src/java.desktop/share/classes/sun/font/FontScalerException.java
diff --git a/jdk/src/share/classes/sun/font/FontStrike.java b/jdk/src/java.desktop/share/classes/sun/font/FontStrike.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/FontStrike.java
rename to jdk/src/java.desktop/share/classes/sun/font/FontStrike.java
diff --git a/jdk/src/share/classes/sun/font/FontStrikeDesc.java b/jdk/src/java.desktop/share/classes/sun/font/FontStrikeDesc.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/FontStrikeDesc.java
rename to jdk/src/java.desktop/share/classes/sun/font/FontStrikeDesc.java
diff --git a/jdk/src/share/classes/sun/font/FontStrikeDisposer.java b/jdk/src/java.desktop/share/classes/sun/font/FontStrikeDisposer.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/FontStrikeDisposer.java
rename to jdk/src/java.desktop/share/classes/sun/font/FontStrikeDisposer.java
diff --git a/jdk/src/share/classes/sun/font/FontUtilities.java b/jdk/src/java.desktop/share/classes/sun/font/FontUtilities.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/FontUtilities.java
rename to jdk/src/java.desktop/share/classes/sun/font/FontUtilities.java
diff --git a/jdk/src/share/classes/sun/font/FreetypeFontScaler.java b/jdk/src/java.desktop/share/classes/sun/font/FreetypeFontScaler.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/FreetypeFontScaler.java
rename to jdk/src/java.desktop/share/classes/sun/font/FreetypeFontScaler.java
diff --git a/jdk/src/share/classes/sun/font/GlyphDisposedListener.java b/jdk/src/java.desktop/share/classes/sun/font/GlyphDisposedListener.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/GlyphDisposedListener.java
rename to jdk/src/java.desktop/share/classes/sun/font/GlyphDisposedListener.java
diff --git a/jdk/src/share/classes/sun/font/GlyphLayout.java b/jdk/src/java.desktop/share/classes/sun/font/GlyphLayout.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/GlyphLayout.java
rename to jdk/src/java.desktop/share/classes/sun/font/GlyphLayout.java
diff --git a/jdk/src/share/classes/sun/font/GlyphList.java b/jdk/src/java.desktop/share/classes/sun/font/GlyphList.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/GlyphList.java
rename to jdk/src/java.desktop/share/classes/sun/font/GlyphList.java
diff --git a/jdk/src/share/classes/sun/font/GraphicComponent.java b/jdk/src/java.desktop/share/classes/sun/font/GraphicComponent.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/GraphicComponent.java
rename to jdk/src/java.desktop/share/classes/sun/font/GraphicComponent.java
diff --git a/jdk/src/share/classes/sun/font/LayoutPathImpl.java b/jdk/src/java.desktop/share/classes/sun/font/LayoutPathImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/LayoutPathImpl.java
rename to jdk/src/java.desktop/share/classes/sun/font/LayoutPathImpl.java
diff --git a/jdk/src/share/classes/sun/font/NullFontScaler.java b/jdk/src/java.desktop/share/classes/sun/font/NullFontScaler.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/NullFontScaler.java
rename to jdk/src/java.desktop/share/classes/sun/font/NullFontScaler.java
diff --git a/jdk/src/share/classes/sun/font/PhysicalFont.java b/jdk/src/java.desktop/share/classes/sun/font/PhysicalFont.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/PhysicalFont.java
rename to jdk/src/java.desktop/share/classes/sun/font/PhysicalFont.java
diff --git a/jdk/src/share/classes/sun/font/PhysicalStrike.java b/jdk/src/java.desktop/share/classes/sun/font/PhysicalStrike.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/PhysicalStrike.java
rename to jdk/src/java.desktop/share/classes/sun/font/PhysicalStrike.java
diff --git a/jdk/src/share/classes/sun/font/Script.java b/jdk/src/java.desktop/share/classes/sun/font/Script.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/Script.java
rename to jdk/src/java.desktop/share/classes/sun/font/Script.java
diff --git a/jdk/src/share/classes/sun/font/ScriptRun.java b/jdk/src/java.desktop/share/classes/sun/font/ScriptRun.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/ScriptRun.java
rename to jdk/src/java.desktop/share/classes/sun/font/ScriptRun.java
diff --git a/jdk/src/share/classes/sun/font/ScriptRunData.java b/jdk/src/java.desktop/share/classes/sun/font/ScriptRunData.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/ScriptRunData.java
rename to jdk/src/java.desktop/share/classes/sun/font/ScriptRunData.java
diff --git a/jdk/src/share/classes/sun/font/StandardGlyphVector.java b/jdk/src/java.desktop/share/classes/sun/font/StandardGlyphVector.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/StandardGlyphVector.java
rename to jdk/src/java.desktop/share/classes/sun/font/StandardGlyphVector.java
diff --git a/jdk/src/share/classes/sun/font/StandardTextSource.java b/jdk/src/java.desktop/share/classes/sun/font/StandardTextSource.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/StandardTextSource.java
rename to jdk/src/java.desktop/share/classes/sun/font/StandardTextSource.java
diff --git a/jdk/src/share/classes/sun/font/StrikeCache.java b/jdk/src/java.desktop/share/classes/sun/font/StrikeCache.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/StrikeCache.java
rename to jdk/src/java.desktop/share/classes/sun/font/StrikeCache.java
diff --git a/jdk/src/share/classes/sun/font/StrikeMetrics.java b/jdk/src/java.desktop/share/classes/sun/font/StrikeMetrics.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/StrikeMetrics.java
rename to jdk/src/java.desktop/share/classes/sun/font/StrikeMetrics.java
diff --git a/jdk/src/share/classes/sun/font/SunFontManager.java b/jdk/src/java.desktop/share/classes/sun/font/SunFontManager.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/SunFontManager.java
rename to jdk/src/java.desktop/share/classes/sun/font/SunFontManager.java
diff --git a/jdk/src/share/classes/sun/font/SunLayoutEngine.java b/jdk/src/java.desktop/share/classes/sun/font/SunLayoutEngine.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/SunLayoutEngine.java
rename to jdk/src/java.desktop/share/classes/sun/font/SunLayoutEngine.java
diff --git a/jdk/src/share/classes/sun/font/TextLabel.java b/jdk/src/java.desktop/share/classes/sun/font/TextLabel.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/TextLabel.java
rename to jdk/src/java.desktop/share/classes/sun/font/TextLabel.java
diff --git a/jdk/src/share/classes/sun/font/TextLabelFactory.java b/jdk/src/java.desktop/share/classes/sun/font/TextLabelFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/TextLabelFactory.java
rename to jdk/src/java.desktop/share/classes/sun/font/TextLabelFactory.java
diff --git a/jdk/src/share/classes/sun/font/TextLineComponent.java b/jdk/src/java.desktop/share/classes/sun/font/TextLineComponent.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/TextLineComponent.java
rename to jdk/src/java.desktop/share/classes/sun/font/TextLineComponent.java
diff --git a/jdk/src/share/classes/sun/font/TextRecord.java b/jdk/src/java.desktop/share/classes/sun/font/TextRecord.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/TextRecord.java
rename to jdk/src/java.desktop/share/classes/sun/font/TextRecord.java
diff --git a/jdk/src/share/classes/sun/font/TextSource.java b/jdk/src/java.desktop/share/classes/sun/font/TextSource.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/TextSource.java
rename to jdk/src/java.desktop/share/classes/sun/font/TextSource.java
diff --git a/jdk/src/share/classes/sun/font/TextSourceLabel.java b/jdk/src/java.desktop/share/classes/sun/font/TextSourceLabel.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/TextSourceLabel.java
rename to jdk/src/java.desktop/share/classes/sun/font/TextSourceLabel.java
diff --git a/jdk/src/share/classes/sun/font/TrueTypeFont.java b/jdk/src/java.desktop/share/classes/sun/font/TrueTypeFont.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/TrueTypeFont.java
rename to jdk/src/java.desktop/share/classes/sun/font/TrueTypeFont.java
diff --git a/jdk/src/share/classes/sun/font/TrueTypeGlyphMapper.java b/jdk/src/java.desktop/share/classes/sun/font/TrueTypeGlyphMapper.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/TrueTypeGlyphMapper.java
rename to jdk/src/java.desktop/share/classes/sun/font/TrueTypeGlyphMapper.java
diff --git a/jdk/src/share/classes/sun/font/Type1Font.java b/jdk/src/java.desktop/share/classes/sun/font/Type1Font.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/Type1Font.java
rename to jdk/src/java.desktop/share/classes/sun/font/Type1Font.java
diff --git a/jdk/src/share/classes/sun/font/Type1GlyphMapper.java b/jdk/src/java.desktop/share/classes/sun/font/Type1GlyphMapper.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/Type1GlyphMapper.java
rename to jdk/src/java.desktop/share/classes/sun/font/Type1GlyphMapper.java
diff --git a/jdk/src/share/classes/sun/font/Underline.java b/jdk/src/java.desktop/share/classes/sun/font/Underline.java
similarity index 100%
rename from jdk/src/share/classes/sun/font/Underline.java
rename to jdk/src/java.desktop/share/classes/sun/font/Underline.java
diff --git a/jdk/src/share/classes/sun/java2d/DefaultDisposerRecord.java b/jdk/src/java.desktop/share/classes/sun/java2d/DefaultDisposerRecord.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/DefaultDisposerRecord.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/DefaultDisposerRecord.java
diff --git a/jdk/src/share/classes/sun/java2d/DestSurfaceProvider.java b/jdk/src/java.desktop/share/classes/sun/java2d/DestSurfaceProvider.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/DestSurfaceProvider.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/DestSurfaceProvider.java
diff --git a/jdk/src/share/classes/sun/java2d/Disposer.java b/jdk/src/java.desktop/share/classes/sun/java2d/Disposer.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/Disposer.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/Disposer.java
diff --git a/jdk/src/share/classes/sun/java2d/DisposerRecord.java b/jdk/src/java.desktop/share/classes/sun/java2d/DisposerRecord.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/DisposerRecord.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/DisposerRecord.java
diff --git a/jdk/src/share/classes/sun/java2d/DisposerTarget.java b/jdk/src/java.desktop/share/classes/sun/java2d/DisposerTarget.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/DisposerTarget.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/DisposerTarget.java
diff --git a/jdk/src/share/classes/sun/java2d/FontSupport.java b/jdk/src/java.desktop/share/classes/sun/java2d/FontSupport.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/FontSupport.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/FontSupport.java
diff --git a/jdk/src/share/classes/sun/java2d/HeadlessGraphicsEnvironment.java b/jdk/src/java.desktop/share/classes/sun/java2d/HeadlessGraphicsEnvironment.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/HeadlessGraphicsEnvironment.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/HeadlessGraphicsEnvironment.java
diff --git a/jdk/src/share/classes/sun/java2d/InvalidPipeException.java b/jdk/src/java.desktop/share/classes/sun/java2d/InvalidPipeException.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/InvalidPipeException.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/InvalidPipeException.java
diff --git a/jdk/src/share/classes/sun/java2d/NullSurfaceData.java b/jdk/src/java.desktop/share/classes/sun/java2d/NullSurfaceData.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/NullSurfaceData.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/NullSurfaceData.java
diff --git a/jdk/src/share/classes/sun/java2d/Spans.java b/jdk/src/java.desktop/share/classes/sun/java2d/Spans.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/Spans.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/Spans.java
diff --git a/jdk/src/share/classes/sun/java2d/StateTrackable.java b/jdk/src/java.desktop/share/classes/sun/java2d/StateTrackable.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/StateTrackable.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/StateTrackable.java
diff --git a/jdk/src/share/classes/sun/java2d/StateTrackableDelegate.java b/jdk/src/java.desktop/share/classes/sun/java2d/StateTrackableDelegate.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/StateTrackableDelegate.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/StateTrackableDelegate.java
diff --git a/jdk/src/share/classes/sun/java2d/StateTracker.java b/jdk/src/java.desktop/share/classes/sun/java2d/StateTracker.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/StateTracker.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/StateTracker.java
diff --git a/jdk/src/share/classes/sun/java2d/SunCompositeContext.java b/jdk/src/java.desktop/share/classes/sun/java2d/SunCompositeContext.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/SunCompositeContext.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/SunCompositeContext.java
diff --git a/jdk/src/share/classes/sun/java2d/SunGraphics2D.java b/jdk/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/SunGraphics2D.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java
diff --git a/jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java b/jdk/src/java.desktop/share/classes/sun/java2d/SunGraphicsEnvironment.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/SunGraphicsEnvironment.java
diff --git a/jdk/src/share/classes/sun/java2d/Surface.java b/jdk/src/java.desktop/share/classes/sun/java2d/Surface.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/Surface.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/Surface.java
diff --git a/jdk/src/share/classes/sun/java2d/SurfaceData.java b/jdk/src/java.desktop/share/classes/sun/java2d/SurfaceData.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/SurfaceData.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/SurfaceData.java
diff --git a/jdk/src/share/classes/sun/java2d/SurfaceDataProxy.java b/jdk/src/java.desktop/share/classes/sun/java2d/SurfaceDataProxy.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/SurfaceDataProxy.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/SurfaceDataProxy.java
diff --git a/jdk/src/share/classes/sun/java2d/SurfaceManagerFactory.java b/jdk/src/java.desktop/share/classes/sun/java2d/SurfaceManagerFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/SurfaceManagerFactory.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/SurfaceManagerFactory.java
diff --git a/jdk/src/share/classes/sun/java2d/cmm/CMMServiceProvider.java b/jdk/src/java.desktop/share/classes/sun/java2d/cmm/CMMServiceProvider.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/cmm/CMMServiceProvider.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/cmm/CMMServiceProvider.java
diff --git a/jdk/src/share/classes/sun/java2d/cmm/CMSManager.java b/jdk/src/java.desktop/share/classes/sun/java2d/cmm/CMSManager.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/cmm/CMSManager.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/cmm/CMSManager.java
diff --git a/jdk/src/share/classes/sun/java2d/cmm/ColorTransform.java b/jdk/src/java.desktop/share/classes/sun/java2d/cmm/ColorTransform.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/cmm/ColorTransform.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/cmm/ColorTransform.java
diff --git a/jdk/src/share/classes/sun/java2d/cmm/PCMM.java b/jdk/src/java.desktop/share/classes/sun/java2d/cmm/PCMM.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/cmm/PCMM.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/cmm/PCMM.java
diff --git a/jdk/src/share/classes/sun/java2d/cmm/Profile.java b/jdk/src/java.desktop/share/classes/sun/java2d/cmm/Profile.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/cmm/Profile.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/cmm/Profile.java
diff --git a/jdk/src/share/classes/sun/java2d/cmm/ProfileActivator.java b/jdk/src/java.desktop/share/classes/sun/java2d/cmm/ProfileActivator.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/cmm/ProfileActivator.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/cmm/ProfileActivator.java
diff --git a/jdk/src/share/classes/sun/java2d/cmm/ProfileDataVerifier.java b/jdk/src/java.desktop/share/classes/sun/java2d/cmm/ProfileDataVerifier.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/cmm/ProfileDataVerifier.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/cmm/ProfileDataVerifier.java
diff --git a/jdk/src/share/classes/sun/java2d/cmm/ProfileDeferralInfo.java b/jdk/src/java.desktop/share/classes/sun/java2d/cmm/ProfileDeferralInfo.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/cmm/ProfileDeferralInfo.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/cmm/ProfileDeferralInfo.java
diff --git a/jdk/src/share/classes/sun/java2d/cmm/ProfileDeferralMgr.java b/jdk/src/java.desktop/share/classes/sun/java2d/cmm/ProfileDeferralMgr.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/cmm/ProfileDeferralMgr.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/cmm/ProfileDeferralMgr.java
diff --git a/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java b/jdk/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMS.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMS.java
diff --git a/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java b/jdk/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java
diff --git a/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSProfile.java b/jdk/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSProfile.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSProfile.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSProfile.java
diff --git a/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java b/jdk/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java
diff --git a/jdk/src/share/classes/sun/java2d/cmm/lcms/LcmsServiceProvider.java b/jdk/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LcmsServiceProvider.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/cmm/lcms/LcmsServiceProvider.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LcmsServiceProvider.java
diff --git a/jdk/src/share/classes/sun/java2d/loops/Blit.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/Blit.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/loops/Blit.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/loops/Blit.java
diff --git a/jdk/src/share/classes/sun/java2d/loops/BlitBg.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/BlitBg.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/loops/BlitBg.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/loops/BlitBg.java
diff --git a/jdk/src/share/classes/sun/java2d/loops/CompositeType.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/CompositeType.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/loops/CompositeType.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/loops/CompositeType.java
diff --git a/jdk/src/share/classes/sun/java2d/loops/CustomComponent.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/CustomComponent.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/loops/CustomComponent.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/loops/CustomComponent.java
diff --git a/jdk/src/share/classes/sun/java2d/loops/DrawGlyphList.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphList.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/loops/DrawGlyphList.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphList.java
diff --git a/jdk/src/share/classes/sun/java2d/loops/DrawGlyphListAA.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphListAA.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/loops/DrawGlyphListAA.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphListAA.java
diff --git a/jdk/src/share/classes/sun/java2d/loops/DrawGlyphListLCD.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphListLCD.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/loops/DrawGlyphListLCD.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphListLCD.java
diff --git a/jdk/src/share/classes/sun/java2d/loops/DrawLine.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawLine.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/loops/DrawLine.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawLine.java
diff --git a/jdk/src/share/classes/sun/java2d/loops/DrawParallelogram.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawParallelogram.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/loops/DrawParallelogram.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawParallelogram.java
diff --git a/jdk/src/share/classes/sun/java2d/loops/DrawPath.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawPath.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/loops/DrawPath.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawPath.java
diff --git a/jdk/src/share/classes/sun/java2d/loops/DrawPolygons.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawPolygons.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/loops/DrawPolygons.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawPolygons.java
diff --git a/jdk/src/share/classes/sun/java2d/loops/DrawRect.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawRect.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/loops/DrawRect.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawRect.java
diff --git a/jdk/src/share/classes/sun/java2d/loops/FillParallelogram.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/FillParallelogram.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/loops/FillParallelogram.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/loops/FillParallelogram.java
diff --git a/jdk/src/share/classes/sun/java2d/loops/FillPath.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/FillPath.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/loops/FillPath.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/loops/FillPath.java
diff --git a/jdk/src/share/classes/sun/java2d/loops/FillRect.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/FillRect.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/loops/FillRect.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/loops/FillRect.java
diff --git a/jdk/src/share/classes/sun/java2d/loops/FillSpans.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/FillSpans.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/loops/FillSpans.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/loops/FillSpans.java
diff --git a/jdk/src/share/classes/sun/java2d/loops/FontInfo.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/FontInfo.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/loops/FontInfo.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/loops/FontInfo.java
diff --git a/jdk/src/share/classes/sun/java2d/loops/GeneralRenderer.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/GeneralRenderer.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/loops/GeneralRenderer.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/loops/GeneralRenderer.java
diff --git a/jdk/src/share/classes/sun/java2d/loops/GraphicsPrimitive.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitive.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/loops/GraphicsPrimitive.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitive.java
diff --git a/jdk/src/share/classes/sun/java2d/loops/GraphicsPrimitiveMgr.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveMgr.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/loops/GraphicsPrimitiveMgr.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveMgr.java
diff --git a/jdk/src/share/classes/sun/java2d/loops/GraphicsPrimitiveProxy.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveProxy.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/loops/GraphicsPrimitiveProxy.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveProxy.java
diff --git a/jdk/src/share/classes/sun/java2d/loops/MaskBlit.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/MaskBlit.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/loops/MaskBlit.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/loops/MaskBlit.java
diff --git a/jdk/src/share/classes/sun/java2d/loops/MaskFill.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/MaskFill.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/loops/MaskFill.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/loops/MaskFill.java
diff --git a/jdk/src/share/classes/sun/java2d/loops/ProcessPath.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/ProcessPath.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/loops/ProcessPath.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/loops/ProcessPath.java
diff --git a/jdk/src/share/classes/sun/java2d/loops/RenderCache.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/RenderCache.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/loops/RenderCache.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/loops/RenderCache.java
diff --git a/jdk/src/share/classes/sun/java2d/loops/RenderLoops.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/RenderLoops.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/loops/RenderLoops.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/loops/RenderLoops.java
diff --git a/jdk/src/share/classes/sun/java2d/loops/ScaledBlit.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/ScaledBlit.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/loops/ScaledBlit.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/loops/ScaledBlit.java
diff --git a/jdk/src/share/classes/sun/java2d/loops/SurfaceType.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/SurfaceType.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/loops/SurfaceType.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/loops/SurfaceType.java
diff --git a/jdk/src/share/classes/sun/java2d/loops/TransformBlit.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/TransformBlit.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/loops/TransformBlit.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/loops/TransformBlit.java
diff --git a/jdk/src/share/classes/sun/java2d/loops/TransformHelper.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/TransformHelper.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/loops/TransformHelper.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/loops/TransformHelper.java
diff --git a/jdk/src/share/classes/sun/java2d/loops/XORComposite.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/XORComposite.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/loops/XORComposite.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/loops/XORComposite.java
diff --git a/jdk/src/share/classes/sun/java2d/opengl/OGLBlitLoops.java b/jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLBlitLoops.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/opengl/OGLBlitLoops.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLBlitLoops.java
diff --git a/jdk/src/share/classes/sun/java2d/opengl/OGLBufImgOps.java b/jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLBufImgOps.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/opengl/OGLBufImgOps.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLBufImgOps.java
diff --git a/jdk/src/share/classes/sun/java2d/opengl/OGLContext.java b/jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLContext.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/opengl/OGLContext.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLContext.java
diff --git a/jdk/src/share/classes/sun/java2d/opengl/OGLDrawImage.java b/jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLDrawImage.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/opengl/OGLDrawImage.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLDrawImage.java
diff --git a/jdk/src/share/classes/sun/java2d/opengl/OGLGraphicsConfig.java b/jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLGraphicsConfig.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/opengl/OGLGraphicsConfig.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLGraphicsConfig.java
diff --git a/jdk/src/share/classes/sun/java2d/opengl/OGLMaskBlit.java b/jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLMaskBlit.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/opengl/OGLMaskBlit.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLMaskBlit.java
diff --git a/jdk/src/share/classes/sun/java2d/opengl/OGLMaskFill.java b/jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLMaskFill.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/opengl/OGLMaskFill.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLMaskFill.java
diff --git a/jdk/src/share/classes/sun/java2d/opengl/OGLPaints.java b/jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLPaints.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/opengl/OGLPaints.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLPaints.java
diff --git a/jdk/src/share/classes/sun/java2d/opengl/OGLRenderQueue.java b/jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLRenderQueue.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/opengl/OGLRenderQueue.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLRenderQueue.java
diff --git a/jdk/src/share/classes/sun/java2d/opengl/OGLRenderer.java b/jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLRenderer.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/opengl/OGLRenderer.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLRenderer.java
diff --git a/jdk/src/share/classes/sun/java2d/opengl/OGLSurfaceData.java b/jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLSurfaceData.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/opengl/OGLSurfaceData.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLSurfaceData.java
diff --git a/jdk/src/share/classes/sun/java2d/opengl/OGLSurfaceDataProxy.java b/jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLSurfaceDataProxy.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/opengl/OGLSurfaceDataProxy.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLSurfaceDataProxy.java
diff --git a/jdk/src/share/classes/sun/java2d/opengl/OGLTextRenderer.java b/jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLTextRenderer.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/opengl/OGLTextRenderer.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLTextRenderer.java
diff --git a/jdk/src/share/classes/sun/java2d/opengl/OGLUtilities.java b/jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLUtilities.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/opengl/OGLUtilities.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLUtilities.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/AAShapePipe.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/AAShapePipe.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/AAShapePipe.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/AAShapePipe.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/AATextRenderer.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/AATextRenderer.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/AATextRenderer.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/AATextRenderer.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/AATileGenerator.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/AATileGenerator.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/AATileGenerator.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/AATileGenerator.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/AlphaColorPipe.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/AlphaColorPipe.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/AlphaColorPipe.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/AlphaColorPipe.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/AlphaPaintPipe.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/AlphaPaintPipe.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/AlphaPaintPipe.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/AlphaPaintPipe.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/BufferedBufImgOps.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/BufferedBufImgOps.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/BufferedBufImgOps.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/BufferedBufImgOps.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/BufferedContext.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/BufferedContext.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/BufferedContext.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/BufferedContext.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/BufferedMaskBlit.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/BufferedMaskBlit.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/BufferedMaskBlit.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/BufferedMaskBlit.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/BufferedMaskFill.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/BufferedMaskFill.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/BufferedMaskFill.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/BufferedMaskFill.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/BufferedOpCodes.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/BufferedOpCodes.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/BufferedOpCodes.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/BufferedOpCodes.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/BufferedPaints.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/BufferedPaints.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/BufferedRenderPipe.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/BufferedRenderPipe.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/BufferedRenderPipe.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/BufferedRenderPipe.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/BufferedTextPipe.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/BufferedTextPipe.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/BufferedTextPipe.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/BufferedTextPipe.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/CompositePipe.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/CompositePipe.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/CompositePipe.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/CompositePipe.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/DrawImage.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/DrawImage.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/DrawImage.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/DrawImage.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/DrawImagePipe.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/DrawImagePipe.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/DrawImagePipe.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/DrawImagePipe.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/GeneralCompositePipe.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/GeneralCompositePipe.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/GeneralCompositePipe.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/GeneralCompositePipe.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/GlyphListLoopPipe.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/GlyphListLoopPipe.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/GlyphListLoopPipe.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/GlyphListLoopPipe.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/GlyphListPipe.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/GlyphListPipe.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/GlyphListPipe.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/GlyphListPipe.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/LCDTextRenderer.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/LCDTextRenderer.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/LCDTextRenderer.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/LCDTextRenderer.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/LoopBasedPipe.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/LoopBasedPipe.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/LoopBasedPipe.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/LoopBasedPipe.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/LoopPipe.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/LoopPipe.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/LoopPipe.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/LoopPipe.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/NullPipe.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/NullPipe.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/NullPipe.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/NullPipe.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/OutlineTextRenderer.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/OutlineTextRenderer.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/OutlineTextRenderer.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/OutlineTextRenderer.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/ParallelogramPipe.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/ParallelogramPipe.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/ParallelogramPipe.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/ParallelogramPipe.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/PixelDrawPipe.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/PixelDrawPipe.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/PixelDrawPipe.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/PixelDrawPipe.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/PixelFillPipe.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/PixelFillPipe.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/PixelFillPipe.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/PixelFillPipe.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/PixelToParallelogramConverter.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/PixelToParallelogramConverter.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/PixelToParallelogramConverter.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/PixelToParallelogramConverter.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/PixelToShapeConverter.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/PixelToShapeConverter.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/PixelToShapeConverter.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/PixelToShapeConverter.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/Region.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/Region.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/Region.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/Region.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/RegionClipSpanIterator.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/RegionClipSpanIterator.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/RegionClipSpanIterator.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/RegionClipSpanIterator.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/RegionIterator.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/RegionIterator.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/RegionIterator.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/RegionIterator.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/RegionSpanIterator.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/RegionSpanIterator.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/RegionSpanIterator.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/RegionSpanIterator.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/RenderBuffer.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/RenderBuffer.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/RenderBuffer.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/RenderBuffer.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/RenderQueue.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/RenderQueue.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/RenderQueue.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/RenderQueue.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/RenderingEngine.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/RenderingEngine.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/RenderingEngine.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/RenderingEngine.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/ShapeDrawPipe.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/ShapeDrawPipe.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/ShapeDrawPipe.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/ShapeDrawPipe.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/ShapeSpanIterator.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/ShapeSpanIterator.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/ShapeSpanIterator.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/ShapeSpanIterator.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/SolidTextRenderer.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/SolidTextRenderer.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/SolidTextRenderer.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/SolidTextRenderer.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/SpanClipRenderer.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/SpanClipRenderer.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/SpanClipRenderer.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/SpanClipRenderer.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/SpanIterator.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/SpanIterator.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/SpanIterator.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/SpanIterator.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/SpanShapeRenderer.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/SpanShapeRenderer.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/SpanShapeRenderer.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/SpanShapeRenderer.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/TextPipe.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/TextPipe.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/TextPipe.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/TextPipe.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/TextRenderer.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/TextRenderer.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/TextRenderer.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/TextRenderer.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/ValidatePipe.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/ValidatePipe.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/ValidatePipe.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/ValidatePipe.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/hw/AccelDeviceEventListener.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/hw/AccelDeviceEventListener.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/hw/AccelDeviceEventListener.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/hw/AccelDeviceEventListener.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/hw/AccelDeviceEventNotifier.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/hw/AccelDeviceEventNotifier.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/hw/AccelDeviceEventNotifier.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/hw/AccelDeviceEventNotifier.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/hw/AccelGraphicsConfig.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/hw/AccelGraphicsConfig.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/hw/AccelGraphicsConfig.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/hw/AccelGraphicsConfig.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/hw/AccelSurface.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/hw/AccelSurface.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/hw/AccelSurface.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/hw/AccelSurface.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/hw/AccelTypedVolatileImage.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/hw/AccelTypedVolatileImage.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/hw/AccelTypedVolatileImage.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/hw/AccelTypedVolatileImage.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/hw/BufferedContextProvider.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/hw/BufferedContextProvider.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/hw/BufferedContextProvider.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/hw/BufferedContextProvider.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/hw/ContextCapabilities.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/hw/ContextCapabilities.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/hw/ContextCapabilities.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/hw/ContextCapabilities.java
diff --git a/jdk/src/share/classes/sun/java2d/pipe/hw/ExtendedBufferCapabilities.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/hw/ExtendedBufferCapabilities.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pipe/hw/ExtendedBufferCapabilities.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pipe/hw/ExtendedBufferCapabilities.java
diff --git a/jdk/src/share/classes/sun/java2d/pisces/Curve.java b/jdk/src/java.desktop/share/classes/sun/java2d/pisces/Curve.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pisces/Curve.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pisces/Curve.java
diff --git a/jdk/src/share/classes/sun/java2d/pisces/Dasher.java b/jdk/src/java.desktop/share/classes/sun/java2d/pisces/Dasher.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pisces/Dasher.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pisces/Dasher.java
diff --git a/jdk/src/share/classes/sun/java2d/pisces/Helpers.java b/jdk/src/java.desktop/share/classes/sun/java2d/pisces/Helpers.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pisces/Helpers.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pisces/Helpers.java
diff --git a/jdk/src/share/classes/sun/java2d/pisces/PiscesCache.java b/jdk/src/java.desktop/share/classes/sun/java2d/pisces/PiscesCache.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pisces/PiscesCache.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pisces/PiscesCache.java
diff --git a/jdk/src/share/classes/sun/java2d/pisces/PiscesRenderingEngine.java b/jdk/src/java.desktop/share/classes/sun/java2d/pisces/PiscesRenderingEngine.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pisces/PiscesRenderingEngine.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pisces/PiscesRenderingEngine.java
diff --git a/jdk/src/share/classes/sun/java2d/pisces/PiscesTileGenerator.java b/jdk/src/java.desktop/share/classes/sun/java2d/pisces/PiscesTileGenerator.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pisces/PiscesTileGenerator.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pisces/PiscesTileGenerator.java
diff --git a/jdk/src/share/classes/sun/java2d/pisces/Renderer.java b/jdk/src/java.desktop/share/classes/sun/java2d/pisces/Renderer.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pisces/Renderer.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pisces/Renderer.java
diff --git a/jdk/src/share/classes/sun/java2d/pisces/Stroker.java b/jdk/src/java.desktop/share/classes/sun/java2d/pisces/Stroker.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pisces/Stroker.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pisces/Stroker.java
diff --git a/jdk/src/share/classes/sun/java2d/pisces/TransformingPathConsumer2D.java b/jdk/src/java.desktop/share/classes/sun/java2d/pisces/TransformingPathConsumer2D.java
similarity index 100%
rename from jdk/src/share/classes/sun/java2d/pisces/TransformingPathConsumer2D.java
rename to jdk/src/java.desktop/share/classes/sun/java2d/pisces/TransformingPathConsumer2D.java
diff --git a/jdk/src/share/classes/sun/net/www/content/audio/aiff.java b/jdk/src/java.desktop/share/classes/sun/net/www/content/audio/aiff.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/content/audio/aiff.java
rename to jdk/src/java.desktop/share/classes/sun/net/www/content/audio/aiff.java
diff --git a/jdk/src/share/classes/sun/net/www/content/audio/basic.java b/jdk/src/java.desktop/share/classes/sun/net/www/content/audio/basic.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/content/audio/basic.java
rename to jdk/src/java.desktop/share/classes/sun/net/www/content/audio/basic.java
diff --git a/jdk/src/share/classes/sun/net/www/content/audio/wav.java b/jdk/src/java.desktop/share/classes/sun/net/www/content/audio/wav.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/content/audio/wav.java
rename to jdk/src/java.desktop/share/classes/sun/net/www/content/audio/wav.java
diff --git a/jdk/src/share/classes/sun/net/www/content/audio/x_aiff.java b/jdk/src/java.desktop/share/classes/sun/net/www/content/audio/x_aiff.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/content/audio/x_aiff.java
rename to jdk/src/java.desktop/share/classes/sun/net/www/content/audio/x_aiff.java
diff --git a/jdk/src/share/classes/sun/net/www/content/audio/x_wav.java b/jdk/src/java.desktop/share/classes/sun/net/www/content/audio/x_wav.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/content/audio/x_wav.java
rename to jdk/src/java.desktop/share/classes/sun/net/www/content/audio/x_wav.java
diff --git a/jdk/src/share/classes/sun/net/www/content/image/gif.java b/jdk/src/java.desktop/share/classes/sun/net/www/content/image/gif.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/content/image/gif.java
rename to jdk/src/java.desktop/share/classes/sun/net/www/content/image/gif.java
diff --git a/jdk/src/share/classes/sun/net/www/content/image/jpeg.java b/jdk/src/java.desktop/share/classes/sun/net/www/content/image/jpeg.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/content/image/jpeg.java
rename to jdk/src/java.desktop/share/classes/sun/net/www/content/image/jpeg.java
diff --git a/jdk/src/share/classes/sun/net/www/content/image/png.java b/jdk/src/java.desktop/share/classes/sun/net/www/content/image/png.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/content/image/png.java
rename to jdk/src/java.desktop/share/classes/sun/net/www/content/image/png.java
diff --git a/jdk/src/share/classes/sun/net/www/content/image/x_xbitmap.java b/jdk/src/java.desktop/share/classes/sun/net/www/content/image/x_xbitmap.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/content/image/x_xbitmap.java
rename to jdk/src/java.desktop/share/classes/sun/net/www/content/image/x_xbitmap.java
diff --git a/jdk/src/share/classes/sun/net/www/content/image/x_xpixmap.java b/jdk/src/java.desktop/share/classes/sun/net/www/content/image/x_xpixmap.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/content/image/x_xpixmap.java
rename to jdk/src/java.desktop/share/classes/sun/net/www/content/image/x_xpixmap.java
diff --git a/jdk/src/share/classes/sun/print/AttributeUpdater.java b/jdk/src/java.desktop/share/classes/sun/print/AttributeUpdater.java
similarity index 100%
rename from jdk/src/share/classes/sun/print/AttributeUpdater.java
rename to jdk/src/java.desktop/share/classes/sun/print/AttributeUpdater.java
diff --git a/jdk/src/share/classes/sun/print/BackgroundLookupListener.java b/jdk/src/java.desktop/share/classes/sun/print/BackgroundLookupListener.java
similarity index 100%
rename from jdk/src/share/classes/sun/print/BackgroundLookupListener.java
rename to jdk/src/java.desktop/share/classes/sun/print/BackgroundLookupListener.java
diff --git a/jdk/src/share/classes/sun/print/BackgroundServiceLookup.java b/jdk/src/java.desktop/share/classes/sun/print/BackgroundServiceLookup.java
similarity index 100%
rename from jdk/src/share/classes/sun/print/BackgroundServiceLookup.java
rename to jdk/src/java.desktop/share/classes/sun/print/BackgroundServiceLookup.java
diff --git a/jdk/src/share/classes/sun/print/CustomMediaSizeName.java b/jdk/src/java.desktop/share/classes/sun/print/CustomMediaSizeName.java
similarity index 100%
rename from jdk/src/share/classes/sun/print/CustomMediaSizeName.java
rename to jdk/src/java.desktop/share/classes/sun/print/CustomMediaSizeName.java
diff --git a/jdk/src/share/classes/sun/print/CustomMediaTray.java b/jdk/src/java.desktop/share/classes/sun/print/CustomMediaTray.java
similarity index 100%
rename from jdk/src/share/classes/sun/print/CustomMediaTray.java
rename to jdk/src/java.desktop/share/classes/sun/print/CustomMediaTray.java
diff --git a/jdk/src/share/classes/sun/print/DialogOwner.java b/jdk/src/java.desktop/share/classes/sun/print/DialogOwner.java
similarity index 100%
rename from jdk/src/share/classes/sun/print/DialogOwner.java
rename to jdk/src/java.desktop/share/classes/sun/print/DialogOwner.java
diff --git a/jdk/src/share/classes/sun/print/DocumentPropertiesUI.java b/jdk/src/java.desktop/share/classes/sun/print/DocumentPropertiesUI.java
similarity index 100%
rename from jdk/src/share/classes/sun/print/DocumentPropertiesUI.java
rename to jdk/src/java.desktop/share/classes/sun/print/DocumentPropertiesUI.java
diff --git a/jdk/src/share/classes/sun/print/ImagePrinter.java b/jdk/src/java.desktop/share/classes/sun/print/ImagePrinter.java
similarity index 100%
rename from jdk/src/share/classes/sun/print/ImagePrinter.java
rename to jdk/src/java.desktop/share/classes/sun/print/ImagePrinter.java
diff --git a/jdk/src/share/classes/sun/print/OpenBook.java b/jdk/src/java.desktop/share/classes/sun/print/OpenBook.java
similarity index 100%
rename from jdk/src/share/classes/sun/print/OpenBook.java
rename to jdk/src/java.desktop/share/classes/sun/print/OpenBook.java
diff --git a/jdk/src/share/classes/sun/print/PSPathGraphics.java b/jdk/src/java.desktop/share/classes/sun/print/PSPathGraphics.java
similarity index 100%
rename from jdk/src/share/classes/sun/print/PSPathGraphics.java
rename to jdk/src/java.desktop/share/classes/sun/print/PSPathGraphics.java
diff --git a/jdk/src/share/classes/sun/print/PSPrinterJob.java b/jdk/src/java.desktop/share/classes/sun/print/PSPrinterJob.java
similarity index 100%
rename from jdk/src/share/classes/sun/print/PSPrinterJob.java
rename to jdk/src/java.desktop/share/classes/sun/print/PSPrinterJob.java
diff --git a/jdk/src/share/classes/sun/print/PSStreamPrintJob.java b/jdk/src/java.desktop/share/classes/sun/print/PSStreamPrintJob.java
similarity index 100%
rename from jdk/src/share/classes/sun/print/PSStreamPrintJob.java
rename to jdk/src/java.desktop/share/classes/sun/print/PSStreamPrintJob.java
diff --git a/jdk/src/share/classes/sun/print/PSStreamPrintService.java b/jdk/src/java.desktop/share/classes/sun/print/PSStreamPrintService.java
similarity index 100%
rename from jdk/src/share/classes/sun/print/PSStreamPrintService.java
rename to jdk/src/java.desktop/share/classes/sun/print/PSStreamPrintService.java
diff --git a/jdk/src/share/classes/sun/print/PSStreamPrinterFactory.java b/jdk/src/java.desktop/share/classes/sun/print/PSStreamPrinterFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/print/PSStreamPrinterFactory.java
rename to jdk/src/java.desktop/share/classes/sun/print/PSStreamPrinterFactory.java
diff --git a/jdk/src/share/classes/sun/print/PageableDoc.java b/jdk/src/java.desktop/share/classes/sun/print/PageableDoc.java
similarity index 100%
rename from jdk/src/share/classes/sun/print/PageableDoc.java
rename to jdk/src/java.desktop/share/classes/sun/print/PageableDoc.java
diff --git a/jdk/src/share/classes/sun/print/PathGraphics.java b/jdk/src/java.desktop/share/classes/sun/print/PathGraphics.java
similarity index 100%
rename from jdk/src/share/classes/sun/print/PathGraphics.java
rename to jdk/src/java.desktop/share/classes/sun/print/PathGraphics.java
diff --git a/jdk/src/share/classes/sun/print/PeekGraphics.java b/jdk/src/java.desktop/share/classes/sun/print/PeekGraphics.java
similarity index 100%
rename from jdk/src/share/classes/sun/print/PeekGraphics.java
rename to jdk/src/java.desktop/share/classes/sun/print/PeekGraphics.java
diff --git a/jdk/src/share/classes/sun/print/PeekMetrics.java b/jdk/src/java.desktop/share/classes/sun/print/PeekMetrics.java
similarity index 100%
rename from jdk/src/share/classes/sun/print/PeekMetrics.java
rename to jdk/src/java.desktop/share/classes/sun/print/PeekMetrics.java
diff --git a/jdk/src/share/classes/sun/print/PrintJob2D.java b/jdk/src/java.desktop/share/classes/sun/print/PrintJob2D.java
similarity index 100%
rename from jdk/src/share/classes/sun/print/PrintJob2D.java
rename to jdk/src/java.desktop/share/classes/sun/print/PrintJob2D.java
diff --git a/jdk/src/share/classes/sun/print/PrintJobAttributeException.java b/jdk/src/java.desktop/share/classes/sun/print/PrintJobAttributeException.java
similarity index 100%
rename from jdk/src/share/classes/sun/print/PrintJobAttributeException.java
rename to jdk/src/java.desktop/share/classes/sun/print/PrintJobAttributeException.java
diff --git a/jdk/src/share/classes/sun/print/PrintJobFlavorException.java b/jdk/src/java.desktop/share/classes/sun/print/PrintJobFlavorException.java
similarity index 100%
rename from jdk/src/share/classes/sun/print/PrintJobFlavorException.java
rename to jdk/src/java.desktop/share/classes/sun/print/PrintJobFlavorException.java
diff --git a/jdk/src/share/classes/sun/print/PrinterGraphicsConfig.java b/jdk/src/java.desktop/share/classes/sun/print/PrinterGraphicsConfig.java
similarity index 100%
rename from jdk/src/share/classes/sun/print/PrinterGraphicsConfig.java
rename to jdk/src/java.desktop/share/classes/sun/print/PrinterGraphicsConfig.java
diff --git a/jdk/src/share/classes/sun/print/PrinterGraphicsDevice.java b/jdk/src/java.desktop/share/classes/sun/print/PrinterGraphicsDevice.java
similarity index 100%
rename from jdk/src/share/classes/sun/print/PrinterGraphicsDevice.java
rename to jdk/src/java.desktop/share/classes/sun/print/PrinterGraphicsDevice.java
diff --git a/jdk/src/share/classes/sun/print/PrinterJobWrapper.java b/jdk/src/java.desktop/share/classes/sun/print/PrinterJobWrapper.java
similarity index 100%
rename from jdk/src/share/classes/sun/print/PrinterJobWrapper.java
rename to jdk/src/java.desktop/share/classes/sun/print/PrinterJobWrapper.java
diff --git a/jdk/src/share/classes/sun/print/ProxyGraphics.java b/jdk/src/java.desktop/share/classes/sun/print/ProxyGraphics.java
similarity index 100%
rename from jdk/src/share/classes/sun/print/ProxyGraphics.java
rename to jdk/src/java.desktop/share/classes/sun/print/ProxyGraphics.java
diff --git a/jdk/src/share/classes/sun/print/ProxyGraphics2D.java b/jdk/src/java.desktop/share/classes/sun/print/ProxyGraphics2D.java
similarity index 100%
rename from jdk/src/share/classes/sun/print/ProxyGraphics2D.java
rename to jdk/src/java.desktop/share/classes/sun/print/ProxyGraphics2D.java
diff --git a/jdk/src/share/classes/sun/print/ProxyPrintGraphics.java b/jdk/src/java.desktop/share/classes/sun/print/ProxyPrintGraphics.java
similarity index 100%
rename from jdk/src/share/classes/sun/print/ProxyPrintGraphics.java
rename to jdk/src/java.desktop/share/classes/sun/print/ProxyPrintGraphics.java
diff --git a/jdk/src/share/classes/sun/print/RasterPrinterJob.java b/jdk/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java
similarity index 100%
rename from jdk/src/share/classes/sun/print/RasterPrinterJob.java
rename to jdk/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java
diff --git a/jdk/src/share/classes/sun/print/ServiceDialog.java b/jdk/src/java.desktop/share/classes/sun/print/ServiceDialog.java
similarity index 100%
rename from jdk/src/share/classes/sun/print/ServiceDialog.java
rename to jdk/src/java.desktop/share/classes/sun/print/ServiceDialog.java
diff --git a/jdk/src/share/classes/sun/print/ServiceNotifier.java b/jdk/src/java.desktop/share/classes/sun/print/ServiceNotifier.java
similarity index 100%
rename from jdk/src/share/classes/sun/print/ServiceNotifier.java
rename to jdk/src/java.desktop/share/classes/sun/print/ServiceNotifier.java
diff --git a/jdk/src/share/classes/sun/print/SunAlternateMedia.java b/jdk/src/java.desktop/share/classes/sun/print/SunAlternateMedia.java
similarity index 100%
rename from jdk/src/share/classes/sun/print/SunAlternateMedia.java
rename to jdk/src/java.desktop/share/classes/sun/print/SunAlternateMedia.java
diff --git a/jdk/src/share/classes/sun/print/SunMinMaxPage.java b/jdk/src/java.desktop/share/classes/sun/print/SunMinMaxPage.java
similarity index 100%
rename from jdk/src/share/classes/sun/print/SunMinMaxPage.java
rename to jdk/src/java.desktop/share/classes/sun/print/SunMinMaxPage.java
diff --git a/jdk/src/share/classes/sun/print/SunPageSelection.java b/jdk/src/java.desktop/share/classes/sun/print/SunPageSelection.java
similarity index 100%
rename from jdk/src/share/classes/sun/print/SunPageSelection.java
rename to jdk/src/java.desktop/share/classes/sun/print/SunPageSelection.java
diff --git a/jdk/src/share/classes/sun/print/SunPrinterJobService.java b/jdk/src/java.desktop/share/classes/sun/print/SunPrinterJobService.java
similarity index 100%
rename from jdk/src/share/classes/sun/print/SunPrinterJobService.java
rename to jdk/src/java.desktop/share/classes/sun/print/SunPrinterJobService.java
diff --git a/jdk/src/share/classes/sun/print/resources/duplex.png b/jdk/src/java.desktop/share/classes/sun/print/resources/duplex.png
similarity index 100%
rename from jdk/src/share/classes/sun/print/resources/duplex.png
rename to jdk/src/java.desktop/share/classes/sun/print/resources/duplex.png
diff --git a/jdk/src/share/classes/sun/print/resources/oneside.png b/jdk/src/java.desktop/share/classes/sun/print/resources/oneside.png
similarity index 100%
rename from jdk/src/share/classes/sun/print/resources/oneside.png
rename to jdk/src/java.desktop/share/classes/sun/print/resources/oneside.png
diff --git a/jdk/src/share/classes/sun/print/resources/orientLandscape.png b/jdk/src/java.desktop/share/classes/sun/print/resources/orientLandscape.png
similarity index 100%
rename from jdk/src/share/classes/sun/print/resources/orientLandscape.png
rename to jdk/src/java.desktop/share/classes/sun/print/resources/orientLandscape.png
diff --git a/jdk/src/share/classes/sun/print/resources/orientPortrait.png b/jdk/src/java.desktop/share/classes/sun/print/resources/orientPortrait.png
similarity index 100%
rename from jdk/src/share/classes/sun/print/resources/orientPortrait.png
rename to jdk/src/java.desktop/share/classes/sun/print/resources/orientPortrait.png
diff --git a/jdk/src/share/classes/sun/print/resources/orientRevLandscape.png b/jdk/src/java.desktop/share/classes/sun/print/resources/orientRevLandscape.png
similarity index 100%
rename from jdk/src/share/classes/sun/print/resources/orientRevLandscape.png
rename to jdk/src/java.desktop/share/classes/sun/print/resources/orientRevLandscape.png
diff --git a/jdk/src/share/classes/sun/print/resources/orientRevPortrait.png b/jdk/src/java.desktop/share/classes/sun/print/resources/orientRevPortrait.png
similarity index 100%
rename from jdk/src/share/classes/sun/print/resources/orientRevPortrait.png
rename to jdk/src/java.desktop/share/classes/sun/print/resources/orientRevPortrait.png
diff --git a/jdk/src/share/classes/sun/print/resources/serviceui.properties b/jdk/src/java.desktop/share/classes/sun/print/resources/serviceui.properties
similarity index 100%
rename from jdk/src/share/classes/sun/print/resources/serviceui.properties
rename to jdk/src/java.desktop/share/classes/sun/print/resources/serviceui.properties
diff --git a/jdk/src/share/classes/sun/print/resources/serviceui_de.properties b/jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_de.properties
similarity index 100%
rename from jdk/src/share/classes/sun/print/resources/serviceui_de.properties
rename to jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_de.properties
diff --git a/jdk/src/share/classes/sun/print/resources/serviceui_es.properties b/jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_es.properties
similarity index 100%
rename from jdk/src/share/classes/sun/print/resources/serviceui_es.properties
rename to jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_es.properties
diff --git a/jdk/src/share/classes/sun/print/resources/serviceui_fr.properties b/jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_fr.properties
similarity index 100%
rename from jdk/src/share/classes/sun/print/resources/serviceui_fr.properties
rename to jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_fr.properties
diff --git a/jdk/src/share/classes/sun/print/resources/serviceui_it.properties b/jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_it.properties
similarity index 100%
rename from jdk/src/share/classes/sun/print/resources/serviceui_it.properties
rename to jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_it.properties
diff --git a/jdk/src/share/classes/sun/print/resources/serviceui_ja.properties b/jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_ja.properties
similarity index 100%
rename from jdk/src/share/classes/sun/print/resources/serviceui_ja.properties
rename to jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_ja.properties
diff --git a/jdk/src/share/classes/sun/print/resources/serviceui_ko.properties b/jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_ko.properties
similarity index 100%
rename from jdk/src/share/classes/sun/print/resources/serviceui_ko.properties
rename to jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_ko.properties
diff --git a/jdk/src/share/classes/sun/print/resources/serviceui_pt_BR.properties b/jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_pt_BR.properties
similarity index 100%
rename from jdk/src/share/classes/sun/print/resources/serviceui_pt_BR.properties
rename to jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_pt_BR.properties
diff --git a/jdk/src/share/classes/sun/print/resources/serviceui_sv.properties b/jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_sv.properties
similarity index 100%
rename from jdk/src/share/classes/sun/print/resources/serviceui_sv.properties
rename to jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_sv.properties
diff --git a/jdk/src/share/classes/sun/print/resources/serviceui_zh_CN.properties b/jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_zh_CN.properties
similarity index 100%
rename from jdk/src/share/classes/sun/print/resources/serviceui_zh_CN.properties
rename to jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_zh_CN.properties
diff --git a/jdk/src/share/classes/sun/print/resources/serviceui_zh_TW.properties b/jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_zh_TW.properties
similarity index 100%
rename from jdk/src/share/classes/sun/print/resources/serviceui_zh_TW.properties
rename to jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_zh_TW.properties
diff --git a/jdk/src/share/classes/sun/print/resources/tumble.png b/jdk/src/java.desktop/share/classes/sun/print/resources/tumble.png
similarity index 100%
rename from jdk/src/share/classes/sun/print/resources/tumble.png
rename to jdk/src/java.desktop/share/classes/sun/print/resources/tumble.png
diff --git a/jdk/src/share/classes/sun/swing/AccumulativeRunnable.java b/jdk/src/java.desktop/share/classes/sun/swing/AccumulativeRunnable.java
similarity index 100%
rename from jdk/src/share/classes/sun/swing/AccumulativeRunnable.java
rename to jdk/src/java.desktop/share/classes/sun/swing/AccumulativeRunnable.java
diff --git a/jdk/src/share/classes/sun/swing/BakedArrayList.java b/jdk/src/java.desktop/share/classes/sun/swing/BakedArrayList.java
similarity index 100%
rename from jdk/src/share/classes/sun/swing/BakedArrayList.java
rename to jdk/src/java.desktop/share/classes/sun/swing/BakedArrayList.java
diff --git a/jdk/src/share/classes/sun/swing/CachedPainter.java b/jdk/src/java.desktop/share/classes/sun/swing/CachedPainter.java
similarity index 100%
rename from jdk/src/share/classes/sun/swing/CachedPainter.java
rename to jdk/src/java.desktop/share/classes/sun/swing/CachedPainter.java
diff --git a/jdk/src/share/classes/sun/swing/DefaultLayoutStyle.java b/jdk/src/java.desktop/share/classes/sun/swing/DefaultLayoutStyle.java
similarity index 100%
rename from jdk/src/share/classes/sun/swing/DefaultLayoutStyle.java
rename to jdk/src/java.desktop/share/classes/sun/swing/DefaultLayoutStyle.java
diff --git a/jdk/src/share/classes/sun/swing/DefaultLookup.java b/jdk/src/java.desktop/share/classes/sun/swing/DefaultLookup.java
similarity index 100%
rename from jdk/src/share/classes/sun/swing/DefaultLookup.java
rename to jdk/src/java.desktop/share/classes/sun/swing/DefaultLookup.java
diff --git a/jdk/src/share/classes/sun/swing/FilePane.java b/jdk/src/java.desktop/share/classes/sun/swing/FilePane.java
similarity index 100%
rename from jdk/src/share/classes/sun/swing/FilePane.java
rename to jdk/src/java.desktop/share/classes/sun/swing/FilePane.java
diff --git a/jdk/src/share/classes/sun/swing/ImageCache.java b/jdk/src/java.desktop/share/classes/sun/swing/ImageCache.java
similarity index 100%
rename from jdk/src/share/classes/sun/swing/ImageCache.java
rename to jdk/src/java.desktop/share/classes/sun/swing/ImageCache.java
diff --git a/jdk/src/share/classes/sun/swing/ImageIconUIResource.java b/jdk/src/java.desktop/share/classes/sun/swing/ImageIconUIResource.java
similarity index 100%
rename from jdk/src/share/classes/sun/swing/ImageIconUIResource.java
rename to jdk/src/java.desktop/share/classes/sun/swing/ImageIconUIResource.java
diff --git a/jdk/src/share/classes/sun/swing/JLightweightFrame.java b/jdk/src/java.desktop/share/classes/sun/swing/JLightweightFrame.java
similarity index 100%
rename from jdk/src/share/classes/sun/swing/JLightweightFrame.java
rename to jdk/src/java.desktop/share/classes/sun/swing/JLightweightFrame.java
diff --git a/jdk/src/share/classes/sun/swing/LightweightContent.java b/jdk/src/java.desktop/share/classes/sun/swing/LightweightContent.java
similarity index 100%
rename from jdk/src/share/classes/sun/swing/LightweightContent.java
rename to jdk/src/java.desktop/share/classes/sun/swing/LightweightContent.java
diff --git a/jdk/src/share/classes/sun/swing/MenuItemCheckIconFactory.java b/jdk/src/java.desktop/share/classes/sun/swing/MenuItemCheckIconFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/swing/MenuItemCheckIconFactory.java
rename to jdk/src/java.desktop/share/classes/sun/swing/MenuItemCheckIconFactory.java
diff --git a/jdk/src/share/classes/sun/swing/MenuItemLayoutHelper.java b/jdk/src/java.desktop/share/classes/sun/swing/MenuItemLayoutHelper.java
similarity index 100%
rename from jdk/src/share/classes/sun/swing/MenuItemLayoutHelper.java
rename to jdk/src/java.desktop/share/classes/sun/swing/MenuItemLayoutHelper.java
diff --git a/jdk/src/share/classes/sun/swing/PrintColorUIResource.java b/jdk/src/java.desktop/share/classes/sun/swing/PrintColorUIResource.java
similarity index 100%
rename from jdk/src/share/classes/sun/swing/PrintColorUIResource.java
rename to jdk/src/java.desktop/share/classes/sun/swing/PrintColorUIResource.java
diff --git a/jdk/src/share/classes/sun/swing/PrintingStatus.java b/jdk/src/java.desktop/share/classes/sun/swing/PrintingStatus.java
similarity index 100%
rename from jdk/src/share/classes/sun/swing/PrintingStatus.java
rename to jdk/src/java.desktop/share/classes/sun/swing/PrintingStatus.java
diff --git a/jdk/src/share/classes/sun/swing/StringUIClientPropertyKey.java b/jdk/src/java.desktop/share/classes/sun/swing/StringUIClientPropertyKey.java
similarity index 100%
rename from jdk/src/share/classes/sun/swing/StringUIClientPropertyKey.java
rename to jdk/src/java.desktop/share/classes/sun/swing/StringUIClientPropertyKey.java
diff --git a/jdk/src/share/classes/sun/swing/SwingAccessor.java b/jdk/src/java.desktop/share/classes/sun/swing/SwingAccessor.java
similarity index 100%
rename from jdk/src/share/classes/sun/swing/SwingAccessor.java
rename to jdk/src/java.desktop/share/classes/sun/swing/SwingAccessor.java
diff --git a/jdk/src/share/classes/sun/swing/SwingUtilities2.java b/jdk/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java
similarity index 100%
rename from jdk/src/share/classes/sun/swing/SwingUtilities2.java
rename to jdk/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java
diff --git a/jdk/src/share/classes/sun/swing/UIAction.java b/jdk/src/java.desktop/share/classes/sun/swing/UIAction.java
similarity index 100%
rename from jdk/src/share/classes/sun/swing/UIAction.java
rename to jdk/src/java.desktop/share/classes/sun/swing/UIAction.java
diff --git a/jdk/src/share/classes/sun/swing/UIClientPropertyKey.java b/jdk/src/java.desktop/share/classes/sun/swing/UIClientPropertyKey.java
similarity index 100%
rename from jdk/src/share/classes/sun/swing/UIClientPropertyKey.java
rename to jdk/src/java.desktop/share/classes/sun/swing/UIClientPropertyKey.java
diff --git a/jdk/src/share/classes/sun/swing/WindowsPlacesBar.java b/jdk/src/java.desktop/share/classes/sun/swing/WindowsPlacesBar.java
similarity index 100%
rename from jdk/src/share/classes/sun/swing/WindowsPlacesBar.java
rename to jdk/src/java.desktop/share/classes/sun/swing/WindowsPlacesBar.java
diff --git a/jdk/src/share/classes/sun/swing/icon/SortArrowIcon.java b/jdk/src/java.desktop/share/classes/sun/swing/icon/SortArrowIcon.java
similarity index 100%
rename from jdk/src/share/classes/sun/swing/icon/SortArrowIcon.java
rename to jdk/src/java.desktop/share/classes/sun/swing/icon/SortArrowIcon.java
diff --git a/jdk/src/share/classes/sun/swing/plaf/GTKKeybindings.java b/jdk/src/java.desktop/share/classes/sun/swing/plaf/GTKKeybindings.java
similarity index 100%
rename from jdk/src/share/classes/sun/swing/plaf/GTKKeybindings.java
rename to jdk/src/java.desktop/share/classes/sun/swing/plaf/GTKKeybindings.java
diff --git a/jdk/src/share/classes/sun/swing/plaf/WindowsKeybindings.java b/jdk/src/java.desktop/share/classes/sun/swing/plaf/WindowsKeybindings.java
similarity index 100%
rename from jdk/src/share/classes/sun/swing/plaf/WindowsKeybindings.java
rename to jdk/src/java.desktop/share/classes/sun/swing/plaf/WindowsKeybindings.java
diff --git a/jdk/src/share/classes/sun/swing/plaf/synth/DefaultSynthStyle.java b/jdk/src/java.desktop/share/classes/sun/swing/plaf/synth/DefaultSynthStyle.java
similarity index 100%
rename from jdk/src/share/classes/sun/swing/plaf/synth/DefaultSynthStyle.java
rename to jdk/src/java.desktop/share/classes/sun/swing/plaf/synth/DefaultSynthStyle.java
diff --git a/jdk/src/share/classes/sun/swing/plaf/synth/Paint9Painter.java b/jdk/src/java.desktop/share/classes/sun/swing/plaf/synth/Paint9Painter.java
similarity index 100%
rename from jdk/src/share/classes/sun/swing/plaf/synth/Paint9Painter.java
rename to jdk/src/java.desktop/share/classes/sun/swing/plaf/synth/Paint9Painter.java
diff --git a/jdk/src/share/classes/sun/swing/plaf/synth/StyleAssociation.java b/jdk/src/java.desktop/share/classes/sun/swing/plaf/synth/StyleAssociation.java
similarity index 100%
rename from jdk/src/share/classes/sun/swing/plaf/synth/StyleAssociation.java
rename to jdk/src/java.desktop/share/classes/sun/swing/plaf/synth/StyleAssociation.java
diff --git a/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUI.java b/jdk/src/java.desktop/share/classes/sun/swing/plaf/synth/SynthFileChooserUI.java
similarity index 100%
rename from jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUI.java
rename to jdk/src/java.desktop/share/classes/sun/swing/plaf/synth/SynthFileChooserUI.java
diff --git a/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java b/jdk/src/java.desktop/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java
rename to jdk/src/java.desktop/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java
diff --git a/jdk/src/share/classes/sun/swing/plaf/synth/SynthIcon.java b/jdk/src/java.desktop/share/classes/sun/swing/plaf/synth/SynthIcon.java
similarity index 100%
rename from jdk/src/share/classes/sun/swing/plaf/synth/SynthIcon.java
rename to jdk/src/java.desktop/share/classes/sun/swing/plaf/synth/SynthIcon.java
diff --git a/jdk/src/share/classes/sun/swing/plaf/windows/ClassicSortArrowIcon.java b/jdk/src/java.desktop/share/classes/sun/swing/plaf/windows/ClassicSortArrowIcon.java
similarity index 100%
rename from jdk/src/share/classes/sun/swing/plaf/windows/ClassicSortArrowIcon.java
rename to jdk/src/java.desktop/share/classes/sun/swing/plaf/windows/ClassicSortArrowIcon.java
diff --git a/jdk/src/share/classes/sun/swing/table/DefaultTableCellHeaderRenderer.java b/jdk/src/java.desktop/share/classes/sun/swing/table/DefaultTableCellHeaderRenderer.java
similarity index 100%
rename from jdk/src/share/classes/sun/swing/table/DefaultTableCellHeaderRenderer.java
rename to jdk/src/java.desktop/share/classes/sun/swing/table/DefaultTableCellHeaderRenderer.java
diff --git a/jdk/src/share/classes/sun/swing/text/CompoundPrintable.java b/jdk/src/java.desktop/share/classes/sun/swing/text/CompoundPrintable.java
similarity index 100%
rename from jdk/src/share/classes/sun/swing/text/CompoundPrintable.java
rename to jdk/src/java.desktop/share/classes/sun/swing/text/CompoundPrintable.java
diff --git a/jdk/src/share/classes/sun/swing/text/CountingPrintable.java b/jdk/src/java.desktop/share/classes/sun/swing/text/CountingPrintable.java
similarity index 100%
rename from jdk/src/share/classes/sun/swing/text/CountingPrintable.java
rename to jdk/src/java.desktop/share/classes/sun/swing/text/CountingPrintable.java
diff --git a/jdk/src/share/classes/sun/swing/text/TextComponentPrintable.java b/jdk/src/java.desktop/share/classes/sun/swing/text/TextComponentPrintable.java
similarity index 100%
rename from jdk/src/share/classes/sun/swing/text/TextComponentPrintable.java
rename to jdk/src/java.desktop/share/classes/sun/swing/text/TextComponentPrintable.java
diff --git a/jdk/src/share/classes/sun/swing/text/html/FrameEditorPaneTag.java b/jdk/src/java.desktop/share/classes/sun/swing/text/html/FrameEditorPaneTag.java
similarity index 100%
rename from jdk/src/share/classes/sun/swing/text/html/FrameEditorPaneTag.java
rename to jdk/src/java.desktop/share/classes/sun/swing/text/html/FrameEditorPaneTag.java
diff --git a/jdk/src/share/lib/cmm/lcms/CIEXYZ.pf b/jdk/src/java.desktop/share/conf/cmm/lcms/CIEXYZ.pf
similarity index 100%
rename from jdk/src/share/lib/cmm/lcms/CIEXYZ.pf
rename to jdk/src/java.desktop/share/conf/cmm/lcms/CIEXYZ.pf
diff --git a/jdk/src/share/lib/cmm/lcms/GRAY.pf b/jdk/src/java.desktop/share/conf/cmm/lcms/GRAY.pf
similarity index 100%
rename from jdk/src/share/lib/cmm/lcms/GRAY.pf
rename to jdk/src/java.desktop/share/conf/cmm/lcms/GRAY.pf
diff --git a/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf b/jdk/src/java.desktop/share/conf/cmm/lcms/LINEAR_RGB.pf
similarity index 100%
rename from jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf
rename to jdk/src/java.desktop/share/conf/cmm/lcms/LINEAR_RGB.pf
diff --git a/jdk/src/share/lib/cmm/lcms/PYCC.pf b/jdk/src/java.desktop/share/conf/cmm/lcms/PYCC.pf
similarity index 100%
rename from jdk/src/share/lib/cmm/lcms/PYCC.pf
rename to jdk/src/java.desktop/share/conf/cmm/lcms/PYCC.pf
diff --git a/jdk/src/share/lib/cmm/lcms/sRGB.pf b/jdk/src/java.desktop/share/conf/cmm/lcms/sRGB.pf
similarity index 100%
rename from jdk/src/share/lib/cmm/lcms/sRGB.pf
rename to jdk/src/java.desktop/share/conf/cmm/lcms/sRGB.pf
diff --git a/jdk/src/share/lib/images/cursors/invalid32x32.gif b/jdk/src/java.desktop/share/conf/images/cursors/invalid32x32.gif
similarity index 100%
rename from jdk/src/share/lib/images/cursors/invalid32x32.gif
rename to jdk/src/java.desktop/share/conf/images/cursors/invalid32x32.gif
diff --git a/jdk/src/share/lib/images/cursors/motif_CopyDrop32x32.gif b/jdk/src/java.desktop/share/conf/images/cursors/motif_CopyDrop32x32.gif
similarity index 100%
rename from jdk/src/share/lib/images/cursors/motif_CopyDrop32x32.gif
rename to jdk/src/java.desktop/share/conf/images/cursors/motif_CopyDrop32x32.gif
diff --git a/jdk/src/share/lib/images/cursors/motif_CopyNoDrop32x32.gif b/jdk/src/java.desktop/share/conf/images/cursors/motif_CopyNoDrop32x32.gif
similarity index 100%
rename from jdk/src/share/lib/images/cursors/motif_CopyNoDrop32x32.gif
rename to jdk/src/java.desktop/share/conf/images/cursors/motif_CopyNoDrop32x32.gif
diff --git a/jdk/src/share/lib/images/cursors/motif_LinkDrop32x32.gif b/jdk/src/java.desktop/share/conf/images/cursors/motif_LinkDrop32x32.gif
similarity index 100%
rename from jdk/src/share/lib/images/cursors/motif_LinkDrop32x32.gif
rename to jdk/src/java.desktop/share/conf/images/cursors/motif_LinkDrop32x32.gif
diff --git a/jdk/src/share/lib/images/cursors/motif_LinkNoDrop32x32.gif b/jdk/src/java.desktop/share/conf/images/cursors/motif_LinkNoDrop32x32.gif
similarity index 100%
rename from jdk/src/share/lib/images/cursors/motif_LinkNoDrop32x32.gif
rename to jdk/src/java.desktop/share/conf/images/cursors/motif_LinkNoDrop32x32.gif
diff --git a/jdk/src/share/lib/images/cursors/motif_MoveDrop32x32.gif b/jdk/src/java.desktop/share/conf/images/cursors/motif_MoveDrop32x32.gif
similarity index 100%
rename from jdk/src/share/lib/images/cursors/motif_MoveDrop32x32.gif
rename to jdk/src/java.desktop/share/conf/images/cursors/motif_MoveDrop32x32.gif
diff --git a/jdk/src/share/lib/images/cursors/motif_MoveNoDrop32x32.gif b/jdk/src/java.desktop/share/conf/images/cursors/motif_MoveNoDrop32x32.gif
similarity index 100%
rename from jdk/src/share/lib/images/cursors/motif_MoveNoDrop32x32.gif
rename to jdk/src/java.desktop/share/conf/images/cursors/motif_MoveNoDrop32x32.gif
diff --git a/jdk/src/share/lib/images/cursors/win32_CopyDrop32x32.gif b/jdk/src/java.desktop/share/conf/images/cursors/win32_CopyDrop32x32.gif
similarity index 100%
rename from jdk/src/share/lib/images/cursors/win32_CopyDrop32x32.gif
rename to jdk/src/java.desktop/share/conf/images/cursors/win32_CopyDrop32x32.gif
diff --git a/jdk/src/share/lib/images/cursors/win32_CopyNoDrop32x32.gif b/jdk/src/java.desktop/share/conf/images/cursors/win32_CopyNoDrop32x32.gif
similarity index 100%
rename from jdk/src/share/lib/images/cursors/win32_CopyNoDrop32x32.gif
rename to jdk/src/java.desktop/share/conf/images/cursors/win32_CopyNoDrop32x32.gif
diff --git a/jdk/src/share/lib/images/cursors/win32_LinkDrop32x32.gif b/jdk/src/java.desktop/share/conf/images/cursors/win32_LinkDrop32x32.gif
similarity index 100%
rename from jdk/src/share/lib/images/cursors/win32_LinkDrop32x32.gif
rename to jdk/src/java.desktop/share/conf/images/cursors/win32_LinkDrop32x32.gif
diff --git a/jdk/src/share/lib/images/cursors/win32_LinkNoDrop32x32.gif b/jdk/src/java.desktop/share/conf/images/cursors/win32_LinkNoDrop32x32.gif
similarity index 100%
rename from jdk/src/share/lib/images/cursors/win32_LinkNoDrop32x32.gif
rename to jdk/src/java.desktop/share/conf/images/cursors/win32_LinkNoDrop32x32.gif
diff --git a/jdk/src/share/lib/images/cursors/win32_MoveDrop32x32.gif b/jdk/src/java.desktop/share/conf/images/cursors/win32_MoveDrop32x32.gif
similarity index 100%
rename from jdk/src/share/lib/images/cursors/win32_MoveDrop32x32.gif
rename to jdk/src/java.desktop/share/conf/images/cursors/win32_MoveDrop32x32.gif
diff --git a/jdk/src/share/lib/images/cursors/win32_MoveNoDrop32x32.gif b/jdk/src/java.desktop/share/conf/images/cursors/win32_MoveNoDrop32x32.gif
similarity index 100%
rename from jdk/src/share/lib/images/cursors/win32_MoveNoDrop32x32.gif
rename to jdk/src/java.desktop/share/conf/images/cursors/win32_MoveNoDrop32x32.gif
diff --git a/jdk/src/share/classes/sun/print/psfont.properties.ja b/jdk/src/java.desktop/share/conf/psfont.properties.ja
similarity index 100%
rename from jdk/src/share/classes/sun/print/psfont.properties.ja
rename to jdk/src/java.desktop/share/conf/psfont.properties.ja
diff --git a/jdk/src/share/classes/sun/print/psfontj2d.properties b/jdk/src/java.desktop/share/conf/psfontj2d.properties
similarity index 100%
rename from jdk/src/share/classes/sun/print/psfontj2d.properties
rename to jdk/src/java.desktop/share/conf/psfontj2d.properties
diff --git a/jdk/src/share/lib/sound.properties b/jdk/src/java.desktop/share/conf/sound.properties
similarity index 100%
rename from jdk/src/share/lib/sound.properties
rename to jdk/src/java.desktop/share/conf/sound.properties
diff --git a/jdk/src/share/native/sun/awt/debug/debug_assert.c b/jdk/src/java.desktop/share/native/common/sun/awt/debug/debug_assert.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/debug/debug_assert.c
rename to jdk/src/java.desktop/share/native/common/sun/awt/debug/debug_assert.c
diff --git a/jdk/src/share/native/sun/awt/debug/debug_assert.h b/jdk/src/java.desktop/share/native/common/sun/awt/debug/debug_assert.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/debug/debug_assert.h
rename to jdk/src/java.desktop/share/native/common/sun/awt/debug/debug_assert.h
diff --git a/jdk/src/share/native/sun/awt/debug/debug_mem.c b/jdk/src/java.desktop/share/native/common/sun/awt/debug/debug_mem.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/debug/debug_mem.c
rename to jdk/src/java.desktop/share/native/common/sun/awt/debug/debug_mem.c
diff --git a/jdk/src/share/native/sun/awt/debug/debug_mem.h b/jdk/src/java.desktop/share/native/common/sun/awt/debug/debug_mem.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/debug/debug_mem.h
rename to jdk/src/java.desktop/share/native/common/sun/awt/debug/debug_mem.h
diff --git a/jdk/src/share/native/sun/awt/debug/debug_trace.c b/jdk/src/java.desktop/share/native/common/sun/awt/debug/debug_trace.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/debug/debug_trace.c
rename to jdk/src/java.desktop/share/native/common/sun/awt/debug/debug_trace.c
diff --git a/jdk/src/share/native/sun/awt/debug/debug_trace.h b/jdk/src/java.desktop/share/native/common/sun/awt/debug/debug_trace.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/debug/debug_trace.h
rename to jdk/src/java.desktop/share/native/common/sun/awt/debug/debug_trace.h
diff --git a/jdk/src/share/native/sun/awt/debug/debug_util.c b/jdk/src/java.desktop/share/native/common/sun/awt/debug/debug_util.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/debug/debug_util.c
rename to jdk/src/java.desktop/share/native/common/sun/awt/debug/debug_util.c
diff --git a/jdk/src/share/native/sun/awt/debug/debug_util.h b/jdk/src/java.desktop/share/native/common/sun/awt/debug/debug_util.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/debug/debug_util.h
rename to jdk/src/java.desktop/share/native/common/sun/awt/debug/debug_util.h
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c b/jdk/src/java.desktop/share/native/common/sun/awt/medialib/mlib_ImageCopy_Bit.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c
rename to jdk/src/java.desktop/share/native/common/sun/awt/medialib/mlib_ImageCopy_Bit.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageCreate.c b/jdk/src/java.desktop/share/native/common/sun/awt/medialib/mlib_ImageCreate.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageCreate.c
rename to jdk/src/java.desktop/share/native/common/sun/awt/medialib/mlib_ImageCreate.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_sys.c b/jdk/src/java.desktop/share/native/common/sun/awt/medialib/mlib_sys.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_sys.c
rename to jdk/src/java.desktop/share/native/common/sun/awt/medialib/mlib_sys.c
diff --git a/jdk/src/share/native/sun/awt/utility/rect.c b/jdk/src/java.desktop/share/native/common/sun/awt/utility/rect.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/utility/rect.c
rename to jdk/src/java.desktop/share/native/common/sun/awt/utility/rect.c
diff --git a/jdk/src/share/native/sun/font/AccelGlyphCache.c b/jdk/src/java.desktop/share/native/common/sun/font/AccelGlyphCache.c
similarity index 100%
rename from jdk/src/share/native/sun/font/AccelGlyphCache.c
rename to jdk/src/java.desktop/share/native/common/sun/font/AccelGlyphCache.c
diff --git a/jdk/src/share/native/sun/font/AccelGlyphCache.h b/jdk/src/java.desktop/share/native/common/sun/font/AccelGlyphCache.h
similarity index 100%
rename from jdk/src/share/native/sun/font/AccelGlyphCache.h
rename to jdk/src/java.desktop/share/native/common/sun/font/AccelGlyphCache.h
diff --git a/jdk/src/share/native/sun/font/fontscalerdefs.h b/jdk/src/java.desktop/share/native/common/sun/font/fontscalerdefs.h
similarity index 100%
rename from jdk/src/share/native/sun/font/fontscalerdefs.h
rename to jdk/src/java.desktop/share/native/common/sun/font/fontscalerdefs.h
diff --git a/jdk/src/share/native/sun/font/sunfontids.h b/jdk/src/java.desktop/share/native/common/sun/font/sunfontids.h
similarity index 100%
rename from jdk/src/share/native/sun/font/sunfontids.h
rename to jdk/src/java.desktop/share/native/common/sun/font/sunfontids.h
diff --git a/jdk/src/share/native/sun/java2d/opengl/J2D_GL/gl.h b/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/J2D_GL/gl.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/opengl/J2D_GL/gl.h
rename to jdk/src/java.desktop/share/native/common/sun/java2d/opengl/J2D_GL/gl.h
diff --git a/jdk/src/share/native/sun/java2d/opengl/J2D_GL/glext.h b/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/J2D_GL/glext.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/opengl/J2D_GL/glext.h
rename to jdk/src/java.desktop/share/native/common/sun/java2d/opengl/J2D_GL/glext.h
diff --git a/jdk/src/share/native/sun/java2d/opengl/OGLBlitLoops.c b/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLBlitLoops.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/opengl/OGLBlitLoops.c
rename to jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLBlitLoops.c
diff --git a/jdk/src/share/native/sun/java2d/opengl/OGLBlitLoops.h b/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLBlitLoops.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/opengl/OGLBlitLoops.h
rename to jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLBlitLoops.h
diff --git a/jdk/src/share/native/sun/java2d/opengl/OGLBufImgOps.c b/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLBufImgOps.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/opengl/OGLBufImgOps.c
rename to jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLBufImgOps.c
diff --git a/jdk/src/share/native/sun/java2d/opengl/OGLBufImgOps.h b/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLBufImgOps.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/opengl/OGLBufImgOps.h
rename to jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLBufImgOps.h
diff --git a/jdk/src/share/native/sun/java2d/opengl/OGLContext.c b/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLContext.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/opengl/OGLContext.c
rename to jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLContext.c
diff --git a/jdk/src/share/native/sun/java2d/opengl/OGLContext.h b/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLContext.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/opengl/OGLContext.h
rename to jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLContext.h
diff --git a/jdk/src/share/native/sun/java2d/opengl/OGLFuncMacros.h b/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLFuncMacros.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/opengl/OGLFuncMacros.h
rename to jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLFuncMacros.h
diff --git a/jdk/src/share/native/sun/java2d/opengl/OGLFuncs.c b/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLFuncs.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/opengl/OGLFuncs.c
rename to jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLFuncs.c
diff --git a/jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h b/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLFuncs.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h
rename to jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLFuncs.h
diff --git a/jdk/src/share/native/sun/java2d/opengl/OGLMaskBlit.c b/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLMaskBlit.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/opengl/OGLMaskBlit.c
rename to jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLMaskBlit.c
diff --git a/jdk/src/share/native/sun/java2d/opengl/OGLMaskBlit.h b/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLMaskBlit.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/opengl/OGLMaskBlit.h
rename to jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLMaskBlit.h
diff --git a/jdk/src/share/native/sun/java2d/opengl/OGLMaskFill.c b/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLMaskFill.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/opengl/OGLMaskFill.c
rename to jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLMaskFill.c
diff --git a/jdk/src/share/native/sun/java2d/opengl/OGLMaskFill.h b/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLMaskFill.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/opengl/OGLMaskFill.h
rename to jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLMaskFill.h
diff --git a/jdk/src/share/native/sun/java2d/opengl/OGLPaints.c b/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLPaints.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/opengl/OGLPaints.c
rename to jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLPaints.c
diff --git a/jdk/src/share/native/sun/java2d/opengl/OGLPaints.h b/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLPaints.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/opengl/OGLPaints.h
rename to jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLPaints.h
diff --git a/jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c b/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLRenderQueue.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c
rename to jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLRenderQueue.c
diff --git a/jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.h b/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLRenderQueue.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.h
rename to jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLRenderQueue.h
diff --git a/jdk/src/share/native/sun/java2d/opengl/OGLRenderer.c b/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLRenderer.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/opengl/OGLRenderer.c
rename to jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLRenderer.c
diff --git a/jdk/src/share/native/sun/java2d/opengl/OGLRenderer.h b/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLRenderer.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/opengl/OGLRenderer.h
rename to jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLRenderer.h
diff --git a/jdk/src/share/native/sun/java2d/opengl/OGLSurfaceData.c b/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLSurfaceData.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/opengl/OGLSurfaceData.c
rename to jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLSurfaceData.c
diff --git a/jdk/src/share/native/sun/java2d/opengl/OGLSurfaceData.h b/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLSurfaceData.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/opengl/OGLSurfaceData.h
rename to jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLSurfaceData.h
diff --git a/jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c b/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLTextRenderer.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c
rename to jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLTextRenderer.c
diff --git a/jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.h b/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLTextRenderer.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.h
rename to jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLTextRenderer.h
diff --git a/jdk/src/share/native/sun/java2d/opengl/OGLVertexCache.c b/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLVertexCache.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/opengl/OGLVertexCache.c
rename to jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLVertexCache.c
diff --git a/jdk/src/share/native/sun/java2d/opengl/OGLVertexCache.h b/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLVertexCache.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/opengl/OGLVertexCache.h
rename to jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLVertexCache.h
diff --git a/jdk/src/share/javavm/export/jawt.h b/jdk/src/java.desktop/share/native/include/jawt.h
similarity index 100%
rename from jdk/src/share/javavm/export/jawt.h
rename to jdk/src/java.desktop/share/native/include/jawt.h
diff --git a/jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/BufImgSurfaceData.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/BufImgSurfaceData.c
diff --git a/jdk/src/share/native/sun/awt/image/BufImgSurfaceData.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/BufImgSurfaceData.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/BufImgSurfaceData.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/BufImgSurfaceData.h
diff --git a/jdk/src/share/native/sun/awt/image/DataBufferNative.c b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/DataBufferNative.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/DataBufferNative.c
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/DataBufferNative.c
diff --git a/jdk/src/share/native/sun/awt/image/awt_ImageRep.c b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/awt_ImageRep.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/awt_ImageRep.c
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/awt_ImageRep.c
diff --git a/jdk/src/share/native/sun/awt/image/awt_parseImage.c b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/awt_parseImage.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/awt_parseImage.c
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/awt_parseImage.c
diff --git a/jdk/src/share/native/sun/awt/image/awt_parseImage.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/awt_parseImage.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/awt_parseImage.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/awt_parseImage.h
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/README b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/README
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/README
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/README
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_alpha.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_alpha.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_alpha.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_alpha.h
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_anycm.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_anycm.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_anycm.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_anycm.h
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_colors.c b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_colors.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_colors.c
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_colors.c
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_colors.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_colors.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_colors.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_colors.h
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_dcm.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_dcm.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_dcm.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_dcm.h
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_dcm8.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_dcm8.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_dcm8.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_dcm8.h
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_dir8dither.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_dir8dither.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_dir8dither.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_dir8dither.h
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_dirdither.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_dirdither.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_dirdither.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_dirdither.h
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_fscolor.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_fscolor.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_fscolor.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_fscolor.h
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_fsdither.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_fsdither.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_fsdither.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_fsdither.h
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_fsgray.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_fsgray.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_fsgray.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_fsgray.h
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_fsutil.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_fsutil.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_fsutil.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_fsutil.h
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_globals.c b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_globals.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_globals.c
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_globals.c
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_globals.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_globals.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_globals.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_globals.h
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_icm.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_icm.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_icm.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_icm.h
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_input32.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_input32.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_input32.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_input32.h
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_input8.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_input8.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_input8.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_input8.h
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_input8_32.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_input8_32.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_input8_32.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_input8_32.h
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_nodither.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_nodither.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_nodither.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_nodither.h
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_noscale.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_noscale.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_noscale.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_noscale.h
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_opaque.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_opaque.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_opaque.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_opaque.h
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_ordclrsgn.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_ordclrsgn.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_ordclrsgn.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_ordclrsgn.h
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_ordclruns.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_ordclruns.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_ordclruns.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_ordclruns.h
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_orddither.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_orddither.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_orddither.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_orddither.h
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_ordgray.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_ordgray.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_ordgray.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_ordgray.h
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_output16.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_output16.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_output16.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_output16.h
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_output16_32.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_output16_32.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_output16_32.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_output16_32.h
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_output24.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_output24.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_output24.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_output24.h
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_output32.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_output32.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_output32.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_output32.h
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_output8.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_output8.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_output8.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_output8.h
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_output8_16_24.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_output8_16_24.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_output8_16_24.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_output8_16_24.h
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_output8_16_32.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_output8_16_32.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_output8_16_32.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_output8_16_32.h
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_output8_32.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_output8_32.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_output8_32.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_output8_32.h
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_replscale.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_replscale.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_replscale.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_replscale.h
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_scaleloop.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_scaleloop.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_scaleloop.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_scaleloop.h
diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_util.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_util.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/cvutils/img_util.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_util.h
diff --git a/jdk/src/share/native/sun/awt/image/dither.c b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/dither.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/dither.c
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/dither.c
diff --git a/jdk/src/share/native/sun/awt/image/dither.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/dither.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/dither.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/dither.h
diff --git a/jdk/src/share/native/sun/awt/image/gif/gifdecoder.c b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/gif/gifdecoder.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/gif/gifdecoder.c
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/gif/gifdecoder.c
diff --git a/jdk/src/share/native/sun/awt/image/imageInitIDs.c b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/imageInitIDs.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/imageInitIDs.c
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/imageInitIDs.c
diff --git a/jdk/src/share/native/sun/awt/image/imageInitIDs.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/imageInitIDs.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/imageInitIDs.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/image/imageInitIDs.h
diff --git a/jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c b/jdk/src/java.desktop/share/native/libawt/sun/awt/medialib/awt_ImagingLib.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/medialib/awt_ImagingLib.c
diff --git a/jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.h b/jdk/src/java.desktop/share/native/libawt/sun/awt/medialib/awt_ImagingLib.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.h
rename to jdk/src/java.desktop/share/native/libawt/sun/awt/medialib/awt_ImagingLib.h
diff --git a/jdk/src/share/native/sun/java2d/Disposer.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/Disposer.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/Disposer.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/Disposer.c
diff --git a/jdk/src/share/native/sun/java2d/Disposer.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/Disposer.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/Disposer.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/Disposer.h
diff --git a/jdk/src/share/native/sun/java2d/ShaderList.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/ShaderList.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/ShaderList.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/ShaderList.c
diff --git a/jdk/src/share/native/sun/java2d/ShaderList.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/ShaderList.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/ShaderList.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/ShaderList.h
diff --git a/jdk/src/share/native/sun/java2d/SurfaceData.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/SurfaceData.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/SurfaceData.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/SurfaceData.c
diff --git a/jdk/src/share/native/sun/java2d/SurfaceData.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/SurfaceData.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/SurfaceData.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/SurfaceData.h
diff --git a/jdk/src/share/native/sun/java2d/Trace.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/Trace.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/Trace.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/Trace.c
diff --git a/jdk/src/share/native/sun/java2d/Trace.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/Trace.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/Trace.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/Trace.h
diff --git a/jdk/src/share/native/sun/java2d/loops/AlphaMacros.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AlphaMacros.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/AlphaMacros.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AlphaMacros.c
diff --git a/jdk/src/share/native/sun/java2d/loops/AlphaMacros.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AlphaMacros.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/AlphaMacros.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AlphaMacros.h
diff --git a/jdk/src/share/native/sun/java2d/loops/AlphaMath.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AlphaMath.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/AlphaMath.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AlphaMath.c
diff --git a/jdk/src/share/native/sun/java2d/loops/AlphaMath.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AlphaMath.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/AlphaMath.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AlphaMath.h
diff --git a/jdk/src/share/native/sun/java2d/loops/Any3Byte.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Any3Byte.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/Any3Byte.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Any3Byte.c
diff --git a/jdk/src/share/native/sun/java2d/loops/Any3Byte.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Any3Byte.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/Any3Byte.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Any3Byte.h
diff --git a/jdk/src/share/native/sun/java2d/loops/Any4Byte.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Any4Byte.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/Any4Byte.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Any4Byte.c
diff --git a/jdk/src/share/native/sun/java2d/loops/Any4Byte.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Any4Byte.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/Any4Byte.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Any4Byte.h
diff --git a/jdk/src/share/native/sun/java2d/loops/AnyByte.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AnyByte.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/AnyByte.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AnyByte.c
diff --git a/jdk/src/share/native/sun/java2d/loops/AnyByte.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AnyByte.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/AnyByte.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AnyByte.h
diff --git a/jdk/src/share/native/sun/java2d/loops/AnyByteBinary.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AnyByteBinary.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/AnyByteBinary.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AnyByteBinary.h
diff --git a/jdk/src/share/native/sun/java2d/loops/AnyInt.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AnyInt.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/AnyInt.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AnyInt.c
diff --git a/jdk/src/share/native/sun/java2d/loops/AnyInt.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AnyInt.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/AnyInt.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AnyInt.h
diff --git a/jdk/src/share/native/sun/java2d/loops/AnyShort.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AnyShort.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/AnyShort.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AnyShort.c
diff --git a/jdk/src/share/native/sun/java2d/loops/AnyShort.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AnyShort.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/AnyShort.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AnyShort.h
diff --git a/jdk/src/share/native/sun/java2d/loops/Blit.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Blit.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/Blit.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Blit.c
diff --git a/jdk/src/share/native/sun/java2d/loops/BlitBg.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/BlitBg.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/BlitBg.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/BlitBg.c
diff --git a/jdk/src/share/native/sun/java2d/loops/ByteBinary1Bit.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteBinary1Bit.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/ByteBinary1Bit.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteBinary1Bit.c
diff --git a/jdk/src/share/native/sun/java2d/loops/ByteBinary1Bit.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteBinary1Bit.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/ByteBinary1Bit.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteBinary1Bit.h
diff --git a/jdk/src/share/native/sun/java2d/loops/ByteBinary2Bit.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteBinary2Bit.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/ByteBinary2Bit.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteBinary2Bit.c
diff --git a/jdk/src/share/native/sun/java2d/loops/ByteBinary2Bit.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteBinary2Bit.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/ByteBinary2Bit.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteBinary2Bit.h
diff --git a/jdk/src/share/native/sun/java2d/loops/ByteBinary4Bit.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteBinary4Bit.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/ByteBinary4Bit.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteBinary4Bit.c
diff --git a/jdk/src/share/native/sun/java2d/loops/ByteBinary4Bit.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteBinary4Bit.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/ByteBinary4Bit.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteBinary4Bit.h
diff --git a/jdk/src/share/native/sun/java2d/loops/ByteGray.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteGray.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/ByteGray.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteGray.c
diff --git a/jdk/src/share/native/sun/java2d/loops/ByteGray.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteGray.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/ByteGray.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteGray.h
diff --git a/jdk/src/share/native/sun/java2d/loops/ByteIndexed.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteIndexed.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/ByteIndexed.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteIndexed.c
diff --git a/jdk/src/share/native/sun/java2d/loops/ByteIndexed.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteIndexed.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/ByteIndexed.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteIndexed.h
diff --git a/jdk/src/share/native/sun/java2d/loops/DrawLine.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/DrawLine.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/DrawLine.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/DrawLine.c
diff --git a/jdk/src/share/native/sun/java2d/loops/DrawParallelogram.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/DrawParallelogram.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/DrawParallelogram.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/DrawParallelogram.c
diff --git a/jdk/src/share/native/sun/java2d/loops/DrawPath.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/DrawPath.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/DrawPath.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/DrawPath.c
diff --git a/jdk/src/share/native/sun/java2d/loops/DrawPath.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/DrawPath.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/DrawPath.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/DrawPath.h
diff --git a/jdk/src/share/native/sun/java2d/loops/DrawPolygons.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/DrawPolygons.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/DrawPolygons.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/DrawPolygons.c
diff --git a/jdk/src/share/native/sun/java2d/loops/DrawRect.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/DrawRect.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/DrawRect.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/DrawRect.c
diff --git a/jdk/src/share/native/sun/java2d/loops/FillParallelogram.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/FillParallelogram.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/FillParallelogram.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/FillParallelogram.c
diff --git a/jdk/src/share/native/sun/java2d/loops/FillPath.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/FillPath.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/FillPath.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/FillPath.c
diff --git a/jdk/src/share/native/sun/java2d/loops/FillRect.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/FillRect.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/FillRect.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/FillRect.c
diff --git a/jdk/src/share/native/sun/java2d/loops/FillSpans.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/FillSpans.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/FillSpans.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/FillSpans.c
diff --git a/jdk/src/share/native/sun/java2d/loops/FourByteAbgr.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/FourByteAbgr.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/FourByteAbgr.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/FourByteAbgr.c
diff --git a/jdk/src/share/native/sun/java2d/loops/FourByteAbgr.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/FourByteAbgr.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/FourByteAbgr.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/FourByteAbgr.h
diff --git a/jdk/src/share/native/sun/java2d/loops/FourByteAbgrPre.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/FourByteAbgrPre.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/FourByteAbgrPre.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/FourByteAbgrPre.c
diff --git a/jdk/src/share/native/sun/java2d/loops/FourByteAbgrPre.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/FourByteAbgrPre.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/FourByteAbgrPre.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/FourByteAbgrPre.h
diff --git a/jdk/src/share/native/sun/java2d/loops/GlyphImageRef.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/GlyphImageRef.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/GlyphImageRef.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/GlyphImageRef.h
diff --git a/jdk/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/GraphicsPrimitiveMgr.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/GraphicsPrimitiveMgr.c
diff --git a/jdk/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/GraphicsPrimitiveMgr.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/GraphicsPrimitiveMgr.h
diff --git a/jdk/src/share/native/sun/java2d/loops/ImageData.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ImageData.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/ImageData.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ImageData.h
diff --git a/jdk/src/share/native/sun/java2d/loops/Index12Gray.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Index12Gray.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/Index12Gray.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Index12Gray.c
diff --git a/jdk/src/share/native/sun/java2d/loops/Index12Gray.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Index12Gray.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/Index12Gray.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Index12Gray.h
diff --git a/jdk/src/share/native/sun/java2d/loops/Index8Gray.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Index8Gray.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/Index8Gray.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Index8Gray.c
diff --git a/jdk/src/share/native/sun/java2d/loops/Index8Gray.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Index8Gray.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/Index8Gray.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Index8Gray.h
diff --git a/jdk/src/share/native/sun/java2d/loops/IntArgb.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntArgb.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/IntArgb.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntArgb.c
diff --git a/jdk/src/share/native/sun/java2d/loops/IntArgb.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntArgb.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/IntArgb.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntArgb.h
diff --git a/jdk/src/share/native/sun/java2d/loops/IntArgbBm.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntArgbBm.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/IntArgbBm.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntArgbBm.c
diff --git a/jdk/src/share/native/sun/java2d/loops/IntArgbBm.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntArgbBm.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/IntArgbBm.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntArgbBm.h
diff --git a/jdk/src/share/native/sun/java2d/loops/IntArgbPre.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntArgbPre.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/IntArgbPre.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntArgbPre.c
diff --git a/jdk/src/share/native/sun/java2d/loops/IntArgbPre.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntArgbPre.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/IntArgbPre.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntArgbPre.h
diff --git a/jdk/src/share/native/sun/java2d/loops/IntBgr.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntBgr.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/IntBgr.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntBgr.c
diff --git a/jdk/src/share/native/sun/java2d/loops/IntBgr.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntBgr.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/IntBgr.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntBgr.h
diff --git a/jdk/src/share/native/sun/java2d/loops/IntDcm.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntDcm.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/IntDcm.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntDcm.h
diff --git a/jdk/src/share/native/sun/java2d/loops/IntRgb.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntRgb.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/IntRgb.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntRgb.c
diff --git a/jdk/src/share/native/sun/java2d/loops/IntRgb.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntRgb.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/IntRgb.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntRgb.h
diff --git a/jdk/src/share/native/sun/java2d/loops/IntRgbx.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntRgbx.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/IntRgbx.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntRgbx.c
diff --git a/jdk/src/share/native/sun/java2d/loops/IntRgbx.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntRgbx.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/IntRgbx.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntRgbx.h
diff --git a/jdk/src/share/native/sun/java2d/loops/LineUtils.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/LineUtils.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/LineUtils.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/LineUtils.h
diff --git a/jdk/src/share/native/sun/java2d/loops/LoopMacros.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/LoopMacros.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/LoopMacros.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/LoopMacros.h
diff --git a/jdk/src/share/native/sun/java2d/loops/MapAccelFunc.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/MapAccelFunc.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/MapAccelFunc.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/MapAccelFunc.c
diff --git a/jdk/src/share/native/sun/java2d/loops/MaskBlit.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/MaskBlit.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/MaskBlit.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/MaskBlit.c
diff --git a/jdk/src/share/native/sun/java2d/loops/MaskFill.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/MaskFill.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/MaskFill.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/MaskFill.c
diff --git a/jdk/src/share/native/sun/java2d/loops/ParallelogramUtils.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ParallelogramUtils.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/ParallelogramUtils.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ParallelogramUtils.h
diff --git a/jdk/src/share/native/sun/java2d/loops/ProcessPath.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ProcessPath.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/ProcessPath.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ProcessPath.c
diff --git a/jdk/src/share/native/sun/java2d/loops/ProcessPath.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ProcessPath.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/ProcessPath.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ProcessPath.h
diff --git a/jdk/src/share/native/sun/java2d/loops/ScaledBlit.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ScaledBlit.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/ScaledBlit.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ScaledBlit.c
diff --git a/jdk/src/share/native/sun/java2d/loops/ThreeByteBgr.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ThreeByteBgr.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/ThreeByteBgr.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ThreeByteBgr.c
diff --git a/jdk/src/share/native/sun/java2d/loops/ThreeByteBgr.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ThreeByteBgr.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/ThreeByteBgr.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ThreeByteBgr.h
diff --git a/jdk/src/share/native/sun/java2d/loops/TransformHelper.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/TransformHelper.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/TransformHelper.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/TransformHelper.c
diff --git a/jdk/src/share/native/sun/java2d/loops/Ushort4444Argb.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Ushort4444Argb.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/Ushort4444Argb.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Ushort4444Argb.c
diff --git a/jdk/src/share/native/sun/java2d/loops/Ushort4444Argb.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Ushort4444Argb.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/Ushort4444Argb.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Ushort4444Argb.h
diff --git a/jdk/src/share/native/sun/java2d/loops/Ushort555Rgb.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Ushort555Rgb.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/Ushort555Rgb.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Ushort555Rgb.c
diff --git a/jdk/src/share/native/sun/java2d/loops/Ushort555Rgb.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Ushort555Rgb.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/Ushort555Rgb.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Ushort555Rgb.h
diff --git a/jdk/src/share/native/sun/java2d/loops/Ushort555Rgbx.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Ushort555Rgbx.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/Ushort555Rgbx.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Ushort555Rgbx.c
diff --git a/jdk/src/share/native/sun/java2d/loops/Ushort555Rgbx.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Ushort555Rgbx.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/Ushort555Rgbx.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Ushort555Rgbx.h
diff --git a/jdk/src/share/native/sun/java2d/loops/Ushort565Rgb.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Ushort565Rgb.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/Ushort565Rgb.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Ushort565Rgb.c
diff --git a/jdk/src/share/native/sun/java2d/loops/Ushort565Rgb.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Ushort565Rgb.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/Ushort565Rgb.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Ushort565Rgb.h
diff --git a/jdk/src/share/native/sun/java2d/loops/UshortGray.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/UshortGray.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/UshortGray.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/UshortGray.c
diff --git a/jdk/src/share/native/sun/java2d/loops/UshortGray.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/UshortGray.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/UshortGray.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/UshortGray.h
diff --git a/jdk/src/share/native/sun/java2d/loops/UshortIndexed.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/UshortIndexed.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/UshortIndexed.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/UshortIndexed.c
diff --git a/jdk/src/share/native/sun/java2d/loops/UshortIndexed.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/UshortIndexed.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/loops/UshortIndexed.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/UshortIndexed.h
diff --git a/jdk/src/share/native/sun/java2d/pipe/BufferedMaskBlit.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe/BufferedMaskBlit.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/pipe/BufferedMaskBlit.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe/BufferedMaskBlit.c
diff --git a/jdk/src/share/native/sun/java2d/pipe/BufferedRenderPipe.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe/BufferedRenderPipe.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/pipe/BufferedRenderPipe.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe/BufferedRenderPipe.c
diff --git a/jdk/src/share/native/sun/java2d/pipe/PathConsumer2D.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe/PathConsumer2D.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/pipe/PathConsumer2D.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe/PathConsumer2D.h
diff --git a/jdk/src/share/native/sun/java2d/pipe/Region.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe/Region.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/pipe/Region.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe/Region.c
diff --git a/jdk/src/share/native/sun/java2d/pipe/Region.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe/Region.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/pipe/Region.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe/Region.h
diff --git a/jdk/src/share/native/sun/java2d/pipe/ShapeSpanIterator.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe/ShapeSpanIterator.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/pipe/ShapeSpanIterator.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe/ShapeSpanIterator.c
diff --git a/jdk/src/share/native/sun/java2d/pipe/SpanClipRenderer.c b/jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe/SpanClipRenderer.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/pipe/SpanClipRenderer.c
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe/SpanClipRenderer.c
diff --git a/jdk/src/share/native/sun/java2d/pipe/SpanIterator.h b/jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe/SpanIterator.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/pipe/SpanIterator.h
rename to jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe/SpanIterator.h
diff --git a/jdk/src/share/native/sun/font/DrawGlyphList.c b/jdk/src/java.desktop/share/native/libfontmanager/DrawGlyphList.c
similarity index 100%
rename from jdk/src/share/native/sun/font/DrawGlyphList.c
rename to jdk/src/java.desktop/share/native/libfontmanager/DrawGlyphList.c
diff --git a/jdk/src/share/native/sun/font/FontInstanceAdapter.cpp b/jdk/src/java.desktop/share/native/libfontmanager/FontInstanceAdapter.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/FontInstanceAdapter.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/FontInstanceAdapter.cpp
diff --git a/jdk/src/share/native/sun/font/FontInstanceAdapter.h b/jdk/src/java.desktop/share/native/libfontmanager/FontInstanceAdapter.h
similarity index 100%
rename from jdk/src/share/native/sun/font/FontInstanceAdapter.h
rename to jdk/src/java.desktop/share/native/libfontmanager/FontInstanceAdapter.h
diff --git a/jdk/src/share/native/sun/font/fontscaler.h b/jdk/src/java.desktop/share/native/libfontmanager/fontscaler.h
similarity index 100%
rename from jdk/src/share/native/sun/font/fontscaler.h
rename to jdk/src/java.desktop/share/native/libfontmanager/fontscaler.h
diff --git a/jdk/src/share/native/sun/font/freetypeScaler.c b/jdk/src/java.desktop/share/native/libfontmanager/freetypeScaler.c
similarity index 100%
rename from jdk/src/share/native/sun/font/freetypeScaler.c
rename to jdk/src/java.desktop/share/native/libfontmanager/freetypeScaler.c
diff --git a/jdk/src/share/native/sun/font/glyphblitting.h b/jdk/src/java.desktop/share/native/libfontmanager/glyphblitting.h
similarity index 100%
rename from jdk/src/share/native/sun/font/glyphblitting.h
rename to jdk/src/java.desktop/share/native/libfontmanager/glyphblitting.h
diff --git a/jdk/src/share/native/sun/font/layout/AlternateSubstSubtables.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/AlternateSubstSubtables.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/AlternateSubstSubtables.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/AlternateSubstSubtables.cpp
diff --git a/jdk/src/share/native/sun/font/layout/AlternateSubstSubtables.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/AlternateSubstSubtables.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/AlternateSubstSubtables.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/AlternateSubstSubtables.h
diff --git a/jdk/src/share/native/sun/font/layout/AnchorTables.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/AnchorTables.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/AnchorTables.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/AnchorTables.cpp
diff --git a/jdk/src/share/native/sun/font/layout/AnchorTables.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/AnchorTables.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/AnchorTables.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/AnchorTables.h
diff --git a/jdk/src/share/native/sun/font/layout/ArabicLayoutEngine.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/ArabicLayoutEngine.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/ArabicLayoutEngine.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/ArabicLayoutEngine.cpp
diff --git a/jdk/src/share/native/sun/font/layout/ArabicLayoutEngine.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/ArabicLayoutEngine.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/ArabicLayoutEngine.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/ArabicLayoutEngine.h
diff --git a/jdk/src/share/native/sun/font/layout/ArabicShaping.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/ArabicShaping.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/ArabicShaping.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/ArabicShaping.cpp
diff --git a/jdk/src/share/native/sun/font/layout/ArabicShaping.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/ArabicShaping.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/ArabicShaping.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/ArabicShaping.h
diff --git a/jdk/src/share/native/sun/font/layout/AttachmentPosnSubtables.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/AttachmentPosnSubtables.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/AttachmentPosnSubtables.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/AttachmentPosnSubtables.h
diff --git a/jdk/src/share/native/sun/font/layout/CanonData.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/CanonData.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/CanonData.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/CanonData.cpp
diff --git a/jdk/src/share/native/sun/font/layout/CanonShaping.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/CanonShaping.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/CanonShaping.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/CanonShaping.cpp
diff --git a/jdk/src/share/native/sun/font/layout/CanonShaping.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/CanonShaping.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/CanonShaping.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/CanonShaping.h
diff --git a/jdk/src/share/native/sun/font/layout/CharSubstitutionFilter.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/CharSubstitutionFilter.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/CharSubstitutionFilter.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/CharSubstitutionFilter.h
diff --git a/jdk/src/share/native/sun/font/layout/ClassDefinitionTables.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/ClassDefinitionTables.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/ClassDefinitionTables.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/ClassDefinitionTables.cpp
diff --git a/jdk/src/share/native/sun/font/layout/ClassDefinitionTables.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/ClassDefinitionTables.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/ClassDefinitionTables.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/ClassDefinitionTables.h
diff --git a/jdk/src/share/native/sun/font/layout/ContextualGlyphInsertion.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphInsertion.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/ContextualGlyphInsertion.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphInsertion.h
diff --git a/jdk/src/share/native/sun/font/layout/ContextualGlyphInsertionProc2.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphInsertionProc2.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/ContextualGlyphInsertionProc2.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphInsertionProc2.cpp
diff --git a/jdk/src/share/native/sun/font/layout/ContextualGlyphInsertionProc2.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphInsertionProc2.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/ContextualGlyphInsertionProc2.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphInsertionProc2.h
diff --git a/jdk/src/share/native/sun/font/layout/ContextualGlyphSubstProc.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphSubstProc.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/ContextualGlyphSubstProc.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphSubstProc.cpp
diff --git a/jdk/src/share/native/sun/font/layout/ContextualGlyphSubstProc.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphSubstProc.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/ContextualGlyphSubstProc.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphSubstProc.h
diff --git a/jdk/src/share/native/sun/font/layout/ContextualGlyphSubstProc2.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphSubstProc2.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/ContextualGlyphSubstProc2.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphSubstProc2.cpp
diff --git a/jdk/src/share/native/sun/font/layout/ContextualGlyphSubstProc2.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphSubstProc2.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/ContextualGlyphSubstProc2.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphSubstProc2.h
diff --git a/jdk/src/share/native/sun/font/layout/ContextualGlyphSubstitution.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphSubstitution.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/ContextualGlyphSubstitution.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphSubstitution.h
diff --git a/jdk/src/share/native/sun/font/layout/ContextualSubstSubtables.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualSubstSubtables.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/ContextualSubstSubtables.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualSubstSubtables.cpp
diff --git a/jdk/src/share/native/sun/font/layout/ContextualSubstSubtables.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualSubstSubtables.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/ContextualSubstSubtables.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualSubstSubtables.h
diff --git a/jdk/src/share/native/sun/font/layout/CoverageTables.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/CoverageTables.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/CoverageTables.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/CoverageTables.cpp
diff --git a/jdk/src/share/native/sun/font/layout/CoverageTables.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/CoverageTables.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/CoverageTables.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/CoverageTables.h
diff --git a/jdk/src/share/native/sun/font/layout/CursiveAttachmentSubtables.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/CursiveAttachmentSubtables.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/CursiveAttachmentSubtables.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/CursiveAttachmentSubtables.cpp
diff --git a/jdk/src/share/native/sun/font/layout/CursiveAttachmentSubtables.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/CursiveAttachmentSubtables.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/CursiveAttachmentSubtables.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/CursiveAttachmentSubtables.h
diff --git a/jdk/src/share/native/sun/font/layout/DefaultCharMapper.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/DefaultCharMapper.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/DefaultCharMapper.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/DefaultCharMapper.h
diff --git a/jdk/src/share/native/sun/font/layout/DeviceTables.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/DeviceTables.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/DeviceTables.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/DeviceTables.cpp
diff --git a/jdk/src/share/native/sun/font/layout/DeviceTables.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/DeviceTables.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/DeviceTables.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/DeviceTables.h
diff --git a/jdk/src/share/native/sun/font/layout/ExtensionSubtables.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/ExtensionSubtables.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/ExtensionSubtables.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/ExtensionSubtables.cpp
diff --git a/jdk/src/share/native/sun/font/layout/ExtensionSubtables.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/ExtensionSubtables.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/ExtensionSubtables.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/ExtensionSubtables.h
diff --git a/jdk/src/share/native/sun/font/layout/Features.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/Features.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/Features.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/Features.cpp
diff --git a/jdk/src/share/native/sun/font/layout/GDEFMarkFilter.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/GDEFMarkFilter.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/GDEFMarkFilter.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/GDEFMarkFilter.cpp
diff --git a/jdk/src/share/native/sun/font/layout/GDEFMarkFilter.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/GDEFMarkFilter.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/GDEFMarkFilter.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/GDEFMarkFilter.h
diff --git a/jdk/src/share/native/sun/font/layout/GXLayoutEngine.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/GXLayoutEngine.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine.cpp
diff --git a/jdk/src/share/native/sun/font/layout/GXLayoutEngine.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/GXLayoutEngine.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine.h
diff --git a/jdk/src/share/native/sun/font/layout/GXLayoutEngine2.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine2.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/GXLayoutEngine2.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine2.cpp
diff --git a/jdk/src/share/native/sun/font/layout/GXLayoutEngine2.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine2.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/GXLayoutEngine2.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine2.h
diff --git a/jdk/src/share/native/sun/font/layout/GlyphDefinitionTables.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphDefinitionTables.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/GlyphDefinitionTables.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphDefinitionTables.cpp
diff --git a/jdk/src/share/native/sun/font/layout/GlyphDefinitionTables.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphDefinitionTables.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/GlyphDefinitionTables.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphDefinitionTables.h
diff --git a/jdk/src/share/native/sun/font/layout/GlyphIterator.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphIterator.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/GlyphIterator.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphIterator.cpp
diff --git a/jdk/src/share/native/sun/font/layout/GlyphIterator.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphIterator.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/GlyphIterator.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphIterator.h
diff --git a/jdk/src/share/native/sun/font/layout/GlyphLookupTables.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphLookupTables.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/GlyphLookupTables.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphLookupTables.cpp
diff --git a/jdk/src/share/native/sun/font/layout/GlyphLookupTables.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphLookupTables.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/GlyphLookupTables.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphLookupTables.h
diff --git a/jdk/src/share/native/sun/font/layout/GlyphPositionAdjustments.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphPositionAdjustments.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/GlyphPositionAdjustments.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphPositionAdjustments.cpp
diff --git a/jdk/src/share/native/sun/font/layout/GlyphPositionAdjustments.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphPositionAdjustments.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/GlyphPositionAdjustments.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphPositionAdjustments.h
diff --git a/jdk/src/share/native/sun/font/layout/GlyphPositioningTables.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphPositioningTables.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/GlyphPositioningTables.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphPositioningTables.cpp
diff --git a/jdk/src/share/native/sun/font/layout/GlyphPositioningTables.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphPositioningTables.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/GlyphPositioningTables.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphPositioningTables.h
diff --git a/jdk/src/share/native/sun/font/layout/GlyphPosnLookupProc.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphPosnLookupProc.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/GlyphPosnLookupProc.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphPosnLookupProc.cpp
diff --git a/jdk/src/share/native/sun/font/layout/GlyphPosnLookupProc.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphPosnLookupProc.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/GlyphPosnLookupProc.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphPosnLookupProc.h
diff --git a/jdk/src/share/native/sun/font/layout/GlyphSubstLookupProc.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphSubstLookupProc.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/GlyphSubstLookupProc.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphSubstLookupProc.cpp
diff --git a/jdk/src/share/native/sun/font/layout/GlyphSubstLookupProc.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphSubstLookupProc.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/GlyphSubstLookupProc.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphSubstLookupProc.h
diff --git a/jdk/src/share/native/sun/font/layout/GlyphSubstitutionTables.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphSubstitutionTables.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/GlyphSubstitutionTables.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphSubstitutionTables.cpp
diff --git a/jdk/src/share/native/sun/font/layout/GlyphSubstitutionTables.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphSubstitutionTables.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/GlyphSubstitutionTables.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphSubstitutionTables.h
diff --git a/jdk/src/share/native/sun/font/layout/HanLayoutEngine.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/HanLayoutEngine.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/HanLayoutEngine.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/HanLayoutEngine.cpp
diff --git a/jdk/src/share/native/sun/font/layout/HanLayoutEngine.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/HanLayoutEngine.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/HanLayoutEngine.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/HanLayoutEngine.h
diff --git a/jdk/src/share/native/sun/font/layout/HangulLayoutEngine.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/HangulLayoutEngine.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/HangulLayoutEngine.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/HangulLayoutEngine.cpp
diff --git a/jdk/src/share/native/sun/font/layout/HangulLayoutEngine.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/HangulLayoutEngine.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/HangulLayoutEngine.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/HangulLayoutEngine.h
diff --git a/jdk/src/share/native/sun/font/layout/ICUFeatures.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/ICUFeatures.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/ICUFeatures.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/ICUFeatures.h
diff --git a/jdk/src/share/native/sun/font/layout/IndicClassTables.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/IndicClassTables.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/IndicClassTables.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/IndicClassTables.cpp
diff --git a/jdk/src/share/native/sun/font/layout/IndicLayoutEngine.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/IndicLayoutEngine.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/IndicLayoutEngine.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/IndicLayoutEngine.cpp
diff --git a/jdk/src/share/native/sun/font/layout/IndicLayoutEngine.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/IndicLayoutEngine.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/IndicLayoutEngine.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/IndicLayoutEngine.h
diff --git a/jdk/src/share/native/sun/font/layout/IndicRearrangement.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/IndicRearrangement.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/IndicRearrangement.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/IndicRearrangement.h
diff --git a/jdk/src/share/native/sun/font/layout/IndicRearrangementProcessor.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/IndicRearrangementProcessor.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/IndicRearrangementProcessor.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/IndicRearrangementProcessor.cpp
diff --git a/jdk/src/share/native/sun/font/layout/IndicRearrangementProcessor.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/IndicRearrangementProcessor.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/IndicRearrangementProcessor.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/IndicRearrangementProcessor.h
diff --git a/jdk/src/share/native/sun/font/layout/IndicRearrangementProcessor2.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/IndicRearrangementProcessor2.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/IndicRearrangementProcessor2.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/IndicRearrangementProcessor2.cpp
diff --git a/jdk/src/share/native/sun/font/layout/IndicRearrangementProcessor2.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/IndicRearrangementProcessor2.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/IndicRearrangementProcessor2.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/IndicRearrangementProcessor2.h
diff --git a/jdk/src/share/native/sun/font/layout/IndicReordering.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/IndicReordering.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/IndicReordering.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/IndicReordering.cpp
diff --git a/jdk/src/share/native/sun/font/layout/IndicReordering.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/IndicReordering.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/IndicReordering.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/IndicReordering.h
diff --git a/jdk/src/share/native/sun/font/layout/KernTable.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/KernTable.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/KernTable.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/KernTable.cpp
diff --git a/jdk/src/share/native/sun/font/layout/KernTable.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/KernTable.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/KernTable.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/KernTable.h
diff --git a/jdk/src/share/native/sun/font/layout/KhmerLayoutEngine.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/KhmerLayoutEngine.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/KhmerLayoutEngine.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/KhmerLayoutEngine.cpp
diff --git a/jdk/src/share/native/sun/font/layout/KhmerLayoutEngine.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/KhmerLayoutEngine.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/KhmerLayoutEngine.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/KhmerLayoutEngine.h
diff --git a/jdk/src/share/native/sun/font/layout/KhmerReordering.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/KhmerReordering.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/KhmerReordering.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/KhmerReordering.cpp
diff --git a/jdk/src/share/native/sun/font/layout/KhmerReordering.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/KhmerReordering.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/KhmerReordering.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/KhmerReordering.h
diff --git a/jdk/src/share/native/sun/font/layout/LEFontInstance.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/LEFontInstance.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/LEFontInstance.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/LEFontInstance.cpp
diff --git a/jdk/src/share/native/sun/font/layout/LEFontInstance.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/LEFontInstance.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/LEFontInstance.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/LEFontInstance.h
diff --git a/jdk/src/share/native/sun/font/layout/LEGlyphFilter.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/LEGlyphFilter.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/LEGlyphFilter.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/LEGlyphFilter.h
diff --git a/jdk/src/share/native/sun/font/layout/LEGlyphStorage.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/LEGlyphStorage.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/LEGlyphStorage.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/LEGlyphStorage.cpp
diff --git a/jdk/src/share/native/sun/font/layout/LEGlyphStorage.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/LEGlyphStorage.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/LEGlyphStorage.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/LEGlyphStorage.h
diff --git a/jdk/src/share/native/sun/font/layout/LEInsertionList.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/LEInsertionList.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/LEInsertionList.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/LEInsertionList.cpp
diff --git a/jdk/src/share/native/sun/font/layout/LEInsertionList.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/LEInsertionList.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/LEInsertionList.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/LEInsertionList.h
diff --git a/jdk/src/share/native/sun/font/layout/LELanguages.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/LELanguages.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/LELanguages.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/LELanguages.h
diff --git a/jdk/src/share/native/sun/font/layout/LEScripts.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/LEScripts.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/LEScripts.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/LEScripts.h
diff --git a/jdk/src/share/native/sun/font/layout/LEStandalone.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/LEStandalone.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/LEStandalone.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/LEStandalone.h
diff --git a/jdk/src/share/native/sun/font/layout/LESwaps.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/LESwaps.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/LESwaps.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/LESwaps.h
diff --git a/jdk/src/share/native/sun/font/layout/LETableReference.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/LETableReference.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/LETableReference.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/LETableReference.h
diff --git a/jdk/src/share/native/sun/font/layout/LETypes.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/LETypes.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/LETypes.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/LETypes.h
diff --git a/jdk/src/share/native/sun/font/layout/LayoutEngine.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/LayoutEngine.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/LayoutEngine.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/LayoutEngine.cpp
diff --git a/jdk/src/share/native/sun/font/layout/LayoutEngine.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/LayoutEngine.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/LayoutEngine.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/LayoutEngine.h
diff --git a/jdk/src/share/native/sun/font/layout/LayoutTables.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/LayoutTables.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/LayoutTables.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/LayoutTables.h
diff --git a/jdk/src/share/native/sun/font/layout/LigatureSubstProc.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/LigatureSubstProc.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc.cpp
diff --git a/jdk/src/share/native/sun/font/layout/LigatureSubstProc.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/LigatureSubstProc.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc.h
diff --git a/jdk/src/share/native/sun/font/layout/LigatureSubstProc2.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc2.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/LigatureSubstProc2.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc2.cpp
diff --git a/jdk/src/share/native/sun/font/layout/LigatureSubstProc2.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc2.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/LigatureSubstProc2.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc2.h
diff --git a/jdk/src/share/native/sun/font/layout/LigatureSubstSubtables.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstSubtables.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/LigatureSubstSubtables.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstSubtables.cpp
diff --git a/jdk/src/share/native/sun/font/layout/LigatureSubstSubtables.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstSubtables.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/LigatureSubstSubtables.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstSubtables.h
diff --git a/jdk/src/share/native/sun/font/layout/LigatureSubstitution.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstitution.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/LigatureSubstitution.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstitution.h
diff --git a/jdk/src/share/native/sun/font/layout/LookupProcessor.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/LookupProcessor.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/LookupProcessor.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/LookupProcessor.cpp
diff --git a/jdk/src/share/native/sun/font/layout/LookupProcessor.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/LookupProcessor.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/LookupProcessor.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/LookupProcessor.h
diff --git a/jdk/src/share/native/sun/font/layout/LookupTables.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/LookupTables.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/LookupTables.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/LookupTables.cpp
diff --git a/jdk/src/share/native/sun/font/layout/LookupTables.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/LookupTables.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/LookupTables.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/LookupTables.h
diff --git a/jdk/src/share/native/sun/font/layout/Lookups.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/Lookups.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/Lookups.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/Lookups.cpp
diff --git a/jdk/src/share/native/sun/font/layout/Lookups.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/Lookups.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/Lookups.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/Lookups.h
diff --git a/jdk/src/share/native/sun/font/layout/MPreFixups.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/MPreFixups.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/MPreFixups.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/MPreFixups.cpp
diff --git a/jdk/src/share/native/sun/font/layout/MPreFixups.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/MPreFixups.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/MPreFixups.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/MPreFixups.h
diff --git a/jdk/src/share/native/sun/font/layout/MarkArrays.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/MarkArrays.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/MarkArrays.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/MarkArrays.cpp
diff --git a/jdk/src/share/native/sun/font/layout/MarkArrays.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/MarkArrays.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/MarkArrays.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/MarkArrays.h
diff --git a/jdk/src/share/native/sun/font/layout/MarkToBasePosnSubtables.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/MarkToBasePosnSubtables.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/MarkToBasePosnSubtables.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/MarkToBasePosnSubtables.cpp
diff --git a/jdk/src/share/native/sun/font/layout/MarkToBasePosnSubtables.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/MarkToBasePosnSubtables.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/MarkToBasePosnSubtables.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/MarkToBasePosnSubtables.h
diff --git a/jdk/src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/MarkToLigaturePosnSubtables.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/MarkToLigaturePosnSubtables.cpp
diff --git a/jdk/src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/MarkToLigaturePosnSubtables.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/MarkToLigaturePosnSubtables.h
diff --git a/jdk/src/share/native/sun/font/layout/MarkToMarkPosnSubtables.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/MarkToMarkPosnSubtables.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/MarkToMarkPosnSubtables.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/MarkToMarkPosnSubtables.cpp
diff --git a/jdk/src/share/native/sun/font/layout/MarkToMarkPosnSubtables.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/MarkToMarkPosnSubtables.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/MarkToMarkPosnSubtables.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/MarkToMarkPosnSubtables.h
diff --git a/jdk/src/share/native/sun/font/layout/MirroredCharData.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/MirroredCharData.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/MirroredCharData.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/MirroredCharData.cpp
diff --git a/jdk/src/share/native/sun/font/layout/MorphStateTables.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/MorphStateTables.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/MorphStateTables.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/MorphStateTables.h
diff --git a/jdk/src/share/native/sun/font/layout/MorphTables.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/MorphTables.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/MorphTables.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/MorphTables.cpp
diff --git a/jdk/src/share/native/sun/font/layout/MorphTables.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/MorphTables.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/MorphTables.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/MorphTables.h
diff --git a/jdk/src/share/native/sun/font/layout/MorphTables2.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/MorphTables2.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/MorphTables2.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/MorphTables2.cpp
diff --git a/jdk/src/share/native/sun/font/layout/MultipleSubstSubtables.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/MultipleSubstSubtables.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/MultipleSubstSubtables.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/MultipleSubstSubtables.cpp
diff --git a/jdk/src/share/native/sun/font/layout/MultipleSubstSubtables.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/MultipleSubstSubtables.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/MultipleSubstSubtables.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/MultipleSubstSubtables.h
diff --git a/jdk/src/share/native/sun/font/layout/NonContextualGlyphSubst.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/NonContextualGlyphSubst.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/NonContextualGlyphSubst.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/NonContextualGlyphSubst.h
diff --git a/jdk/src/share/native/sun/font/layout/NonContextualGlyphSubstProc.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/NonContextualGlyphSubstProc.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/NonContextualGlyphSubstProc.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/NonContextualGlyphSubstProc.cpp
diff --git a/jdk/src/share/native/sun/font/layout/NonContextualGlyphSubstProc.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/NonContextualGlyphSubstProc.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/NonContextualGlyphSubstProc.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/NonContextualGlyphSubstProc.h
diff --git a/jdk/src/share/native/sun/font/layout/NonContextualGlyphSubstProc2.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/NonContextualGlyphSubstProc2.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/NonContextualGlyphSubstProc2.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/NonContextualGlyphSubstProc2.cpp
diff --git a/jdk/src/share/native/sun/font/layout/NonContextualGlyphSubstProc2.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/NonContextualGlyphSubstProc2.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/NonContextualGlyphSubstProc2.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/NonContextualGlyphSubstProc2.h
diff --git a/jdk/src/share/native/sun/font/layout/OpenTypeLayoutEngine.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/OpenTypeLayoutEngine.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/OpenTypeLayoutEngine.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/OpenTypeLayoutEngine.cpp
diff --git a/jdk/src/share/native/sun/font/layout/OpenTypeLayoutEngine.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/OpenTypeLayoutEngine.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/OpenTypeLayoutEngine.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/OpenTypeLayoutEngine.h
diff --git a/jdk/src/share/native/sun/font/layout/OpenTypeTables.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/OpenTypeTables.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/OpenTypeTables.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/OpenTypeTables.h
diff --git a/jdk/src/share/native/sun/font/layout/OpenTypeUtilities.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/OpenTypeUtilities.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/OpenTypeUtilities.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/OpenTypeUtilities.cpp
diff --git a/jdk/src/share/native/sun/font/layout/OpenTypeUtilities.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/OpenTypeUtilities.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/OpenTypeUtilities.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/OpenTypeUtilities.h
diff --git a/jdk/src/share/native/sun/font/layout/PairPositioningSubtables.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/PairPositioningSubtables.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/PairPositioningSubtables.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/PairPositioningSubtables.cpp
diff --git a/jdk/src/share/native/sun/font/layout/PairPositioningSubtables.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/PairPositioningSubtables.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/PairPositioningSubtables.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/PairPositioningSubtables.h
diff --git a/jdk/src/share/native/sun/font/layout/ScriptAndLanguage.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/ScriptAndLanguage.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/ScriptAndLanguage.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/ScriptAndLanguage.cpp
diff --git a/jdk/src/share/native/sun/font/layout/ScriptAndLanguage.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/ScriptAndLanguage.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/ScriptAndLanguage.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/ScriptAndLanguage.h
diff --git a/jdk/src/share/native/sun/font/layout/ScriptAndLanguageTags.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/ScriptAndLanguageTags.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/ScriptAndLanguageTags.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/ScriptAndLanguageTags.cpp
diff --git a/jdk/src/share/native/sun/font/layout/ScriptAndLanguageTags.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/ScriptAndLanguageTags.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/ScriptAndLanguageTags.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/ScriptAndLanguageTags.h
diff --git a/jdk/src/share/native/sun/font/layout/SegmentArrayProcessor.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/SegmentArrayProcessor.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/SegmentArrayProcessor.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/SegmentArrayProcessor.cpp
diff --git a/jdk/src/share/native/sun/font/layout/SegmentArrayProcessor.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/SegmentArrayProcessor.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/SegmentArrayProcessor.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/SegmentArrayProcessor.h
diff --git a/jdk/src/share/native/sun/font/layout/SegmentArrayProcessor2.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/SegmentArrayProcessor2.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/SegmentArrayProcessor2.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/SegmentArrayProcessor2.cpp
diff --git a/jdk/src/share/native/sun/font/layout/SegmentArrayProcessor2.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/SegmentArrayProcessor2.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/SegmentArrayProcessor2.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/SegmentArrayProcessor2.h
diff --git a/jdk/src/share/native/sun/font/layout/SegmentSingleProcessor.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/SegmentSingleProcessor.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/SegmentSingleProcessor.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/SegmentSingleProcessor.cpp
diff --git a/jdk/src/share/native/sun/font/layout/SegmentSingleProcessor.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/SegmentSingleProcessor.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/SegmentSingleProcessor.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/SegmentSingleProcessor.h
diff --git a/jdk/src/share/native/sun/font/layout/SegmentSingleProcessor2.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/SegmentSingleProcessor2.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/SegmentSingleProcessor2.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/SegmentSingleProcessor2.cpp
diff --git a/jdk/src/share/native/sun/font/layout/SegmentSingleProcessor2.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/SegmentSingleProcessor2.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/SegmentSingleProcessor2.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/SegmentSingleProcessor2.h
diff --git a/jdk/src/share/native/sun/font/layout/ShapingTypeData.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/ShapingTypeData.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/ShapingTypeData.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/ShapingTypeData.cpp
diff --git a/jdk/src/share/native/sun/font/layout/SimpleArrayProcessor.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/SimpleArrayProcessor.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/SimpleArrayProcessor.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/SimpleArrayProcessor.cpp
diff --git a/jdk/src/share/native/sun/font/layout/SimpleArrayProcessor.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/SimpleArrayProcessor.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/SimpleArrayProcessor.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/SimpleArrayProcessor.h
diff --git a/jdk/src/share/native/sun/font/layout/SimpleArrayProcessor2.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/SimpleArrayProcessor2.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/SimpleArrayProcessor2.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/SimpleArrayProcessor2.cpp
diff --git a/jdk/src/share/native/sun/font/layout/SimpleArrayProcessor2.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/SimpleArrayProcessor2.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/SimpleArrayProcessor2.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/SimpleArrayProcessor2.h
diff --git a/jdk/src/share/native/sun/font/layout/SinglePositioningSubtables.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/SinglePositioningSubtables.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/SinglePositioningSubtables.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/SinglePositioningSubtables.cpp
diff --git a/jdk/src/share/native/sun/font/layout/SinglePositioningSubtables.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/SinglePositioningSubtables.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/SinglePositioningSubtables.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/SinglePositioningSubtables.h
diff --git a/jdk/src/share/native/sun/font/layout/SingleSubstitutionSubtables.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/SingleSubstitutionSubtables.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/SingleSubstitutionSubtables.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/SingleSubstitutionSubtables.cpp
diff --git a/jdk/src/share/native/sun/font/layout/SingleSubstitutionSubtables.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/SingleSubstitutionSubtables.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/SingleSubstitutionSubtables.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/SingleSubstitutionSubtables.h
diff --git a/jdk/src/share/native/sun/font/layout/SingleTableProcessor.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/SingleTableProcessor.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/SingleTableProcessor.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/SingleTableProcessor.cpp
diff --git a/jdk/src/share/native/sun/font/layout/SingleTableProcessor.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/SingleTableProcessor.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/SingleTableProcessor.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/SingleTableProcessor.h
diff --git a/jdk/src/share/native/sun/font/layout/SingleTableProcessor2.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/SingleTableProcessor2.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/SingleTableProcessor2.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/SingleTableProcessor2.cpp
diff --git a/jdk/src/share/native/sun/font/layout/SingleTableProcessor2.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/SingleTableProcessor2.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/SingleTableProcessor2.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/SingleTableProcessor2.h
diff --git a/jdk/src/share/native/sun/font/layout/StateTableProcessor.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/StateTableProcessor.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/StateTableProcessor.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/StateTableProcessor.cpp
diff --git a/jdk/src/share/native/sun/font/layout/StateTableProcessor.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/StateTableProcessor.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/StateTableProcessor.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/StateTableProcessor.h
diff --git a/jdk/src/share/native/sun/font/layout/StateTableProcessor2.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/StateTableProcessor2.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/StateTableProcessor2.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/StateTableProcessor2.cpp
diff --git a/jdk/src/share/native/sun/font/layout/StateTableProcessor2.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/StateTableProcessor2.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/StateTableProcessor2.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/StateTableProcessor2.h
diff --git a/jdk/src/share/native/sun/font/layout/StateTables.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/StateTables.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/StateTables.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/StateTables.h
diff --git a/jdk/src/share/native/sun/font/layout/SubstitutionLookups.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/SubstitutionLookups.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/SubstitutionLookups.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/SubstitutionLookups.cpp
diff --git a/jdk/src/share/native/sun/font/layout/SubstitutionLookups.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/SubstitutionLookups.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/SubstitutionLookups.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/SubstitutionLookups.h
diff --git a/jdk/src/share/native/sun/font/layout/SubtableProcessor.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/SubtableProcessor.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/SubtableProcessor.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/SubtableProcessor.cpp
diff --git a/jdk/src/share/native/sun/font/layout/SubtableProcessor.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/SubtableProcessor.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/SubtableProcessor.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/SubtableProcessor.h
diff --git a/jdk/src/share/native/sun/font/layout/SubtableProcessor2.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/SubtableProcessor2.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/SubtableProcessor2.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/SubtableProcessor2.cpp
diff --git a/jdk/src/share/native/sun/font/layout/SubtableProcessor2.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/SubtableProcessor2.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/SubtableProcessor2.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/SubtableProcessor2.h
diff --git a/jdk/src/share/native/sun/font/layout/SunLayoutEngine.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/SunLayoutEngine.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/SunLayoutEngine.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/SunLayoutEngine.cpp
diff --git a/jdk/src/share/native/sun/font/layout/ThaiLayoutEngine.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/ThaiLayoutEngine.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/ThaiLayoutEngine.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/ThaiLayoutEngine.cpp
diff --git a/jdk/src/share/native/sun/font/layout/ThaiLayoutEngine.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/ThaiLayoutEngine.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/ThaiLayoutEngine.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/ThaiLayoutEngine.h
diff --git a/jdk/src/share/native/sun/font/layout/ThaiShaping.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/ThaiShaping.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/ThaiShaping.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/ThaiShaping.cpp
diff --git a/jdk/src/share/native/sun/font/layout/ThaiShaping.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/ThaiShaping.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/ThaiShaping.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/ThaiShaping.h
diff --git a/jdk/src/share/native/sun/font/layout/ThaiStateTables.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/ThaiStateTables.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/ThaiStateTables.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/ThaiStateTables.cpp
diff --git a/jdk/src/share/native/sun/font/layout/TibetanLayoutEngine.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/TibetanLayoutEngine.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/TibetanLayoutEngine.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/TibetanLayoutEngine.cpp
diff --git a/jdk/src/share/native/sun/font/layout/TibetanLayoutEngine.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/TibetanLayoutEngine.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/TibetanLayoutEngine.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/TibetanLayoutEngine.h
diff --git a/jdk/src/share/native/sun/font/layout/TibetanReordering.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/TibetanReordering.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/TibetanReordering.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/TibetanReordering.cpp
diff --git a/jdk/src/share/native/sun/font/layout/TibetanReordering.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/TibetanReordering.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/TibetanReordering.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/TibetanReordering.h
diff --git a/jdk/src/share/native/sun/font/layout/TrimmedArrayProcessor.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/TrimmedArrayProcessor.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/TrimmedArrayProcessor.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/TrimmedArrayProcessor.cpp
diff --git a/jdk/src/share/native/sun/font/layout/TrimmedArrayProcessor.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/TrimmedArrayProcessor.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/TrimmedArrayProcessor.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/TrimmedArrayProcessor.h
diff --git a/jdk/src/share/native/sun/font/layout/TrimmedArrayProcessor2.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/TrimmedArrayProcessor2.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/TrimmedArrayProcessor2.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/TrimmedArrayProcessor2.cpp
diff --git a/jdk/src/share/native/sun/font/layout/TrimmedArrayProcessor2.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/TrimmedArrayProcessor2.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/TrimmedArrayProcessor2.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/TrimmedArrayProcessor2.h
diff --git a/jdk/src/share/native/sun/font/layout/ValueRecords.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/ValueRecords.cpp
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/ValueRecords.cpp
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/ValueRecords.cpp
diff --git a/jdk/src/share/native/sun/font/layout/ValueRecords.h b/jdk/src/java.desktop/share/native/libfontmanager/layout/ValueRecords.h
similarity index 100%
rename from jdk/src/share/native/sun/font/layout/ValueRecords.h
rename to jdk/src/java.desktop/share/native/libfontmanager/layout/ValueRecords.h
diff --git a/jdk/src/share/native/sun/font/sunFont.c b/jdk/src/java.desktop/share/native/libfontmanager/sunFont.c
similarity index 100%
rename from jdk/src/share/native/sun/font/sunFont.c
rename to jdk/src/java.desktop/share/native/libfontmanager/sunFont.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/README b/jdk/src/java.desktop/share/native/libjavajpeg/README
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/README
rename to jdk/src/java.desktop/share/native/libjavajpeg/README
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c b/jdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jcapimin.c b/jdk/src/java.desktop/share/native/libjavajpeg/jcapimin.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jcapimin.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jcapimin.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jcapistd.c b/jdk/src/java.desktop/share/native/libjavajpeg/jcapistd.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jcapistd.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jcapistd.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jccoefct.c b/jdk/src/java.desktop/share/native/libjavajpeg/jccoefct.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jccoefct.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jccoefct.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jccolor.c b/jdk/src/java.desktop/share/native/libjavajpeg/jccolor.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jccolor.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jccolor.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jcdctmgr.c b/jdk/src/java.desktop/share/native/libjavajpeg/jcdctmgr.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jcdctmgr.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jcdctmgr.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jchuff.c b/jdk/src/java.desktop/share/native/libjavajpeg/jchuff.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jchuff.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jchuff.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jchuff.h b/jdk/src/java.desktop/share/native/libjavajpeg/jchuff.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jchuff.h
rename to jdk/src/java.desktop/share/native/libjavajpeg/jchuff.h
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jcinit.c b/jdk/src/java.desktop/share/native/libjavajpeg/jcinit.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jcinit.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jcinit.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jcmainct.c b/jdk/src/java.desktop/share/native/libjavajpeg/jcmainct.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jcmainct.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jcmainct.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jcmarker.c b/jdk/src/java.desktop/share/native/libjavajpeg/jcmarker.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jcmarker.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jcmarker.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jcmaster.c b/jdk/src/java.desktop/share/native/libjavajpeg/jcmaster.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jcmaster.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jcmaster.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jcomapi.c b/jdk/src/java.desktop/share/native/libjavajpeg/jcomapi.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jcomapi.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jcomapi.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jconfig.h b/jdk/src/java.desktop/share/native/libjavajpeg/jconfig.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jconfig.h
rename to jdk/src/java.desktop/share/native/libjavajpeg/jconfig.h
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jcparam.c b/jdk/src/java.desktop/share/native/libjavajpeg/jcparam.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jcparam.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jcparam.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jcphuff.c b/jdk/src/java.desktop/share/native/libjavajpeg/jcphuff.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jcphuff.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jcphuff.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jcprepct.c b/jdk/src/java.desktop/share/native/libjavajpeg/jcprepct.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jcprepct.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jcprepct.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jcsample.c b/jdk/src/java.desktop/share/native/libjavajpeg/jcsample.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jcsample.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jcsample.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jctrans.c b/jdk/src/java.desktop/share/native/libjavajpeg/jctrans.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jctrans.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jctrans.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jdapimin.c b/jdk/src/java.desktop/share/native/libjavajpeg/jdapimin.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jdapimin.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jdapimin.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jdapistd.c b/jdk/src/java.desktop/share/native/libjavajpeg/jdapistd.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jdapistd.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jdapistd.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jdcoefct.c b/jdk/src/java.desktop/share/native/libjavajpeg/jdcoefct.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jdcoefct.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jdcoefct.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jdcolor.c b/jdk/src/java.desktop/share/native/libjavajpeg/jdcolor.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jdcolor.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jdcolor.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jdct.h b/jdk/src/java.desktop/share/native/libjavajpeg/jdct.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jdct.h
rename to jdk/src/java.desktop/share/native/libjavajpeg/jdct.h
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jddctmgr.c b/jdk/src/java.desktop/share/native/libjavajpeg/jddctmgr.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jddctmgr.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jddctmgr.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.c b/jdk/src/java.desktop/share/native/libjavajpeg/jdhuff.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jdhuff.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jdhuff.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.h b/jdk/src/java.desktop/share/native/libjavajpeg/jdhuff.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jdhuff.h
rename to jdk/src/java.desktop/share/native/libjavajpeg/jdhuff.h
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jdinput.c b/jdk/src/java.desktop/share/native/libjavajpeg/jdinput.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jdinput.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jdinput.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jdmainct.c b/jdk/src/java.desktop/share/native/libjavajpeg/jdmainct.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jdmainct.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jdmainct.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jdmarker.c b/jdk/src/java.desktop/share/native/libjavajpeg/jdmarker.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jdmarker.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jdmarker.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jdmaster.c b/jdk/src/java.desktop/share/native/libjavajpeg/jdmaster.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jdmaster.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jdmaster.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jdmerge.c b/jdk/src/java.desktop/share/native/libjavajpeg/jdmerge.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jdmerge.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jdmerge.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jdphuff.c b/jdk/src/java.desktop/share/native/libjavajpeg/jdphuff.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jdphuff.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jdphuff.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jdpostct.c b/jdk/src/java.desktop/share/native/libjavajpeg/jdpostct.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jdpostct.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jdpostct.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jdsample.c b/jdk/src/java.desktop/share/native/libjavajpeg/jdsample.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jdsample.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jdsample.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jdtrans.c b/jdk/src/java.desktop/share/native/libjavajpeg/jdtrans.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jdtrans.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jdtrans.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jerror.c b/jdk/src/java.desktop/share/native/libjavajpeg/jerror.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jerror.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jerror.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jerror.h b/jdk/src/java.desktop/share/native/libjavajpeg/jerror.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jerror.h
rename to jdk/src/java.desktop/share/native/libjavajpeg/jerror.h
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jfdctflt.c b/jdk/src/java.desktop/share/native/libjavajpeg/jfdctflt.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jfdctflt.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jfdctflt.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jfdctfst.c b/jdk/src/java.desktop/share/native/libjavajpeg/jfdctfst.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jfdctfst.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jfdctfst.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jfdctint.c b/jdk/src/java.desktop/share/native/libjavajpeg/jfdctint.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jfdctint.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jfdctint.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jidctflt.c b/jdk/src/java.desktop/share/native/libjavajpeg/jidctflt.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jidctflt.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jidctflt.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jidctfst.c b/jdk/src/java.desktop/share/native/libjavajpeg/jidctfst.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jidctfst.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jidctfst.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jidctint.c b/jdk/src/java.desktop/share/native/libjavajpeg/jidctint.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jidctint.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jidctint.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jidctred.c b/jdk/src/java.desktop/share/native/libjavajpeg/jidctred.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jidctred.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jidctred.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jinclude.h b/jdk/src/java.desktop/share/native/libjavajpeg/jinclude.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jinclude.h
rename to jdk/src/java.desktop/share/native/libjavajpeg/jinclude.h
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jmemmgr.c b/jdk/src/java.desktop/share/native/libjavajpeg/jmemmgr.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jmemmgr.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jmemmgr.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jmemnobs.c b/jdk/src/java.desktop/share/native/libjavajpeg/jmemnobs.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jmemnobs.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jmemnobs.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jmemsys.h b/jdk/src/java.desktop/share/native/libjavajpeg/jmemsys.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jmemsys.h
rename to jdk/src/java.desktop/share/native/libjavajpeg/jmemsys.h
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jmorecfg.h b/jdk/src/java.desktop/share/native/libjavajpeg/jmorecfg.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jmorecfg.h
rename to jdk/src/java.desktop/share/native/libjavajpeg/jmorecfg.h
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c b/jdk/src/java.desktop/share/native/libjavajpeg/jpegdecoder.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jpegdecoder.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jpegint.h b/jdk/src/java.desktop/share/native/libjavajpeg/jpegint.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jpegint.h
rename to jdk/src/java.desktop/share/native/libjavajpeg/jpegint.h
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jpeglib.h b/jdk/src/java.desktop/share/native/libjavajpeg/jpeglib.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jpeglib.h
rename to jdk/src/java.desktop/share/native/libjavajpeg/jpeglib.h
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jquant1.c b/jdk/src/java.desktop/share/native/libjavajpeg/jquant1.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jquant1.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jquant1.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jquant2.c b/jdk/src/java.desktop/share/native/libjavajpeg/jquant2.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jquant2.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jquant2.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jutils.c b/jdk/src/java.desktop/share/native/libjavajpeg/jutils.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jutils.c
rename to jdk/src/java.desktop/share/native/libjavajpeg/jutils.c
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/jversion.h b/jdk/src/java.desktop/share/native/libjavajpeg/jversion.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/image/jpeg/jversion.h
rename to jdk/src/java.desktop/share/native/libjavajpeg/jversion.h
diff --git a/jdk/src/share/native/com/sun/media/sound/Configure.h b/jdk/src/java.desktop/share/native/libjsound/Configure.h
similarity index 100%
rename from jdk/src/share/native/com/sun/media/sound/Configure.h
rename to jdk/src/java.desktop/share/native/libjsound/Configure.h
diff --git a/jdk/src/share/native/com/sun/media/sound/DirectAudio.h b/jdk/src/java.desktop/share/native/libjsound/DirectAudio.h
similarity index 100%
rename from jdk/src/share/native/com/sun/media/sound/DirectAudio.h
rename to jdk/src/java.desktop/share/native/libjsound/DirectAudio.h
diff --git a/jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c b/jdk/src/java.desktop/share/native/libjsound/DirectAudioDevice.c
similarity index 100%
rename from jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c
rename to jdk/src/java.desktop/share/native/libjsound/DirectAudioDevice.c
diff --git a/jdk/src/share/native/com/sun/media/sound/DirectAudioDeviceProvider.c b/jdk/src/java.desktop/share/native/libjsound/DirectAudioDeviceProvider.c
similarity index 100%
rename from jdk/src/share/native/com/sun/media/sound/DirectAudioDeviceProvider.c
rename to jdk/src/java.desktop/share/native/libjsound/DirectAudioDeviceProvider.c
diff --git a/jdk/src/share/native/com/sun/media/sound/MidiInDevice.c b/jdk/src/java.desktop/share/native/libjsound/MidiInDevice.c
similarity index 100%
rename from jdk/src/share/native/com/sun/media/sound/MidiInDevice.c
rename to jdk/src/java.desktop/share/native/libjsound/MidiInDevice.c
diff --git a/jdk/src/share/native/com/sun/media/sound/MidiInDeviceProvider.c b/jdk/src/java.desktop/share/native/libjsound/MidiInDeviceProvider.c
similarity index 100%
rename from jdk/src/share/native/com/sun/media/sound/MidiInDeviceProvider.c
rename to jdk/src/java.desktop/share/native/libjsound/MidiInDeviceProvider.c
diff --git a/jdk/src/share/native/com/sun/media/sound/MidiOutDevice.c b/jdk/src/java.desktop/share/native/libjsound/MidiOutDevice.c
similarity index 100%
rename from jdk/src/share/native/com/sun/media/sound/MidiOutDevice.c
rename to jdk/src/java.desktop/share/native/libjsound/MidiOutDevice.c
diff --git a/jdk/src/share/native/com/sun/media/sound/MidiOutDeviceProvider.c b/jdk/src/java.desktop/share/native/libjsound/MidiOutDeviceProvider.c
similarity index 100%
rename from jdk/src/share/native/com/sun/media/sound/MidiOutDeviceProvider.c
rename to jdk/src/java.desktop/share/native/libjsound/MidiOutDeviceProvider.c
diff --git a/jdk/src/share/native/com/sun/media/sound/Platform.c b/jdk/src/java.desktop/share/native/libjsound/Platform.c
similarity index 100%
rename from jdk/src/share/native/com/sun/media/sound/Platform.c
rename to jdk/src/java.desktop/share/native/libjsound/Platform.c
diff --git a/jdk/src/share/native/com/sun/media/sound/PlatformMidi.c b/jdk/src/java.desktop/share/native/libjsound/PlatformMidi.c
similarity index 100%
rename from jdk/src/share/native/com/sun/media/sound/PlatformMidi.c
rename to jdk/src/java.desktop/share/native/libjsound/PlatformMidi.c
diff --git a/jdk/src/share/native/com/sun/media/sound/PlatformMidi.h b/jdk/src/java.desktop/share/native/libjsound/PlatformMidi.h
similarity index 100%
rename from jdk/src/share/native/com/sun/media/sound/PlatformMidi.h
rename to jdk/src/java.desktop/share/native/libjsound/PlatformMidi.h
diff --git a/jdk/src/share/native/com/sun/media/sound/PortMixer.c b/jdk/src/java.desktop/share/native/libjsound/PortMixer.c
similarity index 100%
rename from jdk/src/share/native/com/sun/media/sound/PortMixer.c
rename to jdk/src/java.desktop/share/native/libjsound/PortMixer.c
diff --git a/jdk/src/share/native/com/sun/media/sound/PortMixerProvider.c b/jdk/src/java.desktop/share/native/libjsound/PortMixerProvider.c
similarity index 100%
rename from jdk/src/share/native/com/sun/media/sound/PortMixerProvider.c
rename to jdk/src/java.desktop/share/native/libjsound/PortMixerProvider.c
diff --git a/jdk/src/share/native/com/sun/media/sound/Ports.h b/jdk/src/java.desktop/share/native/libjsound/Ports.h
similarity index 100%
rename from jdk/src/share/native/com/sun/media/sound/Ports.h
rename to jdk/src/java.desktop/share/native/libjsound/Ports.h
diff --git a/jdk/src/share/native/com/sun/media/sound/SoundDefs.h b/jdk/src/java.desktop/share/native/libjsound/SoundDefs.h
similarity index 100%
rename from jdk/src/share/native/com/sun/media/sound/SoundDefs.h
rename to jdk/src/java.desktop/share/native/libjsound/SoundDefs.h
diff --git a/jdk/src/share/native/com/sun/media/sound/Utilities.c b/jdk/src/java.desktop/share/native/libjsound/Utilities.c
similarity index 100%
rename from jdk/src/share/native/com/sun/media/sound/Utilities.c
rename to jdk/src/java.desktop/share/native/libjsound/Utilities.c
diff --git a/jdk/src/share/native/com/sun/media/sound/Utilities.h b/jdk/src/java.desktop/share/native/libjsound/Utilities.h
similarity index 100%
rename from jdk/src/share/native/com/sun/media/sound/Utilities.h
rename to jdk/src/java.desktop/share/native/libjsound/Utilities.h
diff --git a/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c b/jdk/src/java.desktop/share/native/liblcms/LCMS.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c
rename to jdk/src/java.desktop/share/native/liblcms/LCMS.c
diff --git a/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c b/jdk/src/java.desktop/share/native/liblcms/cmscam02.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c
rename to jdk/src/java.desktop/share/native/liblcms/cmscam02.c
diff --git a/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c b/jdk/src/java.desktop/share/native/liblcms/cmscgats.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c
rename to jdk/src/java.desktop/share/native/liblcms/cmscgats.c
diff --git a/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c b/jdk/src/java.desktop/share/native/liblcms/cmscnvrt.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c
rename to jdk/src/java.desktop/share/native/liblcms/cmscnvrt.c
diff --git a/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c b/jdk/src/java.desktop/share/native/liblcms/cmserr.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c
rename to jdk/src/java.desktop/share/native/liblcms/cmserr.c
diff --git a/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c b/jdk/src/java.desktop/share/native/liblcms/cmsgamma.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c
rename to jdk/src/java.desktop/share/native/liblcms/cmsgamma.c
diff --git a/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c b/jdk/src/java.desktop/share/native/liblcms/cmsgmt.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c
rename to jdk/src/java.desktop/share/native/liblcms/cmsgmt.c
diff --git a/jdk/src/share/native/sun/java2d/cmm/lcms/cmshalf.c b/jdk/src/java.desktop/share/native/liblcms/cmshalf.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/cmm/lcms/cmshalf.c
rename to jdk/src/java.desktop/share/native/liblcms/cmshalf.c
diff --git a/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c b/jdk/src/java.desktop/share/native/liblcms/cmsintrp.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c
rename to jdk/src/java.desktop/share/native/liblcms/cmsintrp.c
diff --git a/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c b/jdk/src/java.desktop/share/native/liblcms/cmsio0.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c
rename to jdk/src/java.desktop/share/native/liblcms/cmsio0.c
diff --git a/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c b/jdk/src/java.desktop/share/native/liblcms/cmsio1.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c
rename to jdk/src/java.desktop/share/native/liblcms/cmsio1.c
diff --git a/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c b/jdk/src/java.desktop/share/native/liblcms/cmslut.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c
rename to jdk/src/java.desktop/share/native/liblcms/cmslut.c
diff --git a/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmd5.c b/jdk/src/java.desktop/share/native/liblcms/cmsmd5.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/cmm/lcms/cmsmd5.c
rename to jdk/src/java.desktop/share/native/liblcms/cmsmd5.c
diff --git a/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c b/jdk/src/java.desktop/share/native/liblcms/cmsmtrx.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c
rename to jdk/src/java.desktop/share/native/liblcms/cmsmtrx.c
diff --git a/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c b/jdk/src/java.desktop/share/native/liblcms/cmsnamed.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c
rename to jdk/src/java.desktop/share/native/liblcms/cmsnamed.c
diff --git a/jdk/src/share/native/sun/java2d/cmm/lcms/cmsopt.c b/jdk/src/java.desktop/share/native/liblcms/cmsopt.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/cmm/lcms/cmsopt.c
rename to jdk/src/java.desktop/share/native/liblcms/cmsopt.c
diff --git a/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c b/jdk/src/java.desktop/share/native/liblcms/cmspack.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c
rename to jdk/src/java.desktop/share/native/liblcms/cmspack.c
diff --git a/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c b/jdk/src/java.desktop/share/native/liblcms/cmspcs.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c
rename to jdk/src/java.desktop/share/native/liblcms/cmspcs.c
diff --git a/jdk/src/share/native/sun/java2d/cmm/lcms/cmsplugin.c b/jdk/src/java.desktop/share/native/liblcms/cmsplugin.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/cmm/lcms/cmsplugin.c
rename to jdk/src/java.desktop/share/native/liblcms/cmsplugin.c
diff --git a/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c b/jdk/src/java.desktop/share/native/liblcms/cmsps2.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c
rename to jdk/src/java.desktop/share/native/liblcms/cmsps2.c
diff --git a/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c b/jdk/src/java.desktop/share/native/liblcms/cmssamp.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c
rename to jdk/src/java.desktop/share/native/liblcms/cmssamp.c
diff --git a/jdk/src/share/native/sun/java2d/cmm/lcms/cmssm.c b/jdk/src/java.desktop/share/native/liblcms/cmssm.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/cmm/lcms/cmssm.c
rename to jdk/src/java.desktop/share/native/liblcms/cmssm.c
diff --git a/jdk/src/share/native/sun/java2d/cmm/lcms/cmstypes.c b/jdk/src/java.desktop/share/native/liblcms/cmstypes.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/cmm/lcms/cmstypes.c
rename to jdk/src/java.desktop/share/native/liblcms/cmstypes.c
diff --git a/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c b/jdk/src/java.desktop/share/native/liblcms/cmsvirt.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c
rename to jdk/src/java.desktop/share/native/liblcms/cmsvirt.c
diff --git a/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c b/jdk/src/java.desktop/share/native/liblcms/cmswtpnt.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c
rename to jdk/src/java.desktop/share/native/liblcms/cmswtpnt.c
diff --git a/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c b/jdk/src/java.desktop/share/native/liblcms/cmsxform.c
similarity index 100%
rename from jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c
rename to jdk/src/java.desktop/share/native/liblcms/cmsxform.c
diff --git a/jdk/src/share/native/sun/java2d/cmm/lcms/lcms2.h b/jdk/src/java.desktop/share/native/liblcms/lcms2.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/cmm/lcms/lcms2.h
rename to jdk/src/java.desktop/share/native/liblcms/lcms2.h
diff --git a/jdk/src/share/native/sun/java2d/cmm/lcms/lcms2_internal.h b/jdk/src/java.desktop/share/native/liblcms/lcms2_internal.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/cmm/lcms/lcms2_internal.h
rename to jdk/src/java.desktop/share/native/liblcms/lcms2_internal.h
diff --git a/jdk/src/share/native/sun/java2d/cmm/lcms/lcms2_plugin.h b/jdk/src/java.desktop/share/native/liblcms/lcms2_plugin.h
similarity index 100%
rename from jdk/src/share/native/sun/java2d/cmm/lcms/lcms2_plugin.h
rename to jdk/src/java.desktop/share/native/liblcms/lcms2_plugin.h
diff --git a/jdk/src/share/native/sun/awt/medialib/j2d_names.h b/jdk/src/java.desktop/share/native/libmlib_image/j2d_names.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/j2d_names.h
rename to jdk/src/java.desktop/share/native/libmlib_image/j2d_names.h
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib.h
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib.h
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine.h
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine.h
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageAffineEdge.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffineEdge.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageAffineEdge.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffineEdge.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_D64.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BC_D64.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_D64.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BC_D64.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_F32.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BC_F32.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_F32.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BC_F32.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_S32.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BC_S32.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_S32.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BC_S32.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_D64.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BL_D64.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_D64.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BL_D64.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_F32.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BL_F32.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_F32.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BL_F32.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_S32.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BL_S32.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_S32.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BL_S32.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_NN.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_NN.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_NN.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_NN.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_NN_Bit.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_NN_Bit.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_NN_Bit.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_NN_Bit.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageCheck.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageCheck.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageCheck.h
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageCheck.h
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageClipping.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageClipping.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageClipping.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageClipping.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageClipping.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageClipping.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageClipping.h
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageClipping.h
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageColorTrue2Index.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageColorTrue2Index.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageColorTrue2Index.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageColorTrue2Index.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageColormap.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageColormap.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageColormap.h
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageColormap.h
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageConv.h
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv.h
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv2x2_f.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv2x2_f.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageConvClearEdge_Bit.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvClearEdge_Bit.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageConvClearEdge_Bit.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvClearEdge_Bit.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageConvClearEdge_Fp.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvClearEdge_Fp.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageConvClearEdge_Fp.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvClearEdge_Fp.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageConvCopyEdge_Bit.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvCopyEdge_Bit.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageConvCopyEdge_Bit.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvCopyEdge_Bit.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageConvEdge.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvEdge.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageConvEdge.h
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvEdge.h
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageConvKernelConvert.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvKernelConvert.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageConvKernelConvert.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvKernelConvert.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageConvMxN.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageConvMxN.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageConvMxN_Fp.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN_Fp.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageConvMxN_Fp.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN_Fp.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageConvMxN_ext.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN_ext.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageConvMxN_ext.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN_ext.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16ext.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16ext.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16nw.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16nw.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_32nw.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_32nw.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_32nw.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_32nw.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8ext.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8ext.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8nw.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8nw.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_D64nw.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_D64nw.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_D64nw.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_D64nw.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_F32nw.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_F32nw.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_F32nw.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_F32nw.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16ext.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16ext.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16nw.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16nw.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageCopy.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy.h
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageCopy.h
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageCreate.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageCreate.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageCreate.h
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageCreate.h
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageDivTables.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageDivTables.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageDivTables.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageDivTables.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageDivTables.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageDivTables.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageDivTables.h
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageDivTables.h
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageFilters.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageFilters.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageFilters.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageFilters.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageFilters.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageFilters.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageFilters.h
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageFilters.h
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageLookUp.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp.h
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageLookUp.h
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageLookUp_64.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageLookUp_64.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageLookUp_Bit.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageLookUp_Bit.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageRowTable.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageRowTable.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageRowTable.h
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageRowTable.h
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageScanPoly.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageScanPoly.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageScanPoly.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageScanPoly.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageUtils.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageUtils.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_SysMath.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_SysMath.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_SysMath.h
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_SysMath.h
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffineIndex_BC.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffineIndex_BC.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffineIndex_BC.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffineIndex_BC.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffineIndex_BL.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffineIndex_BL.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffineIndex_BL.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffineIndex_BL.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BC.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BC.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC_S16.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BC_S16.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC_S16.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BC_S16.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC_U16.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BC_U16.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC_U16.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BC_U16.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BL.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BL.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL_S16.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BL_S16.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL_S16.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BL_S16.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL_U16.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BL_U16.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL_U16.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BL_U16.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_NN.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_NN.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_NN.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_NN.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageBlendTable.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageBlendTable.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_c_ImageBlendTable.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageBlendTable.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageBlendTable.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageBlendTable.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_c_ImageBlendTable.h
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageBlendTable.h
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConv.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConv.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConv.h
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConv.h
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConvClearEdge.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConvClearEdge.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConvClearEdge.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConvClearEdge.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConvCopyEdge.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConvCopyEdge.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConvCopyEdge.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConvCopyEdge.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConvVersion.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConvVersion.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConvVersion.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConvVersion.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConv_f.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConv_f.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConv_f.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConv_f.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageCopy.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageCopy.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageLookUp.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageLookUp.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageLookUp.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp.h
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageLookUp.h
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageLookUp_f.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageLookUp_f.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageThresh1.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageThresh1.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_c_ImageThresh1.h
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageThresh1.h
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageThresh1_U8.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageThresh1_U8.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_c_ImageThresh1_U8.c
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageThresh1_U8.c
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_image.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_image.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_image.h
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_image.h
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_image_blend_proto.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_image_blend_proto.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_image_blend_proto.h
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_image_blend_proto.h
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_image_get.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_image_get.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_image_get.h
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_image_get.h
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_image_proto.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_image_proto.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_image_proto.h
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_image_proto.h
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_image_types.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_image_types.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_image_types.h
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_image_types.h
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_status.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_status.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_status.h
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_status.h
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_sys.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_sys.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_sys.h
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_sys.h
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_sys_proto.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_sys_proto.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_sys_proto.h
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_sys_proto.h
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_types.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_types.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/mlib_types.h
rename to jdk/src/java.desktop/share/native/libmlib_image/mlib_types.h
diff --git a/jdk/src/share/native/sun/awt/medialib/safe_alloc.h b/jdk/src/java.desktop/share/native/libmlib_image/safe_alloc.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/safe_alloc.h
rename to jdk/src/java.desktop/share/native/libmlib_image/safe_alloc.h
diff --git a/jdk/src/share/native/sun/awt/medialib/safe_math.h b/jdk/src/java.desktop/share/native/libmlib_image/safe_math.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/medialib/safe_math.h
rename to jdk/src/java.desktop/share/native/libmlib_image/safe_math.h
diff --git a/jdk/src/share/native/sun/awt/giflib/dgif_lib.c b/jdk/src/java.desktop/share/native/libsplashscreen/giflib/dgif_lib.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/giflib/dgif_lib.c
rename to jdk/src/java.desktop/share/native/libsplashscreen/giflib/dgif_lib.c
diff --git a/jdk/src/share/native/sun/awt/giflib/gif_err.c b/jdk/src/java.desktop/share/native/libsplashscreen/giflib/gif_err.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/giflib/gif_err.c
rename to jdk/src/java.desktop/share/native/libsplashscreen/giflib/gif_err.c
diff --git a/jdk/src/share/native/sun/awt/giflib/gif_lib.h b/jdk/src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/giflib/gif_lib.h
rename to jdk/src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
diff --git a/jdk/src/share/native/sun/awt/giflib/gif_lib_private.h b/jdk/src/java.desktop/share/native/libsplashscreen/giflib/gif_lib_private.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/giflib/gif_lib_private.h
rename to jdk/src/java.desktop/share/native/libsplashscreen/giflib/gif_lib_private.h
diff --git a/jdk/src/share/native/sun/awt/giflib/gifalloc.c b/jdk/src/java.desktop/share/native/libsplashscreen/giflib/gifalloc.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/giflib/gifalloc.c
rename to jdk/src/java.desktop/share/native/libsplashscreen/giflib/gifalloc.c
diff --git a/jdk/src/share/native/sun/awt/splashscreen/java_awt_SplashScreen.c b/jdk/src/java.desktop/share/native/libsplashscreen/java_awt_SplashScreen.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/splashscreen/java_awt_SplashScreen.c
rename to jdk/src/java.desktop/share/native/libsplashscreen/java_awt_SplashScreen.c
diff --git a/jdk/src/share/native/sun/awt/libpng/CHANGES b/jdk/src/java.desktop/share/native/libsplashscreen/libpng/CHANGES
similarity index 100%
rename from jdk/src/share/native/sun/awt/libpng/CHANGES
rename to jdk/src/java.desktop/share/native/libsplashscreen/libpng/CHANGES
diff --git a/jdk/src/share/native/sun/awt/libpng/LICENSE b/jdk/src/java.desktop/share/native/libsplashscreen/libpng/LICENSE
similarity index 100%
rename from jdk/src/share/native/sun/awt/libpng/LICENSE
rename to jdk/src/java.desktop/share/native/libsplashscreen/libpng/LICENSE
diff --git a/jdk/src/share/native/sun/awt/libpng/README b/jdk/src/java.desktop/share/native/libsplashscreen/libpng/README
similarity index 100%
rename from jdk/src/share/native/sun/awt/libpng/README
rename to jdk/src/java.desktop/share/native/libsplashscreen/libpng/README
diff --git a/jdk/src/share/native/sun/awt/libpng/png.c b/jdk/src/java.desktop/share/native/libsplashscreen/libpng/png.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/libpng/png.c
rename to jdk/src/java.desktop/share/native/libsplashscreen/libpng/png.c
diff --git a/jdk/src/share/native/sun/awt/libpng/png.h b/jdk/src/java.desktop/share/native/libsplashscreen/libpng/png.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/libpng/png.h
rename to jdk/src/java.desktop/share/native/libsplashscreen/libpng/png.h
diff --git a/jdk/src/share/native/sun/awt/libpng/pngconf.h b/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngconf.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/libpng/pngconf.h
rename to jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngconf.h
diff --git a/jdk/src/share/native/sun/awt/libpng/pngdebug.h b/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngdebug.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/libpng/pngdebug.h
rename to jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngdebug.h
diff --git a/jdk/src/share/native/sun/awt/libpng/pngerror.c b/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngerror.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/libpng/pngerror.c
rename to jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngerror.c
diff --git a/jdk/src/share/native/sun/awt/libpng/pngget.c b/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngget.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/libpng/pngget.c
rename to jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngget.c
diff --git a/jdk/src/share/native/sun/awt/libpng/pnginfo.h b/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pnginfo.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/libpng/pnginfo.h
rename to jdk/src/java.desktop/share/native/libsplashscreen/libpng/pnginfo.h
diff --git a/jdk/src/share/native/sun/awt/libpng/pnglibconf.h b/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pnglibconf.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/libpng/pnglibconf.h
rename to jdk/src/java.desktop/share/native/libsplashscreen/libpng/pnglibconf.h
diff --git a/jdk/src/share/native/sun/awt/libpng/pngmem.c b/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngmem.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/libpng/pngmem.c
rename to jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngmem.c
diff --git a/jdk/src/share/native/sun/awt/libpng/pngpread.c b/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngpread.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/libpng/pngpread.c
rename to jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngpread.c
diff --git a/jdk/src/share/native/sun/awt/libpng/pngpriv.h b/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngpriv.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/libpng/pngpriv.h
rename to jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngpriv.h
diff --git a/jdk/src/share/native/sun/awt/libpng/pngread.c b/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngread.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/libpng/pngread.c
rename to jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngread.c
diff --git a/jdk/src/share/native/sun/awt/libpng/pngrio.c b/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngrio.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/libpng/pngrio.c
rename to jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngrio.c
diff --git a/jdk/src/share/native/sun/awt/libpng/pngrtran.c b/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/libpng/pngrtran.c
rename to jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c
diff --git a/jdk/src/share/native/sun/awt/libpng/pngrutil.c b/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngrutil.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/libpng/pngrutil.c
rename to jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngrutil.c
diff --git a/jdk/src/share/native/sun/awt/libpng/pngset.c b/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngset.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/libpng/pngset.c
rename to jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngset.c
diff --git a/jdk/src/share/native/sun/awt/libpng/pngstruct.h b/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngstruct.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/libpng/pngstruct.h
rename to jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngstruct.h
diff --git a/jdk/src/share/native/sun/awt/libpng/pngtest.c b/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngtest.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/libpng/pngtest.c
rename to jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngtest.c
diff --git a/jdk/src/share/native/sun/awt/libpng/pngtrans.c b/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngtrans.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/libpng/pngtrans.c
rename to jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngtrans.c
diff --git a/jdk/src/share/native/sun/awt/libpng/pngwio.c b/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngwio.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/libpng/pngwio.c
rename to jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngwio.c
diff --git a/jdk/src/share/native/sun/awt/libpng/pngwrite.c b/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngwrite.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/libpng/pngwrite.c
rename to jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngwrite.c
diff --git a/jdk/src/share/native/sun/awt/libpng/pngwtran.c b/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngwtran.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/libpng/pngwtran.c
rename to jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngwtran.c
diff --git a/jdk/src/share/native/sun/awt/libpng/pngwutil.c b/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngwutil.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/libpng/pngwutil.c
rename to jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngwutil.c
diff --git a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gfx.h b/jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_gfx.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/splashscreen/splashscreen_gfx.h
rename to jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_gfx.h
diff --git a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gfx_impl.c b/jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_gfx_impl.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/splashscreen/splashscreen_gfx_impl.c
rename to jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_gfx_impl.c
diff --git a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gfx_impl.h b/jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_gfx_impl.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/splashscreen/splashscreen_gfx_impl.h
rename to jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_gfx_impl.h
diff --git a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c b/jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_gif.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c
rename to jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_gif.c
diff --git a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_impl.c b/jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_impl.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/splashscreen/splashscreen_impl.c
rename to jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_impl.c
diff --git a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_impl.h b/jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_impl.h
similarity index 100%
rename from jdk/src/share/native/sun/awt/splashscreen/splashscreen_impl.h
rename to jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_impl.h
diff --git a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c b/jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_jpeg.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c
rename to jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_jpeg.c
diff --git a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c b/jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_png.c
similarity index 100%
rename from jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c
rename to jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_png.c
diff --git a/jdk/src/solaris/classes/sun/print/services/javax.print.PrintServiceLookup b/jdk/src/java.desktop/unix/classes/META-INF/services/javax.print.PrintServiceLookup
similarity index 100%
rename from jdk/src/solaris/classes/sun/print/services/javax.print.PrintServiceLookup
rename to jdk/src/java.desktop/unix/classes/META-INF/services/javax.print.PrintServiceLookup
diff --git a/jdk/src/solaris/classes/sun/print/services/javax.print.StreamPrintServiceFactory b/jdk/src/java.desktop/unix/classes/META-INF/services/javax.print.StreamPrintServiceFactory
similarity index 100%
rename from jdk/src/solaris/classes/sun/print/services/javax.print.StreamPrintServiceFactory
rename to jdk/src/java.desktop/unix/classes/META-INF/services/javax.print.StreamPrintServiceFactory
diff --git a/jdk/src/solaris/classes/sun/awt/UNIXToolkit.java b/jdk/src/java.desktop/unix/classes/sun/awt/UNIXToolkit.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/UNIXToolkit.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/UNIXToolkit.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/GtkFileDialogPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/GtkFileDialogPeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/GtkFileDialogPeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/GtkFileDialogPeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/InfoWindow.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/InfoWindow.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/ListHelper.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/ListHelper.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/ListHelper.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/ListHelper.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/MWMConstants.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/MWMConstants.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/MWMConstants.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/MWMConstants.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/MotifColorUtilities.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/MotifColorUtilities.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/MotifColorUtilities.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/MotifColorUtilities.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/MotifDnDConstants.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDConstants.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/MotifDnDConstants.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDConstants.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/MotifDnDDragSourceProtocol.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDDragSourceProtocol.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/MotifDnDDragSourceProtocol.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDDragSourceProtocol.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/MotifDnDDropTargetProtocol.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDDropTargetProtocol.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/MotifDnDDropTargetProtocol.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDDropTargetProtocol.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/Native.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/Native.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/Native.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/Native.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/OwnershipListener.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/OwnershipListener.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/OwnershipListener.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/OwnershipListener.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/ToplevelStateListener.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/ToplevelStateListener.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/ToplevelStateListener.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/ToplevelStateListener.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/UnsafeXDisposerRecord.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/UnsafeXDisposerRecord.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/UnsafeXDisposerRecord.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/UnsafeXDisposerRecord.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/WindowDimensions.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/WindowDimensions.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/WindowDimensions.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/WindowDimensions.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/WindowPropertyGetter.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/WindowPropertyGetter.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/WindowPropertyGetter.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/WindowPropertyGetter.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XAWTFormatter.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XAWTFormatter.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XAWTFormatter.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XAWTFormatter.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XAWTLookAndFeel.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XAWTLookAndFeel.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XAWTLookAndFeel.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XAWTLookAndFeel.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XAWTXSettings.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XAWTXSettings.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XAWTXSettings.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XAWTXSettings.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XAbstractMenuItem.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XAbstractMenuItem.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XAbstractMenuItem.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XAbstractMenuItem.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XAtom.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XAtom.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XAtom.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XAtom.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XAtomList.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XAtomList.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XAtomList.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XAtomList.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XAwtState.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XAwtState.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XAwtState.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XAwtState.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XBaseMenuWindow.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XBaseMenuWindow.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XBaseMenuWindow.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XBaseMenuWindow.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XBaseWindow.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XBaseWindow.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XButtonPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XButtonPeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XButtonPeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XButtonPeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XCanvasPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XCanvasPeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XCanvasPeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XCanvasPeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XCheckboxMenuItemPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XCheckboxMenuItemPeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XCheckboxMenuItemPeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XCheckboxMenuItemPeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XCheckboxPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XCheckboxPeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XCheckboxPeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XCheckboxPeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XChoicePeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XChoicePeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XChoicePeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XChoicePeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XChoicePeerListener.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XChoicePeerListener.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XChoicePeerListener.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XChoicePeerListener.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XClipboard.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XClipboard.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XClipboard.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XClipboard.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XComponentPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XComponentPeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XComponentPeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XComponentPeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XConstants.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XConstants.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XConstants.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XConstants.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XContentWindow.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XContentWindow.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XContentWindow.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XContentWindow.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XCreateWindowParams.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XCreateWindowParams.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XCreateWindowParams.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XCreateWindowParams.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XCursorFontConstants.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XCursorFontConstants.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XCursorFontConstants.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XCursorFontConstants.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XCustomCursor.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XCustomCursor.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XCustomCursor.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XCustomCursor.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XDataTransferer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDataTransferer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XDataTransferer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XDataTransferer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDecoratedPeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XDecoratedPeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XDesktopPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDesktopPeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XDesktopPeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XDesktopPeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XDialogPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDialogPeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XDialogPeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XDialogPeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XDnDConstants.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDnDConstants.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XDnDConstants.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XDnDConstants.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDnDDragSourceProtocol.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XDnDDragSourceProtocol.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XDnDDropTargetProtocol.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDnDDropTargetProtocol.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XDnDDropTargetProtocol.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XDnDDropTargetProtocol.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XDragAndDropProtocols.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDragAndDropProtocols.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XDragAndDropProtocols.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XDragAndDropProtocols.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XDragSourceContextPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDragSourceContextPeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XDragSourceContextPeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XDragSourceContextPeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XDragSourceProtocol.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDragSourceProtocol.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XDragSourceProtocol.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XDragSourceProtocol.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XDragSourceProtocolListener.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDragSourceProtocolListener.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XDragSourceProtocolListener.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XDragSourceProtocolListener.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XDropTargetContextPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetContextPeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XDropTargetContextPeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetContextPeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XDropTargetEventProcessor.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetEventProcessor.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XDropTargetEventProcessor.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetEventProcessor.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XDropTargetProtocol.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetProtocol.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XDropTargetProtocol.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetProtocol.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XDropTargetProtocolListener.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetProtocolListener.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XDropTargetProtocolListener.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetProtocolListener.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XDropTargetRegistry.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetRegistry.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XDropTargetRegistry.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetRegistry.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XEmbedCanvasPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbedCanvasPeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XEmbedCanvasPeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbedCanvasPeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XEmbedChildProxy.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbedChildProxy.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XEmbedChildProxy.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbedChildProxy.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XEmbedChildProxyPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbedChildProxyPeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XEmbedChildProxyPeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbedChildProxyPeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XEmbedClientHelper.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbedClientHelper.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XEmbedClientHelper.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbedClientHelper.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XEmbedHelper.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbedHelper.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XEmbedHelper.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbedHelper.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XEmbedServerTester.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbedServerTester.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XEmbedServerTester.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbedServerTester.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XEmbeddedFrame.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddedFrame.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XEmbeddedFrame.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddedFrame.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XEmbeddedFramePeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddedFramePeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XEmbeddedFramePeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddedFramePeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XEmbeddingContainer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddingContainer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XEmbeddingContainer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddingContainer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XErrorHandler.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XErrorHandler.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XErrorHandler.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XErrorHandler.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XErrorHandlerUtil.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XErrorHandlerUtil.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XErrorHandlerUtil.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XErrorHandlerUtil.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XEventDispatcher.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XEventDispatcher.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XEventDispatcher.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XEventDispatcher.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XException.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XException.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XException.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XException.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XFileDialogPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XFileDialogPeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XFileDialogPeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XFileDialogPeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XFocusProxyWindow.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XFocusProxyWindow.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XFocusProxyWindow.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XFocusProxyWindow.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XFontPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XFontPeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XFontPeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XFontPeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XFramePeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XFramePeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XFramePeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XFramePeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XGlobalCursorManager.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XGlobalCursorManager.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XGlobalCursorManager.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XGlobalCursorManager.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XHorizontalScrollbar.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XHorizontalScrollbar.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XHorizontalScrollbar.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XHorizontalScrollbar.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XIconWindow.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XIconWindow.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XIconWindow.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XIconWindow.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XInputMethod.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XInputMethod.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XInputMethod.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XInputMethod.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XInputMethodDescriptor.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XInputMethodDescriptor.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XInputMethodDescriptor.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XInputMethodDescriptor.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XKeySymConstants.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XKeySymConstants.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XKeySymConstants.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XKeySymConstants.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XKeysym.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XKeysym.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XKeysym.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XKeysym.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XLabelPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XLabelPeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XLabelPeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XLabelPeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XLayerProtocol.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XLayerProtocol.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XLayerProtocol.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XLayerProtocol.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XLightweightFramePeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XLightweightFramePeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XLightweightFramePeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XLightweightFramePeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XListPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XListPeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XListPeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XListPeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XMSelection.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XMSelection.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XMSelection.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XMSelection.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XMSelectionListener.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XMSelectionListener.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XMSelectionListener.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XMSelectionListener.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XMenuBarPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XMenuBarPeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XMenuBarPeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XMenuBarPeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XMenuItemPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XMenuItemPeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XMenuItemPeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XMenuItemPeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XMenuPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XMenuPeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XMenuPeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XMenuPeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XMenuWindow.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XMenuWindow.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XMenuWindow.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XMenuWindow.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XModalityProtocol.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XModalityProtocol.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XModalityProtocol.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XModalityProtocol.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XMouseDragGestureRecognizer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XMouseDragGestureRecognizer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XMouseDragGestureRecognizer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XMouseDragGestureRecognizer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XMouseInfoPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XMouseInfoPeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XMouseInfoPeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XMouseInfoPeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XNETProtocol.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XNETProtocol.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XNETProtocol.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XNETProtocol.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XPanelPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XPanelPeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XPanelPeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XPanelPeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XPopupMenuPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XPopupMenuPeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XPopupMenuPeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XPopupMenuPeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XPropertyCache.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XPropertyCache.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XPropertyCache.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XPropertyCache.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XProtocol.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XProtocol.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XProtocol.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XProtocol.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XProtocolConstants.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XProtocolConstants.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XProtocolConstants.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XProtocolConstants.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XQueryTree.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XQueryTree.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XQueryTree.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XQueryTree.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XRepaintArea.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XRepaintArea.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XRepaintArea.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XRepaintArea.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XRobotPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XRobotPeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XRobotPeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XRobotPeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XRootWindow.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XRootWindow.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XRootWindow.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XRootWindow.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XScrollPanePeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XScrollPanePeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XScrollPanePeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XScrollPanePeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XScrollbar.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XScrollbar.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XScrollbar.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XScrollbar.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XScrollbarClient.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XScrollbarClient.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XScrollbarClient.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XScrollbarClient.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XScrollbarPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XScrollbarPeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XScrollbarPeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XScrollbarPeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XSelection.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XSelection.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XSelection.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XSelection.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XStateProtocol.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XStateProtocol.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XStateProtocol.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XStateProtocol.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XSystemTrayPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XSystemTrayPeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XSystemTrayPeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XSystemTrayPeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XTextAreaPeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XTextAreaPeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XTextFieldPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XTextFieldPeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XTextFieldPeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XTextFieldPeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XToolkit.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XToolkitThreadBlockedHandler.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XToolkitThreadBlockedHandler.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XToolkitThreadBlockedHandler.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XToolkitThreadBlockedHandler.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XTranslateCoordinates.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XTranslateCoordinates.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XTranslateCoordinates.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XTranslateCoordinates.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XTrayIconPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XTrayIconPeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XTrayIconPeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XTrayIconPeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XUtilConstants.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XUtilConstants.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XUtilConstants.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XUtilConstants.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XVerticalScrollbar.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XVerticalScrollbar.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XVerticalScrollbar.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XVerticalScrollbar.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XWINProtocol.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWINProtocol.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XWINProtocol.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XWINProtocol.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XWM.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWM.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XWM.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XWM.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XWarningWindow.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWarningWindow.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XWarningWindow.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XWarningWindow.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XWindow.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWindow.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XWindow.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XWindow.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XWindowAttributesData.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWindowAttributesData.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XWindowAttributesData.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XWindowAttributesData.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWindowPeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XWindowPeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XWrapperBase.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWrapperBase.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XWrapperBase.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XWrapperBase.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XlibUtil.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XlibUtil.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XlibUtil.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XlibUtil.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XlibWrapper.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/XlibWrapper.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11/doc-files/Modality.txt b/jdk/src/java.desktop/unix/classes/sun/awt/X11/doc-files/Modality.txt
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/doc-files/Modality.txt
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/doc-files/Modality.txt
diff --git a/jdk/src/solaris/classes/sun/awt/X11/genhash.awk b/jdk/src/java.desktop/unix/classes/sun/awt/X11/genhash.awk
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/genhash.awk
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/genhash.awk
diff --git a/jdk/src/solaris/classes/sun/awt/X11/java-icon16.png b/jdk/src/java.desktop/unix/classes/sun/awt/X11/java-icon16.png
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/java-icon16.png
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/java-icon16.png
diff --git a/jdk/src/solaris/classes/sun/awt/X11/java-icon24.png b/jdk/src/java.desktop/unix/classes/sun/awt/X11/java-icon24.png
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/java-icon24.png
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/java-icon24.png
diff --git a/jdk/src/solaris/classes/sun/awt/X11/java-icon32.png b/jdk/src/java.desktop/unix/classes/sun/awt/X11/java-icon32.png
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/java-icon32.png
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/java-icon32.png
diff --git a/jdk/src/solaris/classes/sun/awt/X11/java-icon48.png b/jdk/src/java.desktop/unix/classes/sun/awt/X11/java-icon48.png
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/java-icon48.png
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/java-icon48.png
diff --git a/jdk/src/solaris/classes/sun/awt/X11/keysym2ucs.h b/jdk/src/java.desktop/unix/classes/sun/awt/X11/keysym2ucs.h
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11/keysym2ucs.h
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11/keysym2ucs.h
diff --git a/jdk/src/solaris/classes/sun/awt/X11ComponentPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11ComponentPeer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11ComponentPeer.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11ComponentPeer.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11CustomCursor.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11CustomCursor.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11CustomCursor.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11CustomCursor.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11FontManager.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11FontManager.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11FontManager.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11FontManager.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11GraphicsConfig.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11GraphicsConfig.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11GraphicsConfig.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11GraphicsConfig.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11GraphicsDevice.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11GraphicsDevice.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11InputMethod.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11InputMethod.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11InputMethod.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11InputMethod.java
diff --git a/jdk/src/solaris/classes/sun/awt/X11InputMethodDescriptor.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11InputMethodDescriptor.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/X11InputMethodDescriptor.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/X11InputMethodDescriptor.java
diff --git a/jdk/src/solaris/classes/sun/awt/XSettings.java b/jdk/src/java.desktop/unix/classes/sun/awt/XSettings.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/XSettings.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/XSettings.java
diff --git a/jdk/src/solaris/classes/sun/datatransfer/resources/flavormap.properties b/jdk/src/java.desktop/unix/classes/sun/awt/datatransfer/flavormap.properties
similarity index 100%
rename from jdk/src/solaris/classes/sun/datatransfer/resources/flavormap.properties
rename to jdk/src/java.desktop/unix/classes/sun/awt/datatransfer/flavormap.properties
diff --git a/jdk/src/solaris/classes/sun/awt/motif/MFontConfiguration.java b/jdk/src/java.desktop/unix/classes/sun/awt/motif/MFontConfiguration.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/motif/MFontConfiguration.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/motif/MFontConfiguration.java
diff --git a/jdk/src/solaris/classes/sun/awt/motif/X11CNS11643.java b/jdk/src/java.desktop/unix/classes/sun/awt/motif/X11CNS11643.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/motif/X11CNS11643.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/motif/X11CNS11643.java
diff --git a/jdk/src/solaris/classes/sun/awt/motif/X11CNS11643P1.java b/jdk/src/java.desktop/unix/classes/sun/awt/motif/X11CNS11643P1.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/motif/X11CNS11643P1.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/motif/X11CNS11643P1.java
diff --git a/jdk/src/solaris/classes/sun/awt/motif/X11CNS11643P2.java b/jdk/src/java.desktop/unix/classes/sun/awt/motif/X11CNS11643P2.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/motif/X11CNS11643P2.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/motif/X11CNS11643P2.java
diff --git a/jdk/src/solaris/classes/sun/awt/motif/X11CNS11643P3.java b/jdk/src/java.desktop/unix/classes/sun/awt/motif/X11CNS11643P3.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/motif/X11CNS11643P3.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/motif/X11CNS11643P3.java
diff --git a/jdk/src/solaris/classes/sun/awt/motif/X11Dingbats.java b/jdk/src/java.desktop/unix/classes/sun/awt/motif/X11Dingbats.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/motif/X11Dingbats.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/motif/X11Dingbats.java
diff --git a/jdk/src/solaris/classes/sun/awt/motif/X11GB18030_0.java b/jdk/src/java.desktop/unix/classes/sun/awt/motif/X11GB18030_0.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/motif/X11GB18030_0.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/motif/X11GB18030_0.java
diff --git a/jdk/src/solaris/classes/sun/awt/motif/X11GB18030_1.java b/jdk/src/java.desktop/unix/classes/sun/awt/motif/X11GB18030_1.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/motif/X11GB18030_1.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/motif/X11GB18030_1.java
diff --git a/jdk/src/solaris/classes/sun/awt/motif/X11GB2312.java b/jdk/src/java.desktop/unix/classes/sun/awt/motif/X11GB2312.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/motif/X11GB2312.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/motif/X11GB2312.java
diff --git a/jdk/src/solaris/classes/sun/awt/motif/X11GBK.java b/jdk/src/java.desktop/unix/classes/sun/awt/motif/X11GBK.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/motif/X11GBK.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/motif/X11GBK.java
diff --git a/jdk/src/solaris/classes/sun/awt/motif/X11JIS0201.java b/jdk/src/java.desktop/unix/classes/sun/awt/motif/X11JIS0201.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/motif/X11JIS0201.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/motif/X11JIS0201.java
diff --git a/jdk/src/solaris/classes/sun/awt/motif/X11JIS0208.java b/jdk/src/java.desktop/unix/classes/sun/awt/motif/X11JIS0208.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/motif/X11JIS0208.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/motif/X11JIS0208.java
diff --git a/jdk/src/solaris/classes/sun/awt/motif/X11JIS0212.java b/jdk/src/java.desktop/unix/classes/sun/awt/motif/X11JIS0212.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/motif/X11JIS0212.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/motif/X11JIS0212.java
diff --git a/jdk/src/solaris/classes/sun/awt/motif/X11Johab.java b/jdk/src/java.desktop/unix/classes/sun/awt/motif/X11Johab.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/motif/X11Johab.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/motif/X11Johab.java
diff --git a/jdk/src/solaris/classes/sun/awt/motif/X11KSC5601.java b/jdk/src/java.desktop/unix/classes/sun/awt/motif/X11KSC5601.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/motif/X11KSC5601.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/motif/X11KSC5601.java
diff --git a/jdk/src/solaris/classes/sun/awt/motif/X11SunUnicode_0.java b/jdk/src/java.desktop/unix/classes/sun/awt/motif/X11SunUnicode_0.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/motif/X11SunUnicode_0.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/motif/X11SunUnicode_0.java
diff --git a/jdk/src/solaris/classes/sun/awt/windows/ThemeReader.java b/jdk/src/java.desktop/unix/classes/sun/awt/windows/ThemeReader.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/windows/ThemeReader.java
rename to jdk/src/java.desktop/unix/classes/sun/awt/windows/ThemeReader.java
diff --git a/jdk/src/solaris/classes/sun/font/DelegateStrike.java b/jdk/src/java.desktop/unix/classes/sun/font/DelegateStrike.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/font/DelegateStrike.java
rename to jdk/src/java.desktop/unix/classes/sun/font/DelegateStrike.java
diff --git a/jdk/src/solaris/classes/sun/font/FcFontConfiguration.java b/jdk/src/java.desktop/unix/classes/sun/font/FcFontConfiguration.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/font/FcFontConfiguration.java
rename to jdk/src/java.desktop/unix/classes/sun/font/FcFontConfiguration.java
diff --git a/jdk/src/solaris/classes/sun/font/FontConfigManager.java b/jdk/src/java.desktop/unix/classes/sun/font/FontConfigManager.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/font/FontConfigManager.java
rename to jdk/src/java.desktop/unix/classes/sun/font/FontConfigManager.java
diff --git a/jdk/src/solaris/classes/sun/font/NativeFont.java b/jdk/src/java.desktop/unix/classes/sun/font/NativeFont.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/font/NativeFont.java
rename to jdk/src/java.desktop/unix/classes/sun/font/NativeFont.java
diff --git a/jdk/src/solaris/classes/sun/font/NativeGlyphMapper.java b/jdk/src/java.desktop/unix/classes/sun/font/NativeGlyphMapper.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/font/NativeGlyphMapper.java
rename to jdk/src/java.desktop/unix/classes/sun/font/NativeGlyphMapper.java
diff --git a/jdk/src/solaris/classes/sun/font/NativeStrike.java b/jdk/src/java.desktop/unix/classes/sun/font/NativeStrike.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/font/NativeStrike.java
rename to jdk/src/java.desktop/unix/classes/sun/font/NativeStrike.java
diff --git a/jdk/src/solaris/classes/sun/font/NativeStrikeDisposer.java b/jdk/src/java.desktop/unix/classes/sun/font/NativeStrikeDisposer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/font/NativeStrikeDisposer.java
rename to jdk/src/java.desktop/unix/classes/sun/font/NativeStrikeDisposer.java
diff --git a/jdk/src/solaris/classes/sun/font/X11TextRenderer.java b/jdk/src/java.desktop/unix/classes/sun/font/X11TextRenderer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/font/X11TextRenderer.java
rename to jdk/src/java.desktop/unix/classes/sun/font/X11TextRenderer.java
diff --git a/jdk/src/solaris/classes/sun/font/XMap.java b/jdk/src/java.desktop/unix/classes/sun/font/XMap.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/font/XMap.java
rename to jdk/src/java.desktop/unix/classes/sun/font/XMap.java
diff --git a/jdk/src/solaris/classes/sun/font/XRGlyphCache.java b/jdk/src/java.desktop/unix/classes/sun/font/XRGlyphCache.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/font/XRGlyphCache.java
rename to jdk/src/java.desktop/unix/classes/sun/font/XRGlyphCache.java
diff --git a/jdk/src/solaris/classes/sun/font/XRGlyphCacheEntry.java b/jdk/src/java.desktop/unix/classes/sun/font/XRGlyphCacheEntry.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/font/XRGlyphCacheEntry.java
rename to jdk/src/java.desktop/unix/classes/sun/font/XRGlyphCacheEntry.java
diff --git a/jdk/src/solaris/classes/sun/font/XRTextRenderer.java b/jdk/src/java.desktop/unix/classes/sun/font/XRTextRenderer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/font/XRTextRenderer.java
rename to jdk/src/java.desktop/unix/classes/sun/font/XRTextRenderer.java
diff --git a/jdk/src/solaris/classes/sun/java2d/BackBufferCapsProvider.java b/jdk/src/java.desktop/unix/classes/sun/java2d/BackBufferCapsProvider.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/BackBufferCapsProvider.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/BackBufferCapsProvider.java
diff --git a/jdk/src/solaris/classes/sun/java2d/UnixSurfaceManagerFactory.java b/jdk/src/java.desktop/unix/classes/sun/java2d/UnixSurfaceManagerFactory.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/UnixSurfaceManagerFactory.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/UnixSurfaceManagerFactory.java
diff --git a/jdk/src/solaris/classes/sun/java2d/jules/IdleTileCache.java b/jdk/src/java.desktop/unix/classes/sun/java2d/jules/IdleTileCache.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/jules/IdleTileCache.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/jules/IdleTileCache.java
diff --git a/jdk/src/solaris/classes/sun/java2d/jules/JulesAATileGenerator.java b/jdk/src/java.desktop/unix/classes/sun/java2d/jules/JulesAATileGenerator.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/jules/JulesAATileGenerator.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/jules/JulesAATileGenerator.java
diff --git a/jdk/src/solaris/classes/sun/java2d/jules/JulesPathBuf.java b/jdk/src/java.desktop/unix/classes/sun/java2d/jules/JulesPathBuf.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/jules/JulesPathBuf.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/jules/JulesPathBuf.java
diff --git a/jdk/src/solaris/classes/sun/java2d/jules/JulesRenderingEngine.java b/jdk/src/java.desktop/unix/classes/sun/java2d/jules/JulesRenderingEngine.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/jules/JulesRenderingEngine.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/jules/JulesRenderingEngine.java
diff --git a/jdk/src/solaris/classes/sun/java2d/jules/JulesShapePipe.java b/jdk/src/java.desktop/unix/classes/sun/java2d/jules/JulesShapePipe.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/jules/JulesShapePipe.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/jules/JulesShapePipe.java
diff --git a/jdk/src/solaris/classes/sun/java2d/jules/JulesTile.java b/jdk/src/java.desktop/unix/classes/sun/java2d/jules/JulesTile.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/jules/JulesTile.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/jules/JulesTile.java
diff --git a/jdk/src/solaris/classes/sun/java2d/jules/TileTrapContainer.java b/jdk/src/java.desktop/unix/classes/sun/java2d/jules/TileTrapContainer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/jules/TileTrapContainer.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/jules/TileTrapContainer.java
diff --git a/jdk/src/solaris/classes/sun/java2d/jules/TileWorker.java b/jdk/src/java.desktop/unix/classes/sun/java2d/jules/TileWorker.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/jules/TileWorker.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/jules/TileWorker.java
diff --git a/jdk/src/solaris/classes/sun/java2d/jules/TrapezoidList.java b/jdk/src/java.desktop/unix/classes/sun/java2d/jules/TrapezoidList.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/jules/TrapezoidList.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/jules/TrapezoidList.java
diff --git a/jdk/src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java b/jdk/src/java.desktop/unix/classes/sun/java2d/opengl/GLXGraphicsConfig.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/opengl/GLXGraphicsConfig.java
diff --git a/jdk/src/solaris/classes/sun/java2d/opengl/GLXSurfaceData.java b/jdk/src/java.desktop/unix/classes/sun/java2d/opengl/GLXSurfaceData.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/opengl/GLXSurfaceData.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/opengl/GLXSurfaceData.java
diff --git a/jdk/src/solaris/classes/sun/java2d/opengl/GLXVolatileSurfaceManager.java b/jdk/src/java.desktop/unix/classes/sun/java2d/opengl/GLXVolatileSurfaceManager.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/opengl/GLXVolatileSurfaceManager.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/opengl/GLXVolatileSurfaceManager.java
diff --git a/jdk/src/solaris/classes/sun/java2d/x11/X11PMBlitBgLoops.java b/jdk/src/java.desktop/unix/classes/sun/java2d/x11/X11PMBlitBgLoops.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/x11/X11PMBlitBgLoops.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/x11/X11PMBlitBgLoops.java
diff --git a/jdk/src/solaris/classes/sun/java2d/x11/X11PMBlitLoops.java b/jdk/src/java.desktop/unix/classes/sun/java2d/x11/X11PMBlitLoops.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/x11/X11PMBlitLoops.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/x11/X11PMBlitLoops.java
diff --git a/jdk/src/solaris/classes/sun/java2d/x11/X11Renderer.java b/jdk/src/java.desktop/unix/classes/sun/java2d/x11/X11Renderer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/x11/X11Renderer.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/x11/X11Renderer.java
diff --git a/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java b/jdk/src/java.desktop/unix/classes/sun/java2d/x11/X11SurfaceData.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/x11/X11SurfaceData.java
diff --git a/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceDataProxy.java b/jdk/src/java.desktop/unix/classes/sun/java2d/x11/X11SurfaceDataProxy.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceDataProxy.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/x11/X11SurfaceDataProxy.java
diff --git a/jdk/src/solaris/classes/sun/java2d/x11/X11VolatileSurfaceManager.java b/jdk/src/java.desktop/unix/classes/sun/java2d/x11/X11VolatileSurfaceManager.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/x11/X11VolatileSurfaceManager.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/x11/X11VolatileSurfaceManager.java
diff --git a/jdk/src/solaris/classes/sun/java2d/x11/XSurfaceData.java b/jdk/src/java.desktop/unix/classes/sun/java2d/x11/XSurfaceData.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/x11/XSurfaceData.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/x11/XSurfaceData.java
diff --git a/jdk/src/solaris/classes/sun/java2d/xr/DirtyRegion.java b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/DirtyRegion.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/xr/DirtyRegion.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/xr/DirtyRegion.java
diff --git a/jdk/src/solaris/classes/sun/java2d/xr/GrowableByteArray.java b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/GrowableByteArray.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/xr/GrowableByteArray.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/xr/GrowableByteArray.java
diff --git a/jdk/src/solaris/classes/sun/java2d/xr/GrowableEltArray.java b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/GrowableEltArray.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/xr/GrowableEltArray.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/xr/GrowableEltArray.java
diff --git a/jdk/src/solaris/classes/sun/java2d/xr/GrowableIntArray.java b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/GrowableIntArray.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/xr/GrowableIntArray.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/xr/GrowableIntArray.java
diff --git a/jdk/src/solaris/classes/sun/java2d/xr/GrowablePointArray.java b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/GrowablePointArray.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/xr/GrowablePointArray.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/xr/GrowablePointArray.java
diff --git a/jdk/src/solaris/classes/sun/java2d/xr/GrowableRectArray.java b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/GrowableRectArray.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/xr/GrowableRectArray.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/xr/GrowableRectArray.java
diff --git a/jdk/src/solaris/classes/sun/java2d/xr/MaskTile.java b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/MaskTile.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/xr/MaskTile.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/xr/MaskTile.java
diff --git a/jdk/src/solaris/classes/sun/java2d/xr/MaskTileManager.java b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/MaskTileManager.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/xr/MaskTileManager.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/xr/MaskTileManager.java
diff --git a/jdk/src/solaris/classes/sun/java2d/xr/MutableInteger.java b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/MutableInteger.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/xr/MutableInteger.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/xr/MutableInteger.java
diff --git a/jdk/src/solaris/classes/sun/java2d/xr/XIDGenerator.java b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XIDGenerator.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/xr/XIDGenerator.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/xr/XIDGenerator.java
diff --git a/jdk/src/solaris/classes/sun/java2d/xr/XRBackend.java b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRBackend.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/xr/XRBackend.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRBackend.java
diff --git a/jdk/src/solaris/classes/sun/java2d/xr/XRBackendNative.java b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRBackendNative.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/xr/XRBackendNative.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRBackendNative.java
diff --git a/jdk/src/solaris/classes/sun/java2d/xr/XRColor.java b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRColor.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/xr/XRColor.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRColor.java
diff --git a/jdk/src/solaris/classes/sun/java2d/xr/XRCompositeManager.java b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRCompositeManager.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/xr/XRCompositeManager.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRCompositeManager.java
diff --git a/jdk/src/solaris/classes/sun/java2d/xr/XRDrawImage.java b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRDrawImage.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/xr/XRDrawImage.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRDrawImage.java
diff --git a/jdk/src/solaris/classes/sun/java2d/xr/XRDrawLine.java b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRDrawLine.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/xr/XRDrawLine.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRDrawLine.java
diff --git a/jdk/src/solaris/classes/sun/java2d/xr/XRGraphicsConfig.java b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRGraphicsConfig.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/xr/XRGraphicsConfig.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRGraphicsConfig.java
diff --git a/jdk/src/solaris/classes/sun/java2d/xr/XRMaskBlit.java b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskBlit.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/xr/XRMaskBlit.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskBlit.java
diff --git a/jdk/src/solaris/classes/sun/java2d/xr/XRMaskFill.java b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskFill.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/xr/XRMaskFill.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskFill.java
diff --git a/jdk/src/solaris/classes/sun/java2d/xr/XRMaskImage.java b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskImage.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/xr/XRMaskImage.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskImage.java
diff --git a/jdk/src/solaris/classes/sun/java2d/xr/XRPMBlitLoops.java b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRPMBlitLoops.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/xr/XRPMBlitLoops.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRPMBlitLoops.java
diff --git a/jdk/src/solaris/classes/sun/java2d/xr/XRPaints.java b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRPaints.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/xr/XRPaints.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRPaints.java
diff --git a/jdk/src/solaris/classes/sun/java2d/xr/XRRenderer.java b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRRenderer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/xr/XRRenderer.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRRenderer.java
diff --git a/jdk/src/solaris/classes/sun/java2d/xr/XRSolidSrcPict.java b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRSolidSrcPict.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/xr/XRSolidSrcPict.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRSolidSrcPict.java
diff --git a/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceData.java b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRSurfaceData.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceData.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRSurfaceData.java
diff --git a/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceDataProxy.java b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRSurfaceDataProxy.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceDataProxy.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRSurfaceDataProxy.java
diff --git a/jdk/src/solaris/classes/sun/java2d/xr/XRUtils.java b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRUtils.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/xr/XRUtils.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRUtils.java
diff --git a/jdk/src/solaris/classes/sun/java2d/xr/XRVolatileSurfaceManager.java b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRVolatileSurfaceManager.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/xr/XRVolatileSurfaceManager.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRVolatileSurfaceManager.java
diff --git a/jdk/src/solaris/classes/sun/java2d/xr/XcbRequestCounter.java b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XcbRequestCounter.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/java2d/xr/XcbRequestCounter.java
rename to jdk/src/java.desktop/unix/classes/sun/java2d/xr/XcbRequestCounter.java
diff --git a/jdk/src/solaris/classes/sun/print/AttributeClass.java b/jdk/src/java.desktop/unix/classes/sun/print/AttributeClass.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/print/AttributeClass.java
rename to jdk/src/java.desktop/unix/classes/sun/print/AttributeClass.java
diff --git a/jdk/src/solaris/classes/sun/print/CUPSPrinter.java b/jdk/src/java.desktop/unix/classes/sun/print/CUPSPrinter.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/print/CUPSPrinter.java
rename to jdk/src/java.desktop/unix/classes/sun/print/CUPSPrinter.java
diff --git a/jdk/src/solaris/classes/sun/print/IPPPrintService.java b/jdk/src/java.desktop/unix/classes/sun/print/IPPPrintService.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/print/IPPPrintService.java
rename to jdk/src/java.desktop/unix/classes/sun/print/IPPPrintService.java
diff --git a/jdk/src/solaris/classes/sun/print/UnixPrintJob.java b/jdk/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/print/UnixPrintJob.java
rename to jdk/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java
diff --git a/jdk/src/solaris/classes/sun/print/UnixPrintService.java b/jdk/src/java.desktop/unix/classes/sun/print/UnixPrintService.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/print/UnixPrintService.java
rename to jdk/src/java.desktop/unix/classes/sun/print/UnixPrintService.java
diff --git a/jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java b/jdk/src/java.desktop/unix/classes/sun/print/UnixPrintServiceLookup.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java
rename to jdk/src/java.desktop/unix/classes/sun/print/UnixPrintServiceLookup.java
diff --git a/jdk/src/solaris/classes/sun/awt/motif/java.fonts.dir b/jdk/src/java.desktop/unix/conf/fonts/fonts.dir
similarity index 100%
rename from jdk/src/solaris/classes/sun/awt/motif/java.fonts.dir
rename to jdk/src/java.desktop/unix/conf/fonts/fonts.dir
diff --git a/jdk/src/solaris/lib/images/cursors/cursors.properties b/jdk/src/java.desktop/unix/conf/images/cursors/cursors.properties
similarity index 100%
rename from jdk/src/solaris/lib/images/cursors/cursors.properties
rename to jdk/src/java.desktop/unix/conf/images/cursors/cursors.properties
diff --git a/jdk/src/solaris/native/sun/awt/CUPSfuncs.c b/jdk/src/java.desktop/unix/native/common/sun/awt/CUPSfuncs.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/CUPSfuncs.c
rename to jdk/src/java.desktop/unix/native/common/sun/awt/CUPSfuncs.c
diff --git a/jdk/src/solaris/native/sun/awt/X11Color.c b/jdk/src/java.desktop/unix/native/common/sun/awt/X11Color.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/X11Color.c
rename to jdk/src/java.desktop/unix/native/common/sun/awt/X11Color.c
diff --git a/jdk/src/solaris/native/sun/awt/awt.h b/jdk/src/java.desktop/unix/native/common/sun/awt/awt.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/awt.h
rename to jdk/src/java.desktop/unix/native/common/sun/awt/awt.h
diff --git a/jdk/src/solaris/native/sun/awt/awt_Component.h b/jdk/src/java.desktop/unix/native/common/sun/awt/awt_Component.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/awt_Component.h
rename to jdk/src/java.desktop/unix/native/common/sun/awt/awt_Component.h
diff --git a/jdk/src/solaris/native/sun/awt/awt_DrawingSurface.h b/jdk/src/java.desktop/unix/native/common/sun/awt/awt_DrawingSurface.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/awt_DrawingSurface.h
rename to jdk/src/java.desktop/unix/native/common/sun/awt/awt_DrawingSurface.h
diff --git a/jdk/src/solaris/native/sun/awt/awt_Font.c b/jdk/src/java.desktop/unix/native/common/sun/awt/awt_Font.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/awt_Font.c
rename to jdk/src/java.desktop/unix/native/common/sun/awt/awt_Font.c
diff --git a/jdk/src/solaris/native/sun/awt/awt_Font.h b/jdk/src/java.desktop/unix/native/common/sun/awt/awt_Font.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/awt_Font.h
rename to jdk/src/java.desktop/unix/native/common/sun/awt/awt_Font.h
diff --git a/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h b/jdk/src/java.desktop/unix/native/common/sun/awt/awt_GraphicsEnv.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h
rename to jdk/src/java.desktop/unix/native/common/sun/awt/awt_GraphicsEnv.h
diff --git a/jdk/src/solaris/native/sun/awt/awt_Mlib.h b/jdk/src/java.desktop/unix/native/common/sun/awt/awt_Mlib.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/awt_Mlib.h
rename to jdk/src/java.desktop/unix/native/common/sun/awt/awt_Mlib.h
diff --git a/jdk/src/solaris/native/sun/awt/awt_p.h b/jdk/src/java.desktop/unix/native/common/sun/awt/awt_p.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/awt_p.h
rename to jdk/src/java.desktop/unix/native/common/sun/awt/awt_p.h
diff --git a/jdk/src/solaris/native/sun/awt/awt_util.h b/jdk/src/java.desktop/unix/native/common/sun/awt/awt_util.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/awt_util.h
rename to jdk/src/java.desktop/unix/native/common/sun/awt/awt_util.h
diff --git a/jdk/src/solaris/native/sun/awt/color.h b/jdk/src/java.desktop/unix/native/common/sun/awt/color.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/color.h
rename to jdk/src/java.desktop/unix/native/common/sun/awt/color.h
diff --git a/jdk/src/solaris/native/sun/awt/colordata.h b/jdk/src/java.desktop/unix/native/common/sun/awt/colordata.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/colordata.h
rename to jdk/src/java.desktop/unix/native/common/sun/awt/colordata.h
diff --git a/jdk/src/solaris/native/sun/awt/extutil.h b/jdk/src/java.desktop/unix/native/common/sun/awt/extutil.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/extutil.h
rename to jdk/src/java.desktop/unix/native/common/sun/awt/extutil.h
diff --git a/jdk/src/solaris/native/sun/awt/fontconfig.h b/jdk/src/java.desktop/unix/native/common/sun/awt/fontconfig.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/fontconfig.h
rename to jdk/src/java.desktop/unix/native/common/sun/awt/fontconfig.h
diff --git a/jdk/src/solaris/native/sun/awt/fontpath.c b/jdk/src/java.desktop/unix/native/common/sun/awt/fontpath.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/fontpath.c
rename to jdk/src/java.desktop/unix/native/common/sun/awt/fontpath.c
diff --git a/jdk/src/solaris/native/sun/awt/img_util_md.h b/jdk/src/java.desktop/unix/native/common/sun/awt/img_util_md.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/img_util_md.h
rename to jdk/src/java.desktop/unix/native/common/sun/awt/img_util_md.h
diff --git a/jdk/src/solaris/native/sun/awt/initIDs.c b/jdk/src/java.desktop/unix/native/common/sun/awt/initIDs.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/initIDs.c
rename to jdk/src/java.desktop/unix/native/common/sun/awt/initIDs.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_f.c b/jdk/src/java.desktop/unix/native/common/sun/awt/medialib/mlib_v_ImageCopy_f.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_f.c
rename to jdk/src/java.desktop/unix/native/common/sun/awt/medialib/mlib_v_ImageCopy_f.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_f.h b/jdk/src/java.desktop/unix/native/common/sun/awt/medialib/mlib_v_ImageCopy_f.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_f.h
rename to jdk/src/java.desktop/unix/native/common/sun/awt/medialib/mlib_v_ImageCopy_f.h
diff --git a/jdk/src/solaris/native/sun/awt/medialib/vis_proto.h b/jdk/src/java.desktop/unix/native/common/sun/awt/medialib/vis_proto.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/vis_proto.h
rename to jdk/src/java.desktop/unix/native/common/sun/awt/medialib/vis_proto.h
diff --git a/jdk/src/solaris/native/sun/awt/utility/rect.h b/jdk/src/java.desktop/unix/native/common/sun/awt/utility/rect.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/utility/rect.h
rename to jdk/src/java.desktop/unix/native/common/sun/awt/utility/rect.h
diff --git a/jdk/src/solaris/native/sun/font/X11FontScaler.h b/jdk/src/java.desktop/unix/native/common/sun/font/X11FontScaler.h
similarity index 100%
rename from jdk/src/solaris/native/sun/font/X11FontScaler.h
rename to jdk/src/java.desktop/unix/native/common/sun/font/X11FontScaler.h
diff --git a/jdk/src/solaris/native/sun/java2d/opengl/GLXGraphicsConfig.c b/jdk/src/java.desktop/unix/native/common/sun/java2d/opengl/GLXGraphicsConfig.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/opengl/GLXGraphicsConfig.c
rename to jdk/src/java.desktop/unix/native/common/sun/java2d/opengl/GLXGraphicsConfig.c
diff --git a/jdk/src/solaris/native/sun/java2d/opengl/GLXGraphicsConfig.h b/jdk/src/java.desktop/unix/native/common/sun/java2d/opengl/GLXGraphicsConfig.h
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/opengl/GLXGraphicsConfig.h
rename to jdk/src/java.desktop/unix/native/common/sun/java2d/opengl/GLXGraphicsConfig.h
diff --git a/jdk/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.c b/jdk/src/java.desktop/unix/native/common/sun/java2d/opengl/GLXSurfaceData.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.c
rename to jdk/src/java.desktop/unix/native/common/sun/java2d/opengl/GLXSurfaceData.c
diff --git a/jdk/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.h b/jdk/src/java.desktop/unix/native/common/sun/java2d/opengl/GLXSurfaceData.h
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.h
rename to jdk/src/java.desktop/unix/native/common/sun/java2d/opengl/GLXSurfaceData.h
diff --git a/jdk/src/solaris/native/sun/java2d/opengl/J2D_GL/glx.h b/jdk/src/java.desktop/unix/native/common/sun/java2d/opengl/J2D_GL/glx.h
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/opengl/J2D_GL/glx.h
rename to jdk/src/java.desktop/unix/native/common/sun/java2d/opengl/J2D_GL/glx.h
diff --git a/jdk/src/solaris/native/sun/java2d/opengl/J2D_GL/glxext.h b/jdk/src/java.desktop/unix/native/common/sun/java2d/opengl/J2D_GL/glxext.h
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/opengl/J2D_GL/glxext.h
rename to jdk/src/java.desktop/unix/native/common/sun/java2d/opengl/J2D_GL/glxext.h
diff --git a/jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h b/jdk/src/java.desktop/unix/native/common/sun/java2d/opengl/OGLFuncs_md.h
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h
rename to jdk/src/java.desktop/unix/native/common/sun/java2d/opengl/OGLFuncs_md.h
diff --git a/jdk/src/solaris/native/sun/java2d/x11/X11FontScaler_md.c b/jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11FontScaler_md.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/x11/X11FontScaler_md.c
rename to jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11FontScaler_md.c
diff --git a/jdk/src/solaris/native/sun/java2d/x11/X11PMBlitLoops.c b/jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11PMBlitLoops.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/x11/X11PMBlitLoops.c
rename to jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11PMBlitLoops.c
diff --git a/jdk/src/solaris/native/sun/java2d/x11/X11Renderer.c b/jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11Renderer.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/x11/X11Renderer.c
rename to jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11Renderer.c
diff --git a/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c b/jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11SurfaceData.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
rename to jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11SurfaceData.c
diff --git a/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.h b/jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11SurfaceData.h
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.h
rename to jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11SurfaceData.h
diff --git a/jdk/src/solaris/native/sun/java2d/x11/X11TextRenderer_md.c b/jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11TextRenderer_md.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/x11/X11TextRenderer_md.c
rename to jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11TextRenderer_md.c
diff --git a/jdk/src/solaris/javavm/export/jawt_md.h b/jdk/src/java.desktop/unix/native/include/jawt_md.h
similarity index 100%
rename from jdk/src/solaris/javavm/export/jawt_md.h
rename to jdk/src/java.desktop/unix/native/include/jawt_md.h
diff --git a/jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c b/jdk/src/java.desktop/unix/native/libawt/sun/awt/awt_LoadLibrary.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/awt/awt_LoadLibrary.c
diff --git a/jdk/src/solaris/native/sun/awt/awt_Mlib.c b/jdk/src/java.desktop/unix/native/libawt/sun/awt/awt_Mlib.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/awt_Mlib.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/awt/awt_Mlib.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy.c b/jdk/src/java.desktop/unix/native/libawt/sun/awt/medialib/mlib_v_ImageCopy.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/awt/medialib/mlib_v_ImageCopy.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_blk.s b/jdk/src/java.desktop/unix/native/libawt/sun/awt/medialib/mlib_v_ImageCopy_blk.s
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_blk.s
rename to jdk/src/java.desktop/unix/native/libawt/sun/awt/medialib/mlib_v_ImageCopy_blk.s
diff --git a/jdk/src/solaris/native/sun/awt/medialib/vis_asi.h b/jdk/src/java.desktop/unix/native/libawt/sun/awt/medialib/vis_asi.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/vis_asi.h
rename to jdk/src/java.desktop/unix/native/libawt/sun/awt/medialib/vis_asi.h
diff --git a/jdk/src/solaris/native/sun/java2d/j2d_md.h b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/j2d_md.h
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/j2d_md.h
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/j2d_md.h
diff --git a/jdk/src/solaris/native/sun/java2d/loops/java2d_Mlib.c b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/java2d_Mlib.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/java2d_Mlib.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/java2d_Mlib.c
diff --git a/jdk/src/solaris/native/sun/java2d/loops/java2d_Mlib.h b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/java2d_Mlib.h
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/java2d_Mlib.h
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/java2d_Mlib.h
diff --git a/jdk/src/solaris/native/sun/java2d/loops/mlib_ImageCopy.h b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_ImageCopy.h
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/mlib_ImageCopy.h
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_ImageCopy.h
diff --git a/jdk/src/solaris/native/sun/java2d/loops/mlib_ImageLogic_proto.h b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_ImageLogic_proto.h
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/mlib_ImageLogic_proto.h
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_ImageLogic_proto.h
diff --git a/jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom.h b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_ImageZoom.h
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom.h
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_ImageZoom.h
diff --git a/jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_ImageZoom_NN.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_ImageZoom_NN.c
diff --git a/jdk/src/solaris/native/sun/java2d/loops/mlib_v_ImageClear.c b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageClear.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/mlib_v_ImageClear.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageClear.c
diff --git a/jdk/src/solaris/native/sun/java2d/loops/mlib_v_ImageClear_f.c b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageClear_f.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/mlib_v_ImageClear_f.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageClear_f.c
diff --git a/jdk/src/solaris/native/sun/java2d/loops/mlib_v_ImageClear_f.h b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageClear_f.h
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/mlib_v_ImageClear_f.h
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageClear_f.h
diff --git a/jdk/src/solaris/native/sun/java2d/loops/mlib_v_ImageConstLogic.h b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageConstLogic.h
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/mlib_v_ImageConstLogic.h
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageConstLogic.h
diff --git a/jdk/src/solaris/native/sun/java2d/loops/mlib_v_ImageConstXor.c b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageConstXor.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/mlib_v_ImageConstXor.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageConstXor.c
diff --git a/jdk/src/solaris/native/sun/java2d/loops/mlib_v_ImageLogic.h b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageLogic.h
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/mlib_v_ImageLogic.h
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageLogic.h
diff --git a/jdk/src/solaris/native/sun/java2d/loops/mlib_v_ImageLogic_proto.h b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageLogic_proto.h
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/mlib_v_ImageLogic_proto.h
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageLogic_proto.h
diff --git a/jdk/src/solaris/native/sun/java2d/loops/mlib_v_ImageXor.c b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageXor.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/mlib_v_ImageXor.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageXor.c
diff --git a/jdk/src/solaris/native/sun/java2d/loops/mlib_v_ImageZoom_NN_f.c b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageZoom_NN_f.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/mlib_v_ImageZoom_NN_f.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageZoom_NN_f.c
diff --git a/jdk/src/solaris/native/sun/java2d/loops/vis_AlphaMacros.c b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_AlphaMacros.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/vis_AlphaMacros.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_AlphaMacros.c
diff --git a/jdk/src/solaris/native/sun/java2d/loops/vis_AlphaMacros.h b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_AlphaMacros.h
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/vis_AlphaMacros.h
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_AlphaMacros.h
diff --git a/jdk/src/solaris/native/sun/java2d/loops/vis_AlphaMaskBlit.c b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_AlphaMaskBlit.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/vis_AlphaMaskBlit.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_AlphaMaskBlit.c
diff --git a/jdk/src/solaris/native/sun/java2d/loops/vis_AlphaMaskFill.c b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_AlphaMaskFill.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/vis_AlphaMaskFill.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_AlphaMaskFill.c
diff --git a/jdk/src/solaris/native/sun/java2d/loops/vis_ByteGray.c b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_ByteGray.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/vis_ByteGray.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_ByteGray.c
diff --git a/jdk/src/solaris/native/sun/java2d/loops/vis_ByteGray_FromRgb.c b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_ByteGray_FromRgb.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/vis_ByteGray_FromRgb.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_ByteGray_FromRgb.c
diff --git a/jdk/src/solaris/native/sun/java2d/loops/vis_ByteGray_Mask.c b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_ByteGray_Mask.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/vis_ByteGray_Mask.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_ByteGray_Mask.c
diff --git a/jdk/src/solaris/native/sun/java2d/loops/vis_ByteIndexed.c b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_ByteIndexed.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/vis_ByteIndexed.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_ByteIndexed.c
diff --git a/jdk/src/solaris/native/sun/java2d/loops/vis_DrawLine.c b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_DrawLine.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/vis_DrawLine.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_DrawLine.c
diff --git a/jdk/src/solaris/native/sun/java2d/loops/vis_FourByteAbgr.c b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_FourByteAbgr.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/vis_FourByteAbgr.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_FourByteAbgr.c
diff --git a/jdk/src/solaris/native/sun/java2d/loops/vis_FourByteAbgrPre.c b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_FourByteAbgrPre.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/vis_FourByteAbgrPre.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_FourByteAbgrPre.c
diff --git a/jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_FuncArray.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_FuncArray.c
diff --git a/jdk/src/solaris/native/sun/java2d/loops/vis_GlyphList.c b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_GlyphList.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/vis_GlyphList.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_GlyphList.c
diff --git a/jdk/src/solaris/native/sun/java2d/loops/vis_GlyphListXor.c b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_GlyphListXor.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/vis_GlyphListXor.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_GlyphListXor.c
diff --git a/jdk/src/solaris/native/sun/java2d/loops/vis_IntArgb.c b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_IntArgb.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/vis_IntArgb.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_IntArgb.c
diff --git a/jdk/src/solaris/native/sun/java2d/loops/vis_IntArgbBm.c b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_IntArgbBm.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/vis_IntArgbBm.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_IntArgbBm.c
diff --git a/jdk/src/solaris/native/sun/java2d/loops/vis_IntArgbPre.c b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_IntArgbPre.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/vis_IntArgbPre.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_IntArgbPre.c
diff --git a/jdk/src/solaris/native/sun/java2d/loops/vis_IntArgbPre_Mask.c b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_IntArgbPre_Mask.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/vis_IntArgbPre_Mask.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_IntArgbPre_Mask.c
diff --git a/jdk/src/solaris/native/sun/java2d/loops/vis_IntBgr.c b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_IntBgr.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/vis_IntBgr.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_IntBgr.c
diff --git a/jdk/src/solaris/native/sun/java2d/loops/vis_IntRgb.c b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_IntRgb.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/vis_IntRgb.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_IntRgb.c
diff --git a/jdk/src/solaris/native/sun/java2d/loops/vis_IntRgbx.c b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_IntRgbx.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/vis_IntRgbx.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_IntRgbx.c
diff --git a/jdk/src/solaris/native/sun/java2d/loops/vis_Interp.c b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_Interp.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/vis_Interp.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_Interp.c
diff --git a/jdk/src/solaris/native/sun/java2d/loops/vis_SrcMaskFill.c b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_SrcMaskFill.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/vis_SrcMaskFill.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_SrcMaskFill.c
diff --git a/jdk/src/solaris/native/sun/java2d/loops/vis_SrcOverMaskBlit.c b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_SrcOverMaskBlit.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/vis_SrcOverMaskBlit.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_SrcOverMaskBlit.c
diff --git a/jdk/src/solaris/native/sun/java2d/loops/vis_SrcOverMaskFill.c b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_SrcOverMaskFill.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/vis_SrcOverMaskFill.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_SrcOverMaskFill.c
diff --git a/jdk/src/solaris/native/sun/java2d/loops/vis_ThreeByteBgr.c b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_ThreeByteBgr.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/vis_ThreeByteBgr.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_ThreeByteBgr.c
diff --git a/jdk/src/solaris/native/sun/java2d/loops/vis_UshortGray.c b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_UshortGray.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/vis_UshortGray.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_UshortGray.c
diff --git a/jdk/src/solaris/native/sun/java2d/loops/vis_UshortGray_FromRgb.c b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_UshortGray_FromRgb.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/vis_UshortGray_FromRgb.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_UshortGray_FromRgb.c
diff --git a/jdk/src/solaris/native/sun/java2d/loops/vis_XorBlit.c b/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_XorBlit.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/loops/vis_XorBlit.c
rename to jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_XorBlit.c
diff --git a/jdk/src/solaris/native/sun/awt/HeadlessToolkit.c b/jdk/src/java.desktop/unix/native/libawt_headless/sun/awt/HeadlessToolkit.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/HeadlessToolkit.c
rename to jdk/src/java.desktop/unix/native/libawt_headless/sun/awt/HeadlessToolkit.c
diff --git a/jdk/src/solaris/native/sun/awt/VDrawingArea.c b/jdk/src/java.desktop/unix/native/libawt_headless/sun/awt/VDrawingArea.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/VDrawingArea.c
rename to jdk/src/java.desktop/unix/native/libawt_headless/sun/awt/VDrawingArea.c
diff --git a/jdk/src/solaris/native/sun/awt/VDrawingArea.h b/jdk/src/java.desktop/unix/native/libawt_headless/sun/awt/VDrawingArea.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/VDrawingArea.h
rename to jdk/src/java.desktop/unix/native/libawt_headless/sun/awt/VDrawingArea.h
diff --git a/jdk/src/solaris/native/sun/awt/VDrawingAreaP.h b/jdk/src/java.desktop/unix/native/libawt_headless/sun/awt/VDrawingAreaP.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/VDrawingAreaP.h
rename to jdk/src/java.desktop/unix/native/libawt_headless/sun/awt/VDrawingAreaP.h
diff --git a/jdk/src/solaris/native/sun/awt/HPkeysym.h b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/HPkeysym.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/HPkeysym.h
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/HPkeysym.h
diff --git a/jdk/src/solaris/native/sun/awt/Xrandr.h b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/Xrandr.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/Xrandr.h
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/Xrandr.h
diff --git a/jdk/src/solaris/native/sun/awt/awt_AWTEvent.c b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_AWTEvent.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/awt_AWTEvent.c
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_AWTEvent.c
diff --git a/jdk/src/solaris/native/sun/awt/awt_AWTEvent.h b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_AWTEvent.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/awt_AWTEvent.h
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_AWTEvent.h
diff --git a/jdk/src/solaris/native/sun/awt/awt_DrawingSurface.c b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_DrawingSurface.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/awt_DrawingSurface.c
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_DrawingSurface.c
diff --git a/jdk/src/solaris/native/sun/awt/awt_Event.c b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Event.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/awt_Event.c
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Event.c
diff --git a/jdk/src/solaris/native/sun/awt/awt_Event.h b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Event.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/awt_Event.h
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Event.h
diff --git a/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_GraphicsEnv.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_GraphicsEnv.c
diff --git a/jdk/src/solaris/native/sun/awt/awt_InputMethod.c b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_InputMethod.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/awt_InputMethod.c
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_InputMethod.c
diff --git a/jdk/src/solaris/native/sun/awt/awt_Insets.c b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Insets.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/awt_Insets.c
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Insets.c
diff --git a/jdk/src/solaris/native/sun/awt/awt_Insets.h b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Insets.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/awt_Insets.h
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Insets.h
diff --git a/jdk/src/solaris/native/sun/awt/awt_MenuComponent.h b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_MenuComponent.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/awt_MenuComponent.h
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_MenuComponent.h
diff --git a/jdk/src/solaris/native/sun/awt/awt_Robot.c b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Robot.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/awt_Robot.c
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Robot.c
diff --git a/jdk/src/solaris/native/sun/awt/awt_UNIXToolkit.c b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_UNIXToolkit.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/awt_UNIXToolkit.c
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_UNIXToolkit.c
diff --git a/jdk/src/solaris/native/sun/awt/awt_util.c b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_util.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/awt_util.c
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_util.c
diff --git a/jdk/src/solaris/native/sun/awt/canvas.h b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/canvas.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/canvas.h
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/canvas.h
diff --git a/jdk/src/solaris/native/sun/awt/gtk2_interface.c b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/gtk2_interface.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/gtk2_interface.c
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/gtk2_interface.c
diff --git a/jdk/src/solaris/native/sun/awt/gtk2_interface.h b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/gtk2_interface.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/gtk2_interface.h
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/gtk2_interface.h
diff --git a/jdk/src/solaris/native/sun/awt/list.c b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/list.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/list.c
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/list.c
diff --git a/jdk/src/solaris/native/sun/awt/list.h b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/list.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/list.h
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/list.h
diff --git a/jdk/src/solaris/native/sun/awt/multiVis.c b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/multiVis.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/multiVis.c
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/multiVis.c
diff --git a/jdk/src/solaris/native/sun/awt/multiVis.h b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/multiVis.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/multiVis.h
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/multiVis.h
diff --git a/jdk/src/solaris/native/sun/awt/multi_font.c b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/multi_font.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/multi_font.c
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/multi_font.c
diff --git a/jdk/src/solaris/native/sun/awt/multi_font.h b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/multi_font.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/multi_font.h
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/multi_font.h
diff --git a/jdk/src/solaris/native/sun/awt/randr.h b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/randr.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/randr.h
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/randr.h
diff --git a/jdk/src/solaris/native/sun/awt/robot_common.c b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/robot_common.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/robot_common.c
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/robot_common.c
diff --git a/jdk/src/solaris/native/sun/awt/robot_common.h b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/robot_common.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/robot_common.h
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/robot_common.h
diff --git a/jdk/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/sun_awt_X11_GtkFileDialogPeer.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/sun_awt_X11_GtkFileDialogPeer.c
diff --git a/jdk/src/solaris/native/sun/awt/swing_GTKEngine.c b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/swing_GTKEngine.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/swing_GTKEngine.c
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/swing_GTKEngine.c
diff --git a/jdk/src/solaris/native/sun/awt/swing_GTKStyle.c b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/swing_GTKStyle.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/swing_GTKStyle.c
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/swing_GTKStyle.c
diff --git a/jdk/src/solaris/native/sun/awt/wsutils.h b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/wsutils.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/wsutils.h
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/wsutils.h
diff --git a/jdk/src/solaris/native/sun/java2d/x11/XRBackendNative.c b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/java2d/x11/XRBackendNative.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/x11/XRBackendNative.c
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/java2d/x11/XRBackendNative.c
diff --git a/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/java2d/x11/XRSurfaceData.c
similarity index 100%
rename from jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/java2d/x11/XRSurfaceData.c
diff --git a/jdk/src/solaris/native/sun/xawt/XToolkit.c b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/xawt/XToolkit.c
similarity index 100%
rename from jdk/src/solaris/native/sun/xawt/XToolkit.c
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/xawt/XToolkit.c
diff --git a/jdk/src/solaris/native/sun/xawt/XWindow.c b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/xawt/XWindow.c
similarity index 100%
rename from jdk/src/solaris/native/sun/xawt/XWindow.c
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/xawt/XWindow.c
diff --git a/jdk/src/solaris/native/sun/xawt/XlibWrapper.c b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/xawt/XlibWrapper.c
similarity index 100%
rename from jdk/src/solaris/native/sun/xawt/XlibWrapper.c
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/xawt/XlibWrapper.c
diff --git a/jdk/src/solaris/native/sun/xawt/awt_Desktop.c b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/xawt/awt_Desktop.c
similarity index 100%
rename from jdk/src/solaris/native/sun/xawt/awt_Desktop.c
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/xawt/awt_Desktop.c
diff --git a/jdk/src/solaris/native/sun/xawt/gnome_interface.c b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/xawt/gnome_interface.c
similarity index 100%
rename from jdk/src/solaris/native/sun/xawt/gnome_interface.c
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/xawt/gnome_interface.c
diff --git a/jdk/src/solaris/native/sun/xawt/gnome_interface.h b/jdk/src/java.desktop/unix/native/libawt_xawt/sun/xawt/gnome_interface.h
similarity index 100%
rename from jdk/src/solaris/native/sun/xawt/gnome_interface.h
rename to jdk/src/java.desktop/unix/native/libawt_xawt/sun/xawt/gnome_interface.h
diff --git a/jdk/src/solaris/native/sun/font/X11FontScaler.c b/jdk/src/java.desktop/unix/native/libfontmanager/X11FontScaler.c
similarity index 100%
rename from jdk/src/solaris/native/sun/font/X11FontScaler.c
rename to jdk/src/java.desktop/unix/native/libfontmanager/X11FontScaler.c
diff --git a/jdk/src/solaris/native/sun/font/X11TextRenderer.c b/jdk/src/java.desktop/unix/native/libfontmanager/X11TextRenderer.c
similarity index 100%
rename from jdk/src/solaris/native/sun/font/X11TextRenderer.c
rename to jdk/src/java.desktop/unix/native/libfontmanager/X11TextRenderer.c
diff --git a/jdk/src/solaris/native/sun/awt/jawt.c b/jdk/src/java.desktop/unix/native/libjawt/jawt.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/jawt.c
rename to jdk/src/java.desktop/unix/native/libjawt/jawt.c
diff --git a/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.c b/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_CommonUtils.c
similarity index 100%
rename from jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.c
rename to jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_CommonUtils.c
diff --git a/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.h b/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_CommonUtils.h
similarity index 100%
rename from jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.h
rename to jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_CommonUtils.h
diff --git a/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiIn.c b/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiIn.c
similarity index 100%
rename from jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiIn.c
rename to jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiIn.c
diff --git a/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiOut.c b/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiOut.c
similarity index 100%
rename from jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiOut.c
rename to jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiOut.c
diff --git a/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.c b/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiUtils.c
similarity index 100%
rename from jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.c
rename to jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiUtils.c
diff --git a/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.h b/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiUtils.h
similarity index 100%
rename from jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.h
rename to jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiUtils.h
diff --git a/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCM.c b/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_PCM.c
similarity index 100%
rename from jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCM.c
rename to jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_PCM.c
diff --git a/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.c b/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_PCMUtils.c
similarity index 100%
rename from jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.c
rename to jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_PCMUtils.c
diff --git a/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.h b/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_PCMUtils.h
similarity index 100%
rename from jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.h
rename to jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_PCMUtils.h
diff --git a/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_Ports.c b/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_Ports.c
similarity index 100%
rename from jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_Ports.c
rename to jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_Ports.c
diff --git a/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.c b/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.c
similarity index 100%
rename from jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.c
rename to jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.c
diff --git a/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.h b/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.h
similarity index 100%
rename from jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.h
rename to jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.h
diff --git a/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_MidiIn.c b/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiIn.c
similarity index 100%
rename from jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_MidiIn.c
rename to jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiIn.c
diff --git a/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_MidiOut.c b/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiOut.c
similarity index 100%
rename from jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_MidiOut.c
rename to jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiOut.c
diff --git a/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.c b/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.c
similarity index 100%
rename from jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.c
rename to jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.c
diff --git a/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.h b/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.h
similarity index 100%
rename from jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.h
rename to jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.h
diff --git a/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c b/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCM.c
similarity index 100%
rename from jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c
rename to jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCM.c
diff --git a/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.c b/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.c
similarity index 100%
rename from jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.c
rename to jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.c
diff --git a/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.h b/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.h
similarity index 100%
rename from jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.h
rename to jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.h
diff --git a/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_Ports.c b/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_Ports.c
similarity index 100%
rename from jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_Ports.c
rename to jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_Ports.c
diff --git a/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_PCM.c b/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_PCM.c
similarity index 100%
rename from jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_PCM.c
rename to jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_PCM.c
diff --git a/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_Ports.c b/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_Ports.c
similarity index 100%
rename from jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_Ports.c
rename to jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_Ports.c
diff --git a/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_Utils.c b/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_Utils.c
similarity index 100%
rename from jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_Utils.c
rename to jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_Utils.c
diff --git a/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_Utils.h b/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_Utils.h
similarity index 100%
rename from jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_Utils.h
rename to jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_Utils.h
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_ImageConvCopyEdge_Fp.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_ImageConvCopyEdge_Fp.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_ImageConvCopyEdge_Fp.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_ImageConvCopyEdge_Fp.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffineIndex_BC.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffineIndex_BC.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffineIndex_BC.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffineIndex_BC.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BC.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BC.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BC.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BC.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BC_S16.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BC_S16.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BC_S16.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BC_S16.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BC_U16.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BC_U16.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BC_U16.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BC_U16.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BL.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BL.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BL_S16.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_S16.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BL_S16.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_S16.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BL_S16.h b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_S16.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BL_S16.h
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_S16.h
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BL_U16.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_U16.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BL_U16.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_U16.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_NN.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_NN.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_NN.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_NN.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract.h b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract.h
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract.h
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract_1.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract_1.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract_1.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract_1.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract_43.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract_43.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract_43.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract_43.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract_f.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract_f.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract_f.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract_f.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelInsert.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelInsert.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelInsert.h b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelInsert.h
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert.h
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelInsert_1.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert_1.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelInsert_1.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert_1.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelInsert_34.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert_34.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelInsert_34.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert_34.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConv.h b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConv.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConv.h
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConv.h
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvClearEdge.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvClearEdge.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvClearEdge.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvClearEdge.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvCopyEdge.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvCopyEdge.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvCopyEdge.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvCopyEdge.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvIndex3_8_16nw.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvIndex3_8_16nw.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvIndex3_8_16nw.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvIndex3_8_16nw.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvIndex3_8_8nw.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvIndex3_8_8nw.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvIndex3_8_8nw.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvIndex3_8_8nw.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvMxN_8.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvMxN_8.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvMxN_8.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvMxN_8.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvMxN_8ext.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvMxN_8ext.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvMxN_8ext.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvMxN_8ext.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvVersion.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvVersion.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvVersion.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvVersion.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConv_8nw.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConv_8nw.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConv_8nw.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConv_8nw.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageFilters.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageFilters.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageFilters.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageFilters.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageFilters.h b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageFilters.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageFilters.h
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageFilters.h
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUp.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUp.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUp.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUp.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpFunc.h b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpFunc.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpFunc.h
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpFunc.h
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS16S16Func.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16S16Func.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS16S16Func.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16S16Func.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS16S32Func.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16S32Func.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS16S32Func.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16S32Func.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS16U16Func.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16U16Func.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS16U16Func.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16U16Func.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS16U8Func.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16U8Func.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS16U8Func.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16U8Func.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32S16Func.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32S16Func.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32S16Func.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32S16Func.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32S32Func.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32S32Func.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32S32Func.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32S32Func.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32U16Func.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32U16Func.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32U16Func.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32U16Func.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32U8Func.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32U8Func.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32U8Func.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32U8Func.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS16S16Func.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16S16Func.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS16S16Func.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16S16Func.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS16S32Func.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16S32Func.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS16S32Func.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16S32Func.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS16U16Func.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16U16Func.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS16U16Func.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16U16Func.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS16U8Func.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16U8Func.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS16U8Func.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16U8Func.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32S16Func.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32S16Func.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32S16Func.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32S16Func.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32S32Func.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32S32Func.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32S32Func.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32S32Func.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32U16Func.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32U16Func.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32U16Func.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32U16Func.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32U8Func.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32U8Func.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32U8Func.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32U8Func.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU16S16Func.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16S16Func.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU16S16Func.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16S16Func.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU16S32Func.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16S32Func.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU16S32Func.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16S32Func.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU16U16Func.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16U16Func.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU16U16Func.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16U16Func.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU16U8Func.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16U8Func.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU16U8Func.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16U8Func.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU8S16Func.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8S16Func.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU8S16Func.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8S16Func.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU8S32Func.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8S32Func.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU8S32Func.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8S32Func.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU8U16Func.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8U16Func.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU8U16Func.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8U16Func.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU8U8Func.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8U8Func.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU8U8Func.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8U8Func.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU16S16Func.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16S16Func.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU16S16Func.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16S16Func.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU16S32Func.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16S32Func.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU16S32Func.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16S32Func.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU16U16Func.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16U16Func.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU16U16Func.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16U16Func.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU16U8Func.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16U8Func.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU16U8Func.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16U8Func.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8S16Func.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8S16Func.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8S16Func.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8S16Func.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8S32Func.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8S32Func.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8S32Func.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8S32Func.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8U16Func.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8U16Func.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8U16Func.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8U16Func.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8U8Func.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8U8Func.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8U8Func.c
rename to jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8U8Func.c
diff --git a/jdk/src/solaris/native/sun/awt/medialib/vis_32.il b/jdk/src/java.desktop/unix/native/libmlib_image/vis_32.il
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/vis_32.il
rename to jdk/src/java.desktop/unix/native/libmlib_image/vis_32.il
diff --git a/jdk/src/solaris/native/sun/awt/medialib/vis_64.il b/jdk/src/java.desktop/unix/native/libmlib_image/vis_64.il
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/medialib/vis_64.il
rename to jdk/src/java.desktop/unix/native/libmlib_image/vis_64.il
diff --git a/jdk/src/solaris/native/sun/awt/splashscreen/splashscreen_config.h b/jdk/src/java.desktop/unix/native/libsplashscreen/splashscreen_config.h
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/splashscreen/splashscreen_config.h
rename to jdk/src/java.desktop/unix/native/libsplashscreen/splashscreen_config.h
diff --git a/jdk/src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c b/jdk/src/java.desktop/unix/native/libsplashscreen/splashscreen_sys.c
similarity index 100%
rename from jdk/src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c
rename to jdk/src/java.desktop/unix/native/libsplashscreen/splashscreen_sys.c
diff --git a/jdk/src/solaris/native/sun/jdga/dgalock.c b/jdk/src/java.desktop/unix/native/libsunwjdga/dgalock.c
similarity index 100%
rename from jdk/src/solaris/native/sun/jdga/dgalock.c
rename to jdk/src/java.desktop/unix/native/libsunwjdga/dgalock.c
diff --git a/jdk/src/solaris/native/sun/jdga/jdga.h b/jdk/src/java.desktop/unix/native/libsunwjdga/jdga.h
similarity index 100%
rename from jdk/src/solaris/native/sun/jdga/jdga.h
rename to jdk/src/java.desktop/unix/native/libsunwjdga/jdga.h
diff --git a/jdk/src/solaris/native/sun/jdga/jdgadevice.h b/jdk/src/java.desktop/unix/native/libsunwjdga/jdgadevice.h
similarity index 100%
rename from jdk/src/solaris/native/sun/jdga/jdgadevice.h
rename to jdk/src/java.desktop/unix/native/libsunwjdga/jdgadevice.h
diff --git a/jdk/src/windows/classes/sun/print/services/javax.print.PrintServiceLookup b/jdk/src/java.desktop/windows/classes/META-INF/services/javax.print.PrintServiceLookup
similarity index 100%
rename from jdk/src/windows/classes/sun/print/services/javax.print.PrintServiceLookup
rename to jdk/src/java.desktop/windows/classes/META-INF/services/javax.print.PrintServiceLookup
diff --git a/jdk/src/windows/classes/sun/print/services/javax.print.StreamPrintServiceFactory b/jdk/src/java.desktop/windows/classes/META-INF/services/javax.print.StreamPrintServiceFactory
similarity index 100%
rename from jdk/src/windows/classes/sun/print/services/javax.print.StreamPrintServiceFactory
rename to jdk/src/java.desktop/windows/classes/META-INF/services/javax.print.StreamPrintServiceFactory
diff --git a/jdk/src/windows/classes/sun/awt/Win32ColorModel24.java b/jdk/src/java.desktop/windows/classes/sun/awt/Win32ColorModel24.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/Win32ColorModel24.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/Win32ColorModel24.java
diff --git a/jdk/src/windows/classes/sun/awt/Win32FontManager.java b/jdk/src/java.desktop/windows/classes/sun/awt/Win32FontManager.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/Win32FontManager.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/Win32FontManager.java
diff --git a/jdk/src/windows/classes/sun/awt/Win32GraphicsConfig.java b/jdk/src/java.desktop/windows/classes/sun/awt/Win32GraphicsConfig.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/Win32GraphicsConfig.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/Win32GraphicsConfig.java
diff --git a/jdk/src/windows/classes/sun/awt/Win32GraphicsDevice.java b/jdk/src/java.desktop/windows/classes/sun/awt/Win32GraphicsDevice.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/Win32GraphicsDevice.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/Win32GraphicsDevice.java
diff --git a/jdk/src/windows/classes/sun/awt/Win32GraphicsEnvironment.java b/jdk/src/java.desktop/windows/classes/sun/awt/Win32GraphicsEnvironment.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/Win32GraphicsEnvironment.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/Win32GraphicsEnvironment.java
diff --git a/jdk/src/windows/classes/sun/datatransfer/resources/flavormap.properties b/jdk/src/java.desktop/windows/classes/sun/awt/datatransfer/flavormap.properties
similarity index 100%
rename from jdk/src/windows/classes/sun/datatransfer/resources/flavormap.properties
rename to jdk/src/java.desktop/windows/classes/sun/awt/datatransfer/flavormap.properties
diff --git a/jdk/src/windows/classes/sun/awt/shell/Win32ShellFolder2.java b/jdk/src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolder2.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/shell/Win32ShellFolder2.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolder2.java
diff --git a/jdk/src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java b/jdk/src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/ThemeReader.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/ThemeReader.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/ThemeReader.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/ThemeReader.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/TranslucentWindowPainter.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/TranslucentWindowPainter.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/TranslucentWindowPainter.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/TranslucentWindowPainter.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WBufferStrategy.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WBufferStrategy.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WBufferStrategy.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WBufferStrategy.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WButtonPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WButtonPeer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WButtonPeer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WButtonPeer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WCanvasPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WCanvasPeer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WCanvasPeer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WCanvasPeer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WCheckboxMenuItemPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WCheckboxMenuItemPeer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WCheckboxMenuItemPeer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WCheckboxMenuItemPeer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WCheckboxPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WCheckboxPeer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WCheckboxPeer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WCheckboxPeer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WChoicePeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WChoicePeer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WChoicePeer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WChoicePeer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WClipboard.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WClipboard.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WClipboard.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WClipboard.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WColor.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WColor.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WColor.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WColor.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WComponentPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WComponentPeer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WComponentPeer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WComponentPeer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WCustomCursor.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WCustomCursor.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WCustomCursor.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WCustomCursor.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WDataTransferer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WDataTransferer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WDataTransferer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WDataTransferer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WDefaultFontCharset.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WDefaultFontCharset.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WDefaultFontCharset.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WDefaultFontCharset.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WDesktopPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WDesktopPeer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WDesktopPeer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WDesktopPeer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WDesktopProperties.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WDesktopProperties.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WDesktopProperties.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WDesktopProperties.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WDialogPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WDialogPeer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WDialogPeer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WDialogPeer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WDragSourceContextPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WDragSourceContextPeer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WDragSourceContextPeer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WDragSourceContextPeer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WDropTargetContextPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WDropTargetContextPeer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WDropTargetContextPeer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WDropTargetContextPeer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WEmbeddedFrame.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFrame.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WEmbeddedFrame.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFrame.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WFileDialogPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WFileDialogPeer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WFileDialogPeer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WFileDialogPeer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WFontConfiguration.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WFontConfiguration.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WFontConfiguration.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WFontConfiguration.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WFontMetrics.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WFontMetrics.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WFontMetrics.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WFontMetrics.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WFontPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WFontPeer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WFontPeer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WFontPeer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WFramePeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WFramePeer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WFramePeer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WFramePeer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WGlobalCursorManager.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WGlobalCursorManager.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WGlobalCursorManager.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WGlobalCursorManager.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WInputMethod.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WInputMethod.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WInputMethod.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WInputMethod.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WInputMethodDescriptor.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WInputMethodDescriptor.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WInputMethodDescriptor.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WInputMethodDescriptor.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WKeyboardFocusManagerPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WKeyboardFocusManagerPeer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WKeyboardFocusManagerPeer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WKeyboardFocusManagerPeer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WLabelPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WLabelPeer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WLabelPeer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WLabelPeer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WLightweightFramePeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WLightweightFramePeer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WLightweightFramePeer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WLightweightFramePeer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WListPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WListPeer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WListPeer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WListPeer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WMenuBarPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WMenuBarPeer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WMenuBarPeer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WMenuBarPeer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WMenuItemPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WMenuItemPeer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WMenuItemPeer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WMenuItemPeer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WMenuPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WMenuPeer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WMenuPeer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WMenuPeer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WMouseDragGestureRecognizer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WMouseDragGestureRecognizer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WMouseDragGestureRecognizer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WMouseDragGestureRecognizer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WObjectPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WObjectPeer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WObjectPeer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WObjectPeer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WPageDialog.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WPageDialog.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WPageDialog.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WPageDialog.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WPageDialogPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WPageDialogPeer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WPageDialogPeer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WPageDialogPeer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WPanelPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WPanelPeer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WPanelPeer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WPanelPeer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WPathGraphics.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WPathGraphics.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WPathGraphics.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WPathGraphics.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WPopupMenuPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WPopupMenuPeer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WPopupMenuPeer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WPopupMenuPeer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WPrintDialog.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WPrintDialog.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WPrintDialog.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WPrintDialog.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WPrintDialogPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WPrintDialogPeer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WPrintDialogPeer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WPrintDialogPeer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WPrinterJob.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WPrinterJob.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WRobotPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WRobotPeer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WRobotPeer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WRobotPeer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WScrollPanePeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WScrollPanePeer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WScrollPanePeer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WScrollPanePeer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WScrollbarPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WScrollbarPeer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WScrollbarPeer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WScrollbarPeer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WSystemTrayPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WSystemTrayPeer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WSystemTrayPeer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WSystemTrayPeer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WTextAreaPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WTextAreaPeer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WTextAreaPeer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WTextAreaPeer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WTextComponentPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WTextComponentPeer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WTextComponentPeer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WTextComponentPeer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WTextFieldPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WTextFieldPeer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WTextFieldPeer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WTextFieldPeer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WToolkit.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WToolkit.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WTrayIconPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WTrayIconPeer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WTrayIconPeer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WTrayIconPeer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WWindowPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WWindowPeer.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/WingDings.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WingDings.java
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/WingDings.java
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/WingDings.java
diff --git a/jdk/src/windows/classes/sun/awt/windows/awtLocalization.properties b/jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization.properties
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/awtLocalization.properties
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization.properties
diff --git a/jdk/src/windows/classes/sun/awt/windows/awtLocalization_de.properties b/jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_de.properties
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/awtLocalization_de.properties
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_de.properties
diff --git a/jdk/src/windows/classes/sun/awt/windows/awtLocalization_es.properties b/jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_es.properties
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/awtLocalization_es.properties
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_es.properties
diff --git a/jdk/src/windows/classes/sun/awt/windows/awtLocalization_fr.properties b/jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_fr.properties
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/awtLocalization_fr.properties
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_fr.properties
diff --git a/jdk/src/windows/classes/sun/awt/windows/awtLocalization_it.properties b/jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_it.properties
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/awtLocalization_it.properties
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_it.properties
diff --git a/jdk/src/windows/classes/sun/awt/windows/awtLocalization_ja.properties b/jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_ja.properties
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/awtLocalization_ja.properties
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_ja.properties
diff --git a/jdk/src/windows/classes/sun/awt/windows/awtLocalization_ko.properties b/jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_ko.properties
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/awtLocalization_ko.properties
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_ko.properties
diff --git a/jdk/src/windows/classes/sun/awt/windows/awtLocalization_pt_BR.properties b/jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_pt_BR.properties
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/awtLocalization_pt_BR.properties
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_pt_BR.properties
diff --git a/jdk/src/windows/classes/sun/awt/windows/awtLocalization_sv.properties b/jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_sv.properties
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/awtLocalization_sv.properties
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_sv.properties
diff --git a/jdk/src/windows/classes/sun/awt/windows/awtLocalization_zh_CN.properties b/jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_zh_CN.properties
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/awtLocalization_zh_CN.properties
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_zh_CN.properties
diff --git a/jdk/src/windows/classes/sun/awt/windows/awtLocalization_zh_TW.properties b/jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_zh_TW.properties
similarity index 100%
rename from jdk/src/windows/classes/sun/awt/windows/awtLocalization_zh_TW.properties
rename to jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_zh_TW.properties
diff --git a/jdk/src/windows/classes/sun/font/NativeFont.java b/jdk/src/java.desktop/windows/classes/sun/font/NativeFont.java
similarity index 100%
rename from jdk/src/windows/classes/sun/font/NativeFont.java
rename to jdk/src/java.desktop/windows/classes/sun/font/NativeFont.java
diff --git a/jdk/src/windows/classes/sun/font/NativeStrike.java b/jdk/src/java.desktop/windows/classes/sun/font/NativeStrike.java
similarity index 100%
rename from jdk/src/windows/classes/sun/font/NativeStrike.java
rename to jdk/src/java.desktop/windows/classes/sun/font/NativeStrike.java
diff --git a/jdk/src/windows/classes/sun/java2d/ScreenUpdateManager.java b/jdk/src/java.desktop/windows/classes/sun/java2d/ScreenUpdateManager.java
similarity index 100%
rename from jdk/src/windows/classes/sun/java2d/ScreenUpdateManager.java
rename to jdk/src/java.desktop/windows/classes/sun/java2d/ScreenUpdateManager.java
diff --git a/jdk/src/windows/classes/sun/java2d/WindowsSurfaceManagerFactory.java b/jdk/src/java.desktop/windows/classes/sun/java2d/WindowsSurfaceManagerFactory.java
similarity index 100%
rename from jdk/src/windows/classes/sun/java2d/WindowsSurfaceManagerFactory.java
rename to jdk/src/java.desktop/windows/classes/sun/java2d/WindowsSurfaceManagerFactory.java
diff --git a/jdk/src/windows/classes/sun/java2d/d3d/D3DBlitLoops.java b/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DBlitLoops.java
similarity index 100%
rename from jdk/src/windows/classes/sun/java2d/d3d/D3DBlitLoops.java
rename to jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DBlitLoops.java
diff --git a/jdk/src/windows/classes/sun/java2d/d3d/D3DBufImgOps.java b/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DBufImgOps.java
similarity index 100%
rename from jdk/src/windows/classes/sun/java2d/d3d/D3DBufImgOps.java
rename to jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DBufImgOps.java
diff --git a/jdk/src/windows/classes/sun/java2d/d3d/D3DContext.java b/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DContext.java
similarity index 100%
rename from jdk/src/windows/classes/sun/java2d/d3d/D3DContext.java
rename to jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DContext.java
diff --git a/jdk/src/windows/classes/sun/java2d/d3d/D3DDrawImage.java b/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DDrawImage.java
similarity index 100%
rename from jdk/src/windows/classes/sun/java2d/d3d/D3DDrawImage.java
rename to jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DDrawImage.java
diff --git a/jdk/src/windows/classes/sun/java2d/d3d/D3DGraphicsConfig.java b/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsConfig.java
similarity index 100%
rename from jdk/src/windows/classes/sun/java2d/d3d/D3DGraphicsConfig.java
rename to jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsConfig.java
diff --git a/jdk/src/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java b/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java
similarity index 100%
rename from jdk/src/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java
rename to jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java
diff --git a/jdk/src/windows/classes/sun/java2d/d3d/D3DMaskBlit.java b/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DMaskBlit.java
similarity index 100%
rename from jdk/src/windows/classes/sun/java2d/d3d/D3DMaskBlit.java
rename to jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DMaskBlit.java
diff --git a/jdk/src/windows/classes/sun/java2d/d3d/D3DMaskFill.java b/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DMaskFill.java
similarity index 100%
rename from jdk/src/windows/classes/sun/java2d/d3d/D3DMaskFill.java
rename to jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DMaskFill.java
diff --git a/jdk/src/windows/classes/sun/java2d/d3d/D3DPaints.java b/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DPaints.java
similarity index 100%
rename from jdk/src/windows/classes/sun/java2d/d3d/D3DPaints.java
rename to jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DPaints.java
diff --git a/jdk/src/windows/classes/sun/java2d/d3d/D3DRenderQueue.java b/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DRenderQueue.java
similarity index 100%
rename from jdk/src/windows/classes/sun/java2d/d3d/D3DRenderQueue.java
rename to jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DRenderQueue.java
diff --git a/jdk/src/windows/classes/sun/java2d/d3d/D3DRenderer.java b/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DRenderer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/java2d/d3d/D3DRenderer.java
rename to jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DRenderer.java
diff --git a/jdk/src/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java b/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java
similarity index 100%
rename from jdk/src/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java
rename to jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java
diff --git a/jdk/src/windows/classes/sun/java2d/d3d/D3DSurfaceData.java b/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceData.java
similarity index 100%
rename from jdk/src/windows/classes/sun/java2d/d3d/D3DSurfaceData.java
rename to jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceData.java
diff --git a/jdk/src/windows/classes/sun/java2d/d3d/D3DSurfaceDataProxy.java b/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceDataProxy.java
similarity index 100%
rename from jdk/src/windows/classes/sun/java2d/d3d/D3DSurfaceDataProxy.java
rename to jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceDataProxy.java
diff --git a/jdk/src/windows/classes/sun/java2d/d3d/D3DTextRenderer.java b/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DTextRenderer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/java2d/d3d/D3DTextRenderer.java
rename to jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DTextRenderer.java
diff --git a/jdk/src/windows/classes/sun/java2d/d3d/D3DVolatileSurfaceManager.java b/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DVolatileSurfaceManager.java
similarity index 100%
rename from jdk/src/windows/classes/sun/java2d/d3d/D3DVolatileSurfaceManager.java
rename to jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DVolatileSurfaceManager.java
diff --git a/jdk/src/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java b/jdk/src/java.desktop/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java
similarity index 100%
rename from jdk/src/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java
rename to jdk/src/java.desktop/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java
diff --git a/jdk/src/windows/classes/sun/java2d/opengl/WGLSurfaceData.java b/jdk/src/java.desktop/windows/classes/sun/java2d/opengl/WGLSurfaceData.java
similarity index 100%
rename from jdk/src/windows/classes/sun/java2d/opengl/WGLSurfaceData.java
rename to jdk/src/java.desktop/windows/classes/sun/java2d/opengl/WGLSurfaceData.java
diff --git a/jdk/src/windows/classes/sun/java2d/opengl/WGLVolatileSurfaceManager.java b/jdk/src/java.desktop/windows/classes/sun/java2d/opengl/WGLVolatileSurfaceManager.java
similarity index 100%
rename from jdk/src/windows/classes/sun/java2d/opengl/WGLVolatileSurfaceManager.java
rename to jdk/src/java.desktop/windows/classes/sun/java2d/opengl/WGLVolatileSurfaceManager.java
diff --git a/jdk/src/windows/classes/sun/java2d/windows/GDIBlitLoops.java b/jdk/src/java.desktop/windows/classes/sun/java2d/windows/GDIBlitLoops.java
similarity index 100%
rename from jdk/src/windows/classes/sun/java2d/windows/GDIBlitLoops.java
rename to jdk/src/java.desktop/windows/classes/sun/java2d/windows/GDIBlitLoops.java
diff --git a/jdk/src/windows/classes/sun/java2d/windows/GDIRenderer.java b/jdk/src/java.desktop/windows/classes/sun/java2d/windows/GDIRenderer.java
similarity index 100%
rename from jdk/src/windows/classes/sun/java2d/windows/GDIRenderer.java
rename to jdk/src/java.desktop/windows/classes/sun/java2d/windows/GDIRenderer.java
diff --git a/jdk/src/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java b/jdk/src/java.desktop/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java
similarity index 100%
rename from jdk/src/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java
rename to jdk/src/java.desktop/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java
diff --git a/jdk/src/windows/classes/sun/java2d/windows/WindowsFlags.java b/jdk/src/java.desktop/windows/classes/sun/java2d/windows/WindowsFlags.java
similarity index 100%
rename from jdk/src/windows/classes/sun/java2d/windows/WindowsFlags.java
rename to jdk/src/java.desktop/windows/classes/sun/java2d/windows/WindowsFlags.java
diff --git a/jdk/src/windows/classes/sun/print/Win32MediaTray.java b/jdk/src/java.desktop/windows/classes/sun/print/Win32MediaTray.java
similarity index 100%
rename from jdk/src/windows/classes/sun/print/Win32MediaTray.java
rename to jdk/src/java.desktop/windows/classes/sun/print/Win32MediaTray.java
diff --git a/jdk/src/windows/classes/sun/print/Win32PrintJob.java b/jdk/src/java.desktop/windows/classes/sun/print/Win32PrintJob.java
similarity index 100%
rename from jdk/src/windows/classes/sun/print/Win32PrintJob.java
rename to jdk/src/java.desktop/windows/classes/sun/print/Win32PrintJob.java
diff --git a/jdk/src/windows/classes/sun/print/Win32PrintService.java b/jdk/src/java.desktop/windows/classes/sun/print/Win32PrintService.java
similarity index 100%
rename from jdk/src/windows/classes/sun/print/Win32PrintService.java
rename to jdk/src/java.desktop/windows/classes/sun/print/Win32PrintService.java
diff --git a/jdk/src/windows/classes/sun/print/Win32PrintServiceLookup.java b/jdk/src/java.desktop/windows/classes/sun/print/Win32PrintServiceLookup.java
similarity index 100%
rename from jdk/src/windows/classes/sun/print/Win32PrintServiceLookup.java
rename to jdk/src/java.desktop/windows/classes/sun/print/Win32PrintServiceLookup.java
diff --git a/jdk/src/windows/lib/images/cursors/cursors.properties b/jdk/src/java.desktop/windows/conf/images/cursors/cursors.properties
similarity index 100%
rename from jdk/src/windows/lib/images/cursors/cursors.properties
rename to jdk/src/java.desktop/windows/conf/images/cursors/cursors.properties
diff --git a/jdk/src/windows/native/sun/awt_common/awt_makecube.cpp b/jdk/src/java.desktop/windows/native/common/awt_makecube.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/awt_common/awt_makecube.cpp
rename to jdk/src/java.desktop/windows/native/common/awt_makecube.cpp
diff --git a/jdk/src/windows/native/sun/awt/utility/rect.h b/jdk/src/java.desktop/windows/native/common/sun/awt/utility/rect.h
similarity index 100%
rename from jdk/src/windows/native/sun/awt/utility/rect.h
rename to jdk/src/java.desktop/windows/native/common/sun/awt/utility/rect.h
diff --git a/jdk/src/windows/javavm/export/jawt_md.h b/jdk/src/java.desktop/windows/native/include/jawt_md.h
similarity index 100%
rename from jdk/src/windows/javavm/export/jawt_md.h
rename to jdk/src/java.desktop/windows/native/include/jawt_md.h
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DBadHardware.h b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DBadHardware.h
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DBadHardware.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DBadHardware.h
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DBlitLoops.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DBlitLoops.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DBlitLoops.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DBlitLoops.cpp
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DBlitLoops.h b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DBlitLoops.h
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DBlitLoops.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DBlitLoops.h
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DBufImgOps.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DBufImgOps.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DBufImgOps.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DBufImgOps.cpp
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DBufImgOps.h b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DBufImgOps.h
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DBufImgOps.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DBufImgOps.h
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DContext.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DContext.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DContext.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DContext.cpp
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DContext.h b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DContext.h
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DContext.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DContext.h
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DGlyphCache.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DGlyphCache.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DGlyphCache.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DGlyphCache.cpp
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DGlyphCache.h b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DGlyphCache.h
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DGlyphCache.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DGlyphCache.h
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DGraphicsDevice.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DGraphicsDevice.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DGraphicsDevice.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DGraphicsDevice.cpp
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DGraphicsDevice.h b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DGraphicsDevice.h
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DGraphicsDevice.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DGraphicsDevice.h
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DMaskBlit.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DMaskBlit.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DMaskBlit.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DMaskBlit.cpp
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DMaskBlit.h b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DMaskBlit.h
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DMaskBlit.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DMaskBlit.h
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DMaskCache.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DMaskCache.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DMaskCache.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DMaskCache.cpp
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DMaskCache.h b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DMaskCache.h
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DMaskCache.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DMaskCache.h
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DMaskFill.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DMaskFill.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DMaskFill.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DMaskFill.cpp
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DMaskFill.h b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DMaskFill.h
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DMaskFill.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DMaskFill.h
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DPaints.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DPaints.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DPaints.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DPaints.cpp
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DPaints.h b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DPaints.h
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DPaints.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DPaints.h
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DPipeline.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DPipeline.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DPipeline.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DPipeline.cpp
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DPipeline.h b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DPipeline.h
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DPipeline.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DPipeline.h
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DPipelineManager.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DPipelineManager.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DPipelineManager.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DPipelineManager.cpp
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DPipelineManager.h b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DPipelineManager.h
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DPipelineManager.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DPipelineManager.h
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DRenderQueue.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DRenderQueue.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DRenderQueue.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DRenderQueue.cpp
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DRenderQueue.h b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DRenderQueue.h
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DRenderQueue.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DRenderQueue.h
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DRenderer.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DRenderer.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DRenderer.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DRenderer.cpp
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DRenderer.h b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DRenderer.h
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DRenderer.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DRenderer.h
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DResourceManager.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DResourceManager.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DResourceManager.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DResourceManager.cpp
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DResourceManager.h b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DResourceManager.h
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DResourceManager.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DResourceManager.h
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DShaderGen.c b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DShaderGen.c
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DShaderGen.c
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DShaderGen.c
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DShaders.h b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DShaders.h
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DShaders.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DShaders.h
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DSurfaceData.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DSurfaceData.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DSurfaceData.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DSurfaceData.cpp
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DSurfaceData.h b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DSurfaceData.h
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DSurfaceData.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DSurfaceData.h
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DTextRenderer.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DTextRenderer.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DTextRenderer.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DTextRenderer.cpp
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DTextRenderer.h b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DTextRenderer.h
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DTextRenderer.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DTextRenderer.h
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DVertexCacher.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DVertexCacher.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DVertexCacher.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DVertexCacher.cpp
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DVertexCacher.h b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DVertexCacher.h
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/d3d/D3DVertexCacher.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DVertexCacher.h
diff --git a/jdk/src/windows/native/sun/java2d/j2d_md.h b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/j2d_md.h
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/j2d_md.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/j2d_md.h
diff --git a/jdk/src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/opengl/J2D_GL/wglext.h
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/opengl/J2D_GL/wglext.h
diff --git a/jdk/src/windows/native/sun/java2d/opengl/OGLFuncs_md.h b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/opengl/OGLFuncs_md.h
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/opengl/OGLFuncs_md.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/opengl/OGLFuncs_md.h
diff --git a/jdk/src/windows/native/sun/java2d/opengl/WGLGraphicsConfig.c b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/opengl/WGLGraphicsConfig.c
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/opengl/WGLGraphicsConfig.c
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/opengl/WGLGraphicsConfig.c
diff --git a/jdk/src/windows/native/sun/java2d/opengl/WGLGraphicsConfig.h b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/opengl/WGLGraphicsConfig.h
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/opengl/WGLGraphicsConfig.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/opengl/WGLGraphicsConfig.h
diff --git a/jdk/src/windows/native/sun/java2d/opengl/WGLSurfaceData.c b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/opengl/WGLSurfaceData.c
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/opengl/WGLSurfaceData.c
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/opengl/WGLSurfaceData.c
diff --git a/jdk/src/windows/native/sun/java2d/opengl/WGLSurfaceData.h b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/opengl/WGLSurfaceData.h
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/opengl/WGLSurfaceData.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/opengl/WGLSurfaceData.h
diff --git a/jdk/src/windows/native/sun/java2d/windows/GDIBlitLoops.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/windows/GDIBlitLoops.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/windows/GDIBlitLoops.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/windows/GDIBlitLoops.cpp
diff --git a/jdk/src/windows/native/sun/java2d/windows/GDIRenderer.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/windows/GDIRenderer.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/windows/GDIRenderer.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/windows/GDIRenderer.cpp
diff --git a/jdk/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/windows/GDIWindowSurfaceData.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/windows/GDIWindowSurfaceData.cpp
diff --git a/jdk/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/windows/GDIWindowSurfaceData.h
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/windows/GDIWindowSurfaceData.h
diff --git a/jdk/src/windows/native/sun/java2d/windows/WindowsFlags.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/windows/WindowsFlags.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/windows/WindowsFlags.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/windows/WindowsFlags.cpp
diff --git a/jdk/src/windows/native/sun/java2d/windows/WindowsFlags.h b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/windows/WindowsFlags.h
similarity index 100%
rename from jdk/src/windows/native/sun/java2d/windows/WindowsFlags.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/java2d/windows/WindowsFlags.h
diff --git a/jdk/src/windows/native/sun/windows/CmdIDList.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/CmdIDList.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/CmdIDList.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/CmdIDList.cpp
diff --git a/jdk/src/windows/native/sun/windows/CmdIDList.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/CmdIDList.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/CmdIDList.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/CmdIDList.h
diff --git a/jdk/src/windows/native/sun/windows/ComCtl32Util.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/ComCtl32Util.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/ComCtl32Util.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/ComCtl32Util.cpp
diff --git a/jdk/src/windows/native/sun/windows/ComCtl32Util.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/ComCtl32Util.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/ComCtl32Util.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/ComCtl32Util.h
diff --git a/jdk/src/windows/native/sun/windows/Devices.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/Devices.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/Devices.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/Devices.cpp
diff --git a/jdk/src/windows/native/sun/windows/Devices.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/Devices.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/Devices.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/Devices.h
diff --git a/jdk/src/windows/native/sun/windows/DllUtil.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/DllUtil.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/DllUtil.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/DllUtil.cpp
diff --git a/jdk/src/windows/native/sun/windows/DllUtil.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/DllUtil.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/DllUtil.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/DllUtil.h
diff --git a/jdk/src/windows/native/sun/windows/GDIHashtable.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/GDIHashtable.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/GDIHashtable.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/GDIHashtable.cpp
diff --git a/jdk/src/windows/native/sun/windows/GDIHashtable.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/GDIHashtable.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/GDIHashtable.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/GDIHashtable.h
diff --git a/jdk/src/windows/native/sun/windows/Hashtable.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/Hashtable.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/Hashtable.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/Hashtable.cpp
diff --git a/jdk/src/windows/native/sun/windows/Hashtable.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/Hashtable.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/Hashtable.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/Hashtable.h
diff --git a/jdk/src/windows/native/sun/windows/MouseInfo.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/MouseInfo.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/MouseInfo.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/MouseInfo.cpp
diff --git a/jdk/src/windows/native/sun/windows/ObjectList.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/ObjectList.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/ObjectList.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/ObjectList.cpp
diff --git a/jdk/src/windows/native/sun/windows/ObjectList.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/ObjectList.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/ObjectList.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/ObjectList.h
diff --git a/jdk/src/windows/native/sun/windows/README.JNI b/jdk/src/java.desktop/windows/native/libawt/sun/windows/README.JNI
similarity index 100%
rename from jdk/src/windows/native/sun/windows/README.JNI
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/README.JNI
diff --git a/jdk/src/windows/native/sun/windows/ShellFolder2.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/ShellFolder2.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/ShellFolder2.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/ShellFolder2.cpp
diff --git a/jdk/src/windows/native/sun/windows/ThemeReader.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/ThemeReader.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/ThemeReader.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/ThemeReader.cpp
diff --git a/jdk/src/windows/native/sun/windows/WBufferStrategy.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/WBufferStrategy.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/WBufferStrategy.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/WBufferStrategy.cpp
diff --git a/jdk/src/windows/native/sun/windows/WPrinterJob.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/WPrinterJob.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/WPrinterJob.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/WPrinterJob.cpp
diff --git a/jdk/src/windows/native/sun/windows/alloc.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/alloc.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/alloc.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/alloc.h
diff --git a/jdk/src/windows/native/sun/windows/awt.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt.h
diff --git a/jdk/src/windows/native/sun/windows/awt.rc b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt.rc
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt.rc
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt.rc
diff --git a/jdk/src/windows/native/sun/windows/awt_AWTEvent.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_AWTEvent.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_AWTEvent.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_AWTEvent.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_AWTEvent.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_AWTEvent.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_AWTEvent.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_AWTEvent.h
diff --git a/jdk/src/windows/native/sun/windows/awt_BitmapUtil.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_BitmapUtil.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_BitmapUtil.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_BitmapUtil.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_BitmapUtil.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_BitmapUtil.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_BitmapUtil.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_BitmapUtil.h
diff --git a/jdk/src/windows/native/sun/windows/awt_Brush.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Brush.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Brush.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Brush.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_Brush.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Brush.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Brush.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Brush.h
diff --git a/jdk/src/windows/native/sun/windows/awt_Button.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Button.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Button.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Button.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_Button.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Button.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Button.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Button.h
diff --git a/jdk/src/windows/native/sun/windows/awt_Canvas.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Canvas.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Canvas.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Canvas.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_Canvas.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Canvas.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Canvas.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Canvas.h
diff --git a/jdk/src/windows/native/sun/windows/awt_Checkbox.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Checkbox.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Checkbox.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Checkbox.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_Checkbox.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Checkbox.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Checkbox.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Checkbox.h
diff --git a/jdk/src/windows/native/sun/windows/awt_Choice.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Choice.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Choice.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Choice.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_Choice.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Choice.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Choice.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Choice.h
diff --git a/jdk/src/windows/native/sun/windows/awt_Clipboard.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Clipboard.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Clipboard.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Clipboard.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_Clipboard.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Clipboard.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Clipboard.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Clipboard.h
diff --git a/jdk/src/windows/native/sun/windows/awt_Color.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Color.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Color.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Color.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_Color.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Color.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Color.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Color.h
diff --git a/jdk/src/windows/native/sun/windows/awt_Component.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Component.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Component.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Component.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_Component.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Component.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Component.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Component.h
diff --git a/jdk/src/windows/native/sun/windows/awt_Container.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Container.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Container.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Container.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_Container.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Container.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Container.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Container.h
diff --git a/jdk/src/windows/native/sun/windows/awt_Cursor.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Cursor.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Cursor.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Cursor.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_Cursor.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Cursor.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Cursor.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Cursor.h
diff --git a/jdk/src/windows/native/sun/windows/awt_CustomPaletteDef.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_CustomPaletteDef.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_CustomPaletteDef.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_CustomPaletteDef.h
diff --git a/jdk/src/windows/native/sun/windows/awt_DCHolder.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DCHolder.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_DCHolder.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DCHolder.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_DCHolder.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DCHolder.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_DCHolder.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DCHolder.h
diff --git a/jdk/src/windows/native/sun/windows/awt_DataTransferer.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DataTransferer.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_DataTransferer.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DataTransferer.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_DataTransferer.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DataTransferer.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_DataTransferer.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DataTransferer.h
diff --git a/jdk/src/windows/native/sun/windows/awt_Debug.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Debug.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Debug.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Debug.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_Debug.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Debug.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Debug.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Debug.h
diff --git a/jdk/src/windows/native/sun/windows/awt_Desktop.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Desktop.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Desktop.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Desktop.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_DesktopProperties.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DesktopProperties.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_DesktopProperties.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DesktopProperties.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_DesktopProperties.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DesktopProperties.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_DesktopProperties.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DesktopProperties.h
diff --git a/jdk/src/windows/native/sun/windows/awt_Dialog.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Dialog.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Dialog.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Dialog.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_Dialog.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Dialog.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Dialog.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Dialog.h
diff --git a/jdk/src/windows/native/sun/windows/awt_Dimension.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Dimension.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Dimension.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Dimension.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_Dimension.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Dimension.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Dimension.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Dimension.h
diff --git a/jdk/src/windows/native/sun/windows/awt_DnDDS.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DnDDS.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_DnDDS.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DnDDS.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_DnDDS.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DnDDS.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_DnDDS.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DnDDS.h
diff --git a/jdk/src/windows/native/sun/windows/awt_DnDDT.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DnDDT.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_DnDDT.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DnDDT.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_DnDDT.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DnDDT.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_DnDDT.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DnDDT.h
diff --git a/jdk/src/windows/native/sun/windows/awt_DrawingSurface.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DrawingSurface.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_DrawingSurface.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DrawingSurface.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_DrawingSurface.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DrawingSurface.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_DrawingSurface.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DrawingSurface.h
diff --git a/jdk/src/windows/native/sun/windows/awt_Event.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Event.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Event.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Event.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_Event.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Event.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Event.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Event.h
diff --git a/jdk/src/windows/native/sun/windows/awt_FileDialog.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_FileDialog.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_FileDialog.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_FileDialog.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_FileDialog.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_FileDialog.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_FileDialog.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_FileDialog.h
diff --git a/jdk/src/windows/native/sun/windows/awt_Font.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Font.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Font.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Font.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_Font.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Font.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Font.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Font.h
diff --git a/jdk/src/windows/native/sun/windows/awt_Frame.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Frame.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Frame.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Frame.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_Frame.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Frame.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Frame.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Frame.h
diff --git a/jdk/src/windows/native/sun/windows/awt_GDIObject.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_GDIObject.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_GDIObject.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_GDIObject.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_GDIObject.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_GDIObject.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_GDIObject.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_GDIObject.h
diff --git a/jdk/src/windows/native/sun/windows/awt_IconCursor.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_IconCursor.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_IconCursor.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_IconCursor.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_IconCursor.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_IconCursor.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_IconCursor.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_IconCursor.h
diff --git a/jdk/src/windows/native/sun/windows/awt_InputEvent.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputEvent.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_InputEvent.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputEvent.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_InputEvent.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputEvent.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_InputEvent.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputEvent.h
diff --git a/jdk/src/windows/native/sun/windows/awt_InputMethod.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputMethod.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_InputMethod.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputMethod.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_InputTextInfor.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputTextInfor.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_InputTextInfor.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputTextInfor.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_InputTextInfor.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputTextInfor.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_InputTextInfor.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputTextInfor.h
diff --git a/jdk/src/windows/native/sun/windows/awt_Insets.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Insets.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Insets.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Insets.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_Insets.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Insets.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Insets.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Insets.h
diff --git a/jdk/src/windows/native/sun/windows/awt_KeyEvent.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_KeyEvent.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_KeyEvent.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_KeyEvent.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_KeyEvent.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_KeyEvent.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_KeyEvent.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_KeyEvent.h
diff --git a/jdk/src/windows/native/sun/windows/awt_KeyboardFocusManager.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_KeyboardFocusManager.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_KeyboardFocusManager.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_KeyboardFocusManager.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_Label.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Label.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Label.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Label.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_Label.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Label.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Label.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Label.h
diff --git a/jdk/src/windows/native/sun/windows/awt_List.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_List.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_List.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_List.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_List.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_List.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_List.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_List.h
diff --git a/jdk/src/windows/native/sun/windows/awt_Menu.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Menu.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Menu.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Menu.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_Menu.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Menu.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Menu.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Menu.h
diff --git a/jdk/src/windows/native/sun/windows/awt_MenuBar.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuBar.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_MenuBar.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuBar.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_MenuBar.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuBar.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_MenuBar.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuBar.h
diff --git a/jdk/src/windows/native/sun/windows/awt_MenuItem.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuItem.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_MenuItem.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuItem.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_MenuItem.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuItem.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_MenuItem.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuItem.h
diff --git a/jdk/src/windows/native/sun/windows/awt_Mlib.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Mlib.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Mlib.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Mlib.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_Mlib.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Mlib.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Mlib.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Mlib.h
diff --git a/jdk/src/windows/native/sun/windows/awt_MouseEvent.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MouseEvent.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_MouseEvent.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MouseEvent.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_MouseEvent.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MouseEvent.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_MouseEvent.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MouseEvent.h
diff --git a/jdk/src/windows/native/sun/windows/awt_Object.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Object.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Object.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Object.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_Object.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Object.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Object.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Object.h
diff --git a/jdk/src/windows/native/sun/windows/awt_Palette.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Palette.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Palette.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Palette.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_Palette.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Palette.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Palette.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Palette.h
diff --git a/jdk/src/windows/native/sun/windows/awt_Panel.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Panel.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Panel.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Panel.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_Panel.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Panel.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Panel.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Panel.h
diff --git a/jdk/src/windows/native/sun/windows/awt_Pen.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Pen.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Pen.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Pen.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_Pen.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Pen.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Pen.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Pen.h
diff --git a/jdk/src/windows/native/sun/windows/awt_PopupMenu.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PopupMenu.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_PopupMenu.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PopupMenu.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_PopupMenu.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PopupMenu.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_PopupMenu.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PopupMenu.h
diff --git a/jdk/src/windows/native/sun/windows/awt_PrintControl.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintControl.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_PrintControl.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintControl.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_PrintControl.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintControl.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_PrintControl.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintControl.h
diff --git a/jdk/src/windows/native/sun/windows/awt_PrintDialog.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintDialog.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_PrintDialog.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintDialog.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_PrintDialog.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintDialog.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_PrintDialog.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintDialog.h
diff --git a/jdk/src/windows/native/sun/windows/awt_PrintJob.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintJob.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_PrintJob.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintJob.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_Rectangle.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Rectangle.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Rectangle.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Rectangle.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_Rectangle.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Rectangle.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Rectangle.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Rectangle.h
diff --git a/jdk/src/windows/native/sun/windows/awt_Robot.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Robot.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Robot.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Robot.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_Robot.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Robot.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Robot.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Robot.h
diff --git a/jdk/src/windows/native/sun/windows/awt_ScrollPane.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_ScrollPane.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_ScrollPane.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_ScrollPane.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_ScrollPane.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_ScrollPane.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_ScrollPane.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_ScrollPane.h
diff --git a/jdk/src/windows/native/sun/windows/awt_Scrollbar.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Scrollbar.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Scrollbar.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Scrollbar.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_Scrollbar.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Scrollbar.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Scrollbar.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Scrollbar.h
diff --git a/jdk/src/windows/native/sun/windows/awt_TextArea.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextArea.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_TextArea.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextArea.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_TextArea.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextArea.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_TextArea.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextArea.h
diff --git a/jdk/src/windows/native/sun/windows/awt_TextComponent.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextComponent.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_TextComponent.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextComponent.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_TextComponent.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextComponent.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_TextComponent.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextComponent.h
diff --git a/jdk/src/windows/native/sun/windows/awt_TextField.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextField.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_TextField.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextField.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_TextField.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextField.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_TextField.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextField.h
diff --git a/jdk/src/windows/native/sun/windows/awt_Toolkit.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Toolkit.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Toolkit.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Toolkit.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_Toolkit.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Toolkit.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Toolkit.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Toolkit.h
diff --git a/jdk/src/windows/native/sun/windows/awt_TrayIcon.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TrayIcon.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_TrayIcon.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TrayIcon.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_TrayIcon.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TrayIcon.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_TrayIcon.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TrayIcon.h
diff --git a/jdk/src/windows/native/sun/windows/awt_Win32GraphicsConfig.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsConfig.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Win32GraphicsConfig.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsConfig.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_Win32GraphicsConfig.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsConfig.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Win32GraphicsConfig.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsConfig.h
diff --git a/jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsDevice.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsDevice.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsDevice.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsDevice.h
diff --git a/jdk/src/windows/native/sun/windows/awt_Win32GraphicsEnv.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsEnv.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Win32GraphicsEnv.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsEnv.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_Window.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Window.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Window.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Window.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_Window.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Window.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_Window.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Window.h
diff --git a/jdk/src/windows/native/sun/windows/awt_new.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_new.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_new.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_new.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_new.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_new.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_new.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_new.h
diff --git a/jdk/src/windows/native/sun/windows/awt_ole.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_ole.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_ole.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_ole.cpp
diff --git a/jdk/src/windows/native/sun/windows/awt_ole.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_ole.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awt_ole.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_ole.h
diff --git a/jdk/src/windows/native/sun/windows/awtmsg.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awtmsg.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/awtmsg.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/awtmsg.h
diff --git a/jdk/src/windows/native/sun/windows/check.bmp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/check.bmp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/check.bmp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/check.bmp
diff --git a/jdk/src/windows/native/sun/windows/colordata.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/colordata.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/colordata.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/colordata.h
diff --git a/jdk/src/windows/native/sun/windows/hand.cur b/jdk/src/java.desktop/windows/native/libawt/sun/windows/hand.cur
similarity index 100%
rename from jdk/src/windows/native/sun/windows/hand.cur
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/hand.cur
diff --git a/jdk/src/windows/native/sun/windows/img_util_md.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/img_util_md.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/img_util_md.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/img_util_md.h
diff --git a/jdk/src/windows/native/sun/windows/initIDs.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/initIDs.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/initIDs.cpp
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/initIDs.cpp
diff --git a/jdk/src/windows/native/sun/windows/mlib_types_md.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/mlib_types_md.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/mlib_types_md.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/mlib_types_md.h
diff --git a/jdk/src/windows/native/sun/windows/security_warning.ico b/jdk/src/java.desktop/windows/native/libawt/sun/windows/security_warning.ico
similarity index 100%
rename from jdk/src/windows/native/sun/windows/security_warning.ico
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/security_warning.ico
diff --git a/jdk/src/windows/native/sun/windows/security_warning_bw.ico b/jdk/src/java.desktop/windows/native/libawt/sun/windows/security_warning_bw.ico
similarity index 100%
rename from jdk/src/windows/native/sun/windows/security_warning_bw.ico
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/security_warning_bw.ico
diff --git a/jdk/src/windows/native/sun/windows/security_warning_int.ico b/jdk/src/java.desktop/windows/native/libawt/sun/windows/security_warning_int.ico
similarity index 100%
rename from jdk/src/windows/native/sun/windows/security_warning_int.ico
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/security_warning_int.ico
diff --git a/jdk/src/windows/native/sun/windows/stdhdrs.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/stdhdrs.h
similarity index 100%
rename from jdk/src/windows/native/sun/windows/stdhdrs.h
rename to jdk/src/java.desktop/windows/native/libawt/sun/windows/stdhdrs.h
diff --git a/jdk/src/windows/native/sun/font/fontpath.c b/jdk/src/java.desktop/windows/native/libfontmanager/fontpath.c
similarity index 100%
rename from jdk/src/windows/native/sun/font/fontpath.c
rename to jdk/src/java.desktop/windows/native/libfontmanager/fontpath.c
diff --git a/jdk/src/windows/native/sun/font/lcdglyph.c b/jdk/src/java.desktop/windows/native/libfontmanager/lcdglyph.c
similarity index 100%
rename from jdk/src/windows/native/sun/font/lcdglyph.c
rename to jdk/src/java.desktop/windows/native/libfontmanager/lcdglyph.c
diff --git a/jdk/src/windows/native/sun/windows/jawt.cpp b/jdk/src/java.desktop/windows/native/libjawt/jawt.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/windows/jawt.cpp
rename to jdk/src/java.desktop/windows/native/libjawt/jawt.cpp
diff --git a/jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_DirectSound.cpp b/jdk/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_DirectSound.cpp
similarity index 100%
rename from jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_DirectSound.cpp
rename to jdk/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_DirectSound.cpp
diff --git a/jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_MidiIn.cpp b/jdk/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_MidiIn.cpp
similarity index 100%
rename from jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_MidiIn.cpp
rename to jdk/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_MidiIn.cpp
diff --git a/jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_MidiOut.c b/jdk/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_MidiOut.c
similarity index 100%
rename from jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_MidiOut.c
rename to jdk/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_MidiOut.c
diff --git a/jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_Ports.c b/jdk/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_Ports.c
similarity index 100%
rename from jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_Ports.c
rename to jdk/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_Ports.c
diff --git a/jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_Util.c b/jdk/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_Util.c
similarity index 100%
rename from jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_Util.c
rename to jdk/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_Util.c
diff --git a/jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_Util.h b/jdk/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_Util.h
similarity index 100%
rename from jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_Util.h
rename to jdk/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_Util.h
diff --git a/jdk/src/windows/native/sun/awt/splashscreen/splashscreen_config.h b/jdk/src/java.desktop/windows/native/libsplashscreen/splashscreen_config.h
similarity index 100%
rename from jdk/src/windows/native/sun/awt/splashscreen/splashscreen_config.h
rename to jdk/src/java.desktop/windows/native/libsplashscreen/splashscreen_config.h
diff --git a/jdk/src/windows/native/sun/awt/splashscreen/splashscreen_sys.c b/jdk/src/java.desktop/windows/native/libsplashscreen/splashscreen_sys.c
similarity index 100%
rename from jdk/src/windows/native/sun/awt/splashscreen/splashscreen_sys.c
rename to jdk/src/java.desktop/windows/native/libsplashscreen/splashscreen_sys.c
diff --git a/jdk/src/share/classes/java/lang/instrument/ClassDefinition.java b/jdk/src/java.instrument/share/classes/java/lang/instrument/ClassDefinition.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/instrument/ClassDefinition.java
rename to jdk/src/java.instrument/share/classes/java/lang/instrument/ClassDefinition.java
diff --git a/jdk/src/share/classes/java/lang/instrument/ClassFileTransformer.java b/jdk/src/java.instrument/share/classes/java/lang/instrument/ClassFileTransformer.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/instrument/ClassFileTransformer.java
rename to jdk/src/java.instrument/share/classes/java/lang/instrument/ClassFileTransformer.java
diff --git a/jdk/src/share/classes/java/lang/instrument/IllegalClassFormatException.java b/jdk/src/java.instrument/share/classes/java/lang/instrument/IllegalClassFormatException.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/instrument/IllegalClassFormatException.java
rename to jdk/src/java.instrument/share/classes/java/lang/instrument/IllegalClassFormatException.java
diff --git a/jdk/src/share/classes/java/lang/instrument/Instrumentation.java b/jdk/src/java.instrument/share/classes/java/lang/instrument/Instrumentation.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/instrument/Instrumentation.java
rename to jdk/src/java.instrument/share/classes/java/lang/instrument/Instrumentation.java
diff --git a/jdk/src/share/classes/java/lang/instrument/UnmodifiableClassException.java b/jdk/src/java.instrument/share/classes/java/lang/instrument/UnmodifiableClassException.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/instrument/UnmodifiableClassException.java
rename to jdk/src/java.instrument/share/classes/java/lang/instrument/UnmodifiableClassException.java
diff --git a/jdk/src/share/classes/java/lang/instrument/package.html b/jdk/src/java.instrument/share/classes/java/lang/instrument/package.html
similarity index 100%
rename from jdk/src/share/classes/java/lang/instrument/package.html
rename to jdk/src/java.instrument/share/classes/java/lang/instrument/package.html
diff --git a/jdk/src/share/classes/sun/instrument/InstrumentationImpl.java b/jdk/src/java.instrument/share/classes/sun/instrument/InstrumentationImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/instrument/InstrumentationImpl.java
rename to jdk/src/java.instrument/share/classes/sun/instrument/InstrumentationImpl.java
diff --git a/jdk/src/share/classes/sun/instrument/TransformerManager.java b/jdk/src/java.instrument/share/classes/sun/instrument/TransformerManager.java
similarity index 100%
rename from jdk/src/share/classes/sun/instrument/TransformerManager.java
rename to jdk/src/java.instrument/share/classes/sun/instrument/TransformerManager.java
diff --git a/jdk/src/share/instrument/EncodingSupport.c b/jdk/src/java.instrument/share/native/libinstrument/EncodingSupport.c
similarity index 100%
rename from jdk/src/share/instrument/EncodingSupport.c
rename to jdk/src/java.instrument/share/native/libinstrument/EncodingSupport.c
diff --git a/jdk/src/share/instrument/EncodingSupport.h b/jdk/src/java.instrument/share/native/libinstrument/EncodingSupport.h
similarity index 100%
rename from jdk/src/share/instrument/EncodingSupport.h
rename to jdk/src/java.instrument/share/native/libinstrument/EncodingSupport.h
diff --git a/jdk/src/share/instrument/FileSystemSupport.h b/jdk/src/java.instrument/share/native/libinstrument/FileSystemSupport.h
similarity index 100%
rename from jdk/src/share/instrument/FileSystemSupport.h
rename to jdk/src/java.instrument/share/native/libinstrument/FileSystemSupport.h
diff --git a/jdk/src/share/instrument/InstrumentationImplNativeMethods.c b/jdk/src/java.instrument/share/native/libinstrument/InstrumentationImplNativeMethods.c
similarity index 100%
rename from jdk/src/share/instrument/InstrumentationImplNativeMethods.c
rename to jdk/src/java.instrument/share/native/libinstrument/InstrumentationImplNativeMethods.c
diff --git a/jdk/src/share/instrument/InvocationAdapter.c b/jdk/src/java.instrument/share/native/libinstrument/InvocationAdapter.c
similarity index 100%
rename from jdk/src/share/instrument/InvocationAdapter.c
rename to jdk/src/java.instrument/share/native/libinstrument/InvocationAdapter.c
diff --git a/jdk/src/share/instrument/JPLISAgent.c b/jdk/src/java.instrument/share/native/libinstrument/JPLISAgent.c
similarity index 100%
rename from jdk/src/share/instrument/JPLISAgent.c
rename to jdk/src/java.instrument/share/native/libinstrument/JPLISAgent.c
diff --git a/jdk/src/share/instrument/JPLISAgent.h b/jdk/src/java.instrument/share/native/libinstrument/JPLISAgent.h
similarity index 100%
rename from jdk/src/share/instrument/JPLISAgent.h
rename to jdk/src/java.instrument/share/native/libinstrument/JPLISAgent.h
diff --git a/jdk/src/share/instrument/JPLISAssert.c b/jdk/src/java.instrument/share/native/libinstrument/JPLISAssert.c
similarity index 100%
rename from jdk/src/share/instrument/JPLISAssert.c
rename to jdk/src/java.instrument/share/native/libinstrument/JPLISAssert.c
diff --git a/jdk/src/share/instrument/JPLISAssert.h b/jdk/src/java.instrument/share/native/libinstrument/JPLISAssert.h
similarity index 100%
rename from jdk/src/share/instrument/JPLISAssert.h
rename to jdk/src/java.instrument/share/native/libinstrument/JPLISAssert.h
diff --git a/jdk/src/share/instrument/JarFacade.c b/jdk/src/java.instrument/share/native/libinstrument/JarFacade.c
similarity index 100%
rename from jdk/src/share/instrument/JarFacade.c
rename to jdk/src/java.instrument/share/native/libinstrument/JarFacade.c
diff --git a/jdk/src/share/instrument/JarFacade.h b/jdk/src/java.instrument/share/native/libinstrument/JarFacade.h
similarity index 100%
rename from jdk/src/share/instrument/JarFacade.h
rename to jdk/src/java.instrument/share/native/libinstrument/JarFacade.h
diff --git a/jdk/src/share/instrument/JavaExceptions.c b/jdk/src/java.instrument/share/native/libinstrument/JavaExceptions.c
similarity index 100%
rename from jdk/src/share/instrument/JavaExceptions.c
rename to jdk/src/java.instrument/share/native/libinstrument/JavaExceptions.c
diff --git a/jdk/src/share/instrument/JavaExceptions.h b/jdk/src/java.instrument/share/native/libinstrument/JavaExceptions.h
similarity index 100%
rename from jdk/src/share/instrument/JavaExceptions.h
rename to jdk/src/java.instrument/share/native/libinstrument/JavaExceptions.h
diff --git a/jdk/src/share/instrument/PathCharsValidator.c b/jdk/src/java.instrument/share/native/libinstrument/PathCharsValidator.c
similarity index 100%
rename from jdk/src/share/instrument/PathCharsValidator.c
rename to jdk/src/java.instrument/share/native/libinstrument/PathCharsValidator.c
diff --git a/jdk/src/share/instrument/PathCharsValidator.h b/jdk/src/java.instrument/share/native/libinstrument/PathCharsValidator.h
similarity index 100%
rename from jdk/src/share/instrument/PathCharsValidator.h
rename to jdk/src/java.instrument/share/native/libinstrument/PathCharsValidator.h
diff --git a/jdk/src/share/instrument/Reentrancy.c b/jdk/src/java.instrument/share/native/libinstrument/Reentrancy.c
similarity index 100%
rename from jdk/src/share/instrument/Reentrancy.c
rename to jdk/src/java.instrument/share/native/libinstrument/Reentrancy.c
diff --git a/jdk/src/share/instrument/Reentrancy.h b/jdk/src/java.instrument/share/native/libinstrument/Reentrancy.h
similarity index 100%
rename from jdk/src/share/instrument/Reentrancy.h
rename to jdk/src/java.instrument/share/native/libinstrument/Reentrancy.h
diff --git a/jdk/src/share/instrument/Utilities.c b/jdk/src/java.instrument/share/native/libinstrument/Utilities.c
similarity index 100%
rename from jdk/src/share/instrument/Utilities.c
rename to jdk/src/java.instrument/share/native/libinstrument/Utilities.c
diff --git a/jdk/src/share/instrument/Utilities.h b/jdk/src/java.instrument/share/native/libinstrument/Utilities.h
similarity index 100%
rename from jdk/src/share/instrument/Utilities.h
rename to jdk/src/java.instrument/share/native/libinstrument/Utilities.h
diff --git a/jdk/src/solaris/instrument/EncodingSupport_md.c b/jdk/src/java.instrument/unix/native/libinstrument/EncodingSupport_md.c
similarity index 100%
rename from jdk/src/solaris/instrument/EncodingSupport_md.c
rename to jdk/src/java.instrument/unix/native/libinstrument/EncodingSupport_md.c
diff --git a/jdk/src/solaris/instrument/FileSystemSupport_md.c b/jdk/src/java.instrument/unix/native/libinstrument/FileSystemSupport_md.c
similarity index 100%
rename from jdk/src/solaris/instrument/FileSystemSupport_md.c
rename to jdk/src/java.instrument/unix/native/libinstrument/FileSystemSupport_md.c
diff --git a/jdk/src/solaris/instrument/FileSystemSupport_md.h b/jdk/src/java.instrument/unix/native/libinstrument/FileSystemSupport_md.h
similarity index 100%
rename from jdk/src/solaris/instrument/FileSystemSupport_md.h
rename to jdk/src/java.instrument/unix/native/libinstrument/FileSystemSupport_md.h
diff --git a/jdk/src/windows/instrument/EncodingSupport_md.c b/jdk/src/java.instrument/windows/native/libinstrument/EncodingSupport_md.c
similarity index 100%
rename from jdk/src/windows/instrument/EncodingSupport_md.c
rename to jdk/src/java.instrument/windows/native/libinstrument/EncodingSupport_md.c
diff --git a/jdk/src/windows/instrument/FileSystemSupport_md.c b/jdk/src/java.instrument/windows/native/libinstrument/FileSystemSupport_md.c
similarity index 100%
rename from jdk/src/windows/instrument/FileSystemSupport_md.c
rename to jdk/src/java.instrument/windows/native/libinstrument/FileSystemSupport_md.c
diff --git a/jdk/src/windows/instrument/FileSystemSupport_md.h b/jdk/src/java.instrument/windows/native/libinstrument/FileSystemSupport_md.h
similarity index 100%
rename from jdk/src/windows/instrument/FileSystemSupport_md.h
rename to jdk/src/java.instrument/windows/native/libinstrument/FileSystemSupport_md.h
diff --git a/jdk/src/share/classes/java/util/logging/ConsoleHandler.java b/jdk/src/java.logging/share/classes/java/util/logging/ConsoleHandler.java
similarity index 100%
rename from jdk/src/share/classes/java/util/logging/ConsoleHandler.java
rename to jdk/src/java.logging/share/classes/java/util/logging/ConsoleHandler.java
diff --git a/jdk/src/share/classes/java/util/logging/ErrorManager.java b/jdk/src/java.logging/share/classes/java/util/logging/ErrorManager.java
similarity index 100%
rename from jdk/src/share/classes/java/util/logging/ErrorManager.java
rename to jdk/src/java.logging/share/classes/java/util/logging/ErrorManager.java
diff --git a/jdk/src/share/classes/java/util/logging/FileHandler.java b/jdk/src/java.logging/share/classes/java/util/logging/FileHandler.java
similarity index 100%
rename from jdk/src/share/classes/java/util/logging/FileHandler.java
rename to jdk/src/java.logging/share/classes/java/util/logging/FileHandler.java
diff --git a/jdk/src/share/classes/java/util/logging/Filter.java b/jdk/src/java.logging/share/classes/java/util/logging/Filter.java
similarity index 100%
rename from jdk/src/share/classes/java/util/logging/Filter.java
rename to jdk/src/java.logging/share/classes/java/util/logging/Filter.java
diff --git a/jdk/src/share/classes/java/util/logging/Formatter.java b/jdk/src/java.logging/share/classes/java/util/logging/Formatter.java
similarity index 100%
rename from jdk/src/share/classes/java/util/logging/Formatter.java
rename to jdk/src/java.logging/share/classes/java/util/logging/Formatter.java
diff --git a/jdk/src/share/classes/java/util/logging/Handler.java b/jdk/src/java.logging/share/classes/java/util/logging/Handler.java
similarity index 100%
rename from jdk/src/share/classes/java/util/logging/Handler.java
rename to jdk/src/java.logging/share/classes/java/util/logging/Handler.java
diff --git a/jdk/src/share/classes/java/util/logging/Level.java b/jdk/src/java.logging/share/classes/java/util/logging/Level.java
similarity index 100%
rename from jdk/src/share/classes/java/util/logging/Level.java
rename to jdk/src/java.logging/share/classes/java/util/logging/Level.java
diff --git a/jdk/src/share/classes/java/util/logging/LogManager.java b/jdk/src/java.logging/share/classes/java/util/logging/LogManager.java
similarity index 100%
rename from jdk/src/share/classes/java/util/logging/LogManager.java
rename to jdk/src/java.logging/share/classes/java/util/logging/LogManager.java
diff --git a/jdk/src/share/classes/java/util/logging/LogRecord.java b/jdk/src/java.logging/share/classes/java/util/logging/LogRecord.java
similarity index 100%
rename from jdk/src/share/classes/java/util/logging/LogRecord.java
rename to jdk/src/java.logging/share/classes/java/util/logging/LogRecord.java
diff --git a/jdk/src/share/classes/java/util/logging/Logger.java b/jdk/src/java.logging/share/classes/java/util/logging/Logger.java
similarity index 100%
rename from jdk/src/share/classes/java/util/logging/Logger.java
rename to jdk/src/java.logging/share/classes/java/util/logging/Logger.java
diff --git a/jdk/src/share/classes/java/util/logging/Logging.java b/jdk/src/java.logging/share/classes/java/util/logging/Logging.java
similarity index 100%
rename from jdk/src/share/classes/java/util/logging/Logging.java
rename to jdk/src/java.logging/share/classes/java/util/logging/Logging.java
diff --git a/jdk/src/share/classes/java/util/logging/LoggingMXBean.java b/jdk/src/java.logging/share/classes/java/util/logging/LoggingMXBean.java
similarity index 100%
rename from jdk/src/share/classes/java/util/logging/LoggingMXBean.java
rename to jdk/src/java.logging/share/classes/java/util/logging/LoggingMXBean.java
diff --git a/jdk/src/share/classes/java/util/logging/LoggingPermission.java b/jdk/src/java.logging/share/classes/java/util/logging/LoggingPermission.java
similarity index 100%
rename from jdk/src/share/classes/java/util/logging/LoggingPermission.java
rename to jdk/src/java.logging/share/classes/java/util/logging/LoggingPermission.java
diff --git a/jdk/src/share/classes/java/util/logging/LoggingProxyImpl.java b/jdk/src/java.logging/share/classes/java/util/logging/LoggingProxyImpl.java
similarity index 100%
rename from jdk/src/share/classes/java/util/logging/LoggingProxyImpl.java
rename to jdk/src/java.logging/share/classes/java/util/logging/LoggingProxyImpl.java
diff --git a/jdk/src/share/classes/java/util/logging/MemoryHandler.java b/jdk/src/java.logging/share/classes/java/util/logging/MemoryHandler.java
similarity index 100%
rename from jdk/src/share/classes/java/util/logging/MemoryHandler.java
rename to jdk/src/java.logging/share/classes/java/util/logging/MemoryHandler.java
diff --git a/jdk/src/share/classes/java/util/logging/SimpleFormatter.java b/jdk/src/java.logging/share/classes/java/util/logging/SimpleFormatter.java
similarity index 100%
rename from jdk/src/share/classes/java/util/logging/SimpleFormatter.java
rename to jdk/src/java.logging/share/classes/java/util/logging/SimpleFormatter.java
diff --git a/jdk/src/share/classes/java/util/logging/SocketHandler.java b/jdk/src/java.logging/share/classes/java/util/logging/SocketHandler.java
similarity index 100%
rename from jdk/src/share/classes/java/util/logging/SocketHandler.java
rename to jdk/src/java.logging/share/classes/java/util/logging/SocketHandler.java
diff --git a/jdk/src/share/classes/java/util/logging/StreamHandler.java b/jdk/src/java.logging/share/classes/java/util/logging/StreamHandler.java
similarity index 100%
rename from jdk/src/share/classes/java/util/logging/StreamHandler.java
rename to jdk/src/java.logging/share/classes/java/util/logging/StreamHandler.java
diff --git a/jdk/src/share/classes/java/util/logging/XMLFormatter.java b/jdk/src/java.logging/share/classes/java/util/logging/XMLFormatter.java
similarity index 100%
rename from jdk/src/share/classes/java/util/logging/XMLFormatter.java
rename to jdk/src/java.logging/share/classes/java/util/logging/XMLFormatter.java
diff --git a/jdk/src/share/classes/java/util/logging/package.html b/jdk/src/java.logging/share/classes/java/util/logging/package.html
similarity index 100%
rename from jdk/src/share/classes/java/util/logging/package.html
rename to jdk/src/java.logging/share/classes/java/util/logging/package.html
diff --git a/jdk/src/share/classes/sun/net/www/protocol/http/logging/HttpLogFormatter.java b/jdk/src/java.logging/share/classes/sun/net/www/protocol/http/logging/HttpLogFormatter.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/protocol/http/logging/HttpLogFormatter.java
rename to jdk/src/java.logging/share/classes/sun/net/www/protocol/http/logging/HttpLogFormatter.java
diff --git a/jdk/src/share/classes/sun/util/logging/resources/logging.properties b/jdk/src/java.logging/share/classes/sun/util/logging/resources/logging.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/logging/resources/logging.properties
rename to jdk/src/java.logging/share/classes/sun/util/logging/resources/logging.properties
diff --git a/jdk/src/share/classes/sun/util/logging/resources/logging_de.properties b/jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_de.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/logging/resources/logging_de.properties
rename to jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_de.properties
diff --git a/jdk/src/share/classes/sun/util/logging/resources/logging_es.properties b/jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_es.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/logging/resources/logging_es.properties
rename to jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_es.properties
diff --git a/jdk/src/share/classes/sun/util/logging/resources/logging_fr.properties b/jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_fr.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/logging/resources/logging_fr.properties
rename to jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_fr.properties
diff --git a/jdk/src/share/classes/sun/util/logging/resources/logging_it.properties b/jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_it.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/logging/resources/logging_it.properties
rename to jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_it.properties
diff --git a/jdk/src/share/classes/sun/util/logging/resources/logging_ja.properties b/jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_ja.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/logging/resources/logging_ja.properties
rename to jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_ja.properties
diff --git a/jdk/src/share/classes/sun/util/logging/resources/logging_ko.properties b/jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_ko.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/logging/resources/logging_ko.properties
rename to jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_ko.properties
diff --git a/jdk/src/share/classes/sun/util/logging/resources/logging_pt_BR.properties b/jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_pt_BR.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/logging/resources/logging_pt_BR.properties
rename to jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_pt_BR.properties
diff --git a/jdk/src/share/classes/sun/util/logging/resources/logging_sv.properties b/jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_sv.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/logging/resources/logging_sv.properties
rename to jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_sv.properties
diff --git a/jdk/src/share/classes/sun/util/logging/resources/logging_zh_CN.properties b/jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_zh_CN.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/logging/resources/logging_zh_CN.properties
rename to jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_zh_CN.properties
diff --git a/jdk/src/share/classes/sun/util/logging/resources/logging_zh_TW.properties b/jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_zh_TW.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/logging/resources/logging_zh_TW.properties
rename to jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_zh_TW.properties
diff --git a/jdk/src/share/lib/logging.properties b/jdk/src/java.logging/share/conf/logging.properties
similarity index 100%
rename from jdk/src/share/lib/logging.properties
rename to jdk/src/java.logging/share/conf/logging.properties
diff --git a/jdk/src/share/classes/com/sun/jmx/defaults/JmxProperties.java b/jdk/src/java.management/share/classes/com/sun/jmx/defaults/JmxProperties.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/defaults/JmxProperties.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/defaults/JmxProperties.java
diff --git a/jdk/src/share/classes/com/sun/jmx/defaults/ServiceName.java b/jdk/src/java.management/share/classes/com/sun/jmx/defaults/ServiceName.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/defaults/ServiceName.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/defaults/ServiceName.java
diff --git a/jdk/src/share/classes/com/sun/jmx/defaults/package.html b/jdk/src/java.management/share/classes/com/sun/jmx/defaults/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/defaults/package.html
rename to jdk/src/java.management/share/classes/com/sun/jmx/defaults/package.html
diff --git a/jdk/src/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java b/jdk/src/java.management/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java
diff --git a/jdk/src/share/classes/com/sun/jmx/interceptor/MBeanServerInterceptor.java b/jdk/src/java.management/share/classes/com/sun/jmx/interceptor/MBeanServerInterceptor.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/interceptor/MBeanServerInterceptor.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/interceptor/MBeanServerInterceptor.java
diff --git a/jdk/src/share/classes/com/sun/jmx/interceptor/package.html b/jdk/src/java.management/share/classes/com/sun/jmx/interceptor/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/interceptor/package.html
rename to jdk/src/java.management/share/classes/com/sun/jmx/interceptor/package.html
diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/ClassLoaderRepositorySupport.java b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/ClassLoaderRepositorySupport.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/mbeanserver/ClassLoaderRepositorySupport.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/ClassLoaderRepositorySupport.java
diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/ConvertingMethod.java b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/ConvertingMethod.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/mbeanserver/ConvertingMethod.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/ConvertingMethod.java
diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java
diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/DescriptorCache.java b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/DescriptorCache.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/mbeanserver/DescriptorCache.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/DescriptorCache.java
diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/DynamicMBean2.java b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/DynamicMBean2.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/mbeanserver/DynamicMBean2.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/DynamicMBean2.java
diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/GetPropertyAction.java b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/GetPropertyAction.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/mbeanserver/GetPropertyAction.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/GetPropertyAction.java
diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/Introspector.java b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/Introspector.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/mbeanserver/Introspector.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/Introspector.java
diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java
diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServerBuilder.java b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServerBuilder.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServerBuilder.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServerBuilder.java
diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/MBeanAnalyzer.java b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanAnalyzer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/mbeanserver/MBeanAnalyzer.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanAnalyzer.java
diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/MBeanInstantiator.java b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanInstantiator.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/mbeanserver/MBeanInstantiator.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanInstantiator.java
diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/MBeanIntrospector.java b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanIntrospector.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/mbeanserver/MBeanIntrospector.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanIntrospector.java
diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/MBeanServerDelegateImpl.java b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanServerDelegateImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/mbeanserver/MBeanServerDelegateImpl.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanServerDelegateImpl.java
diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/MBeanSupport.java b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanSupport.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/mbeanserver/MBeanSupport.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanSupport.java
diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/MXBeanIntrospector.java b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanIntrospector.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/mbeanserver/MXBeanIntrospector.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanIntrospector.java
diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/MXBeanLookup.java b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanLookup.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/mbeanserver/MXBeanLookup.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanLookup.java
diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/MXBeanMapping.java b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanMapping.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/mbeanserver/MXBeanMapping.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanMapping.java
diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/MXBeanMappingFactory.java b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanMappingFactory.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/mbeanserver/MXBeanMappingFactory.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanMappingFactory.java
diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/MXBeanProxy.java b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanProxy.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/mbeanserver/MXBeanProxy.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanProxy.java
diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/MXBeanSupport.java b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanSupport.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/mbeanserver/MXBeanSupport.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanSupport.java
diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/ModifiableClassLoaderRepository.java b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/ModifiableClassLoaderRepository.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/mbeanserver/ModifiableClassLoaderRepository.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/ModifiableClassLoaderRepository.java
diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/NamedObject.java b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/NamedObject.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/mbeanserver/NamedObject.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/NamedObject.java
diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/ObjectInputStreamWithLoader.java b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/ObjectInputStreamWithLoader.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/mbeanserver/ObjectInputStreamWithLoader.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/ObjectInputStreamWithLoader.java
diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/PerInterface.java b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/PerInterface.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/mbeanserver/PerInterface.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/PerInterface.java
diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/Repository.java b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/Repository.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/mbeanserver/Repository.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/Repository.java
diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/SecureClassLoaderRepository.java b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/SecureClassLoaderRepository.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/mbeanserver/SecureClassLoaderRepository.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/SecureClassLoaderRepository.java
diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/StandardMBeanIntrospector.java b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/StandardMBeanIntrospector.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/mbeanserver/StandardMBeanIntrospector.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/StandardMBeanIntrospector.java
diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/StandardMBeanSupport.java b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/StandardMBeanSupport.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/mbeanserver/StandardMBeanSupport.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/StandardMBeanSupport.java
diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/SunJmxMBeanServer.java b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/SunJmxMBeanServer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/mbeanserver/SunJmxMBeanServer.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/SunJmxMBeanServer.java
diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/Util.java b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/Util.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/mbeanserver/Util.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/Util.java
diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/WeakIdentityHashMap.java b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/WeakIdentityHashMap.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/mbeanserver/WeakIdentityHashMap.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/WeakIdentityHashMap.java
diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/package.html b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/mbeanserver/package.html
rename to jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/package.html
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayQueue.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ArrayQueue.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayQueue.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ArrayQueue.java
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/internal/ClientCommunicatorAdmin.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ClientCommunicatorAdmin.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/remote/internal/ClientCommunicatorAdmin.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ClientCommunicatorAdmin.java
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/internal/ClientListenerInfo.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ClientListenerInfo.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/remote/internal/ClientListenerInfo.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ClientListenerInfo.java
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/internal/ClientNotifForwarder.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ClientNotifForwarder.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/remote/internal/ClientNotifForwarder.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ClientNotifForwarder.java
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/internal/IIOPHelper.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/IIOPHelper.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/remote/internal/IIOPHelper.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/IIOPHelper.java
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/internal/IIOPProxy.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/IIOPProxy.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/remote/internal/IIOPProxy.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/IIOPProxy.java
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/internal/NotificationBuffer.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/NotificationBuffer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/remote/internal/NotificationBuffer.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/NotificationBuffer.java
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/internal/NotificationBufferFilter.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/NotificationBufferFilter.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/remote/internal/NotificationBufferFilter.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/NotificationBufferFilter.java
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/internal/ProxyRef.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ProxyRef.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/remote/internal/ProxyRef.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ProxyRef.java
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/internal/RMIExporter.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/RMIExporter.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/remote/internal/RMIExporter.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/RMIExporter.java
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/internal/ServerCommunicatorAdmin.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ServerCommunicatorAdmin.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/remote/internal/ServerCommunicatorAdmin.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ServerCommunicatorAdmin.java
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/internal/Unmarshal.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/Unmarshal.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/remote/internal/Unmarshal.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/Unmarshal.java
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/internal/package.html b/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/remote/internal/package.html
rename to jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/package.html
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/protocol/iiop/ClientProvider.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/protocol/iiop/ClientProvider.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/remote/protocol/iiop/ClientProvider.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/remote/protocol/iiop/ClientProvider.java
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/protocol/iiop/IIOPProxyImpl.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/protocol/iiop/IIOPProxyImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/remote/protocol/iiop/IIOPProxyImpl.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/remote/protocol/iiop/IIOPProxyImpl.java
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/protocol/iiop/ProxyInputStream.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/protocol/iiop/ProxyInputStream.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/remote/protocol/iiop/ProxyInputStream.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/remote/protocol/iiop/ProxyInputStream.java
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/protocol/iiop/ServerProvider.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/protocol/iiop/ServerProvider.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/remote/protocol/iiop/ServerProvider.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/remote/protocol/iiop/ServerProvider.java
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/protocol/rmi/ClientProvider.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/protocol/rmi/ClientProvider.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/remote/protocol/rmi/ClientProvider.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/remote/protocol/rmi/ClientProvider.java
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/protocol/rmi/ServerProvider.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/protocol/rmi/ServerProvider.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/remote/protocol/rmi/ServerProvider.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/remote/protocol/rmi/ServerProvider.java
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/security/FileLoginModule.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/security/FileLoginModule.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/remote/security/FileLoginModule.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/remote/security/FileLoginModule.java
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/security/JMXPluggableAuthenticator.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/security/JMXPluggableAuthenticator.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/remote/security/JMXPluggableAuthenticator.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/remote/security/JMXPluggableAuthenticator.java
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/security/JMXSubjectDomainCombiner.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/security/JMXSubjectDomainCombiner.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/remote/security/JMXSubjectDomainCombiner.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/remote/security/JMXSubjectDomainCombiner.java
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/security/MBeanServerAccessController.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/security/MBeanServerAccessController.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/remote/security/MBeanServerAccessController.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/remote/security/MBeanServerAccessController.java
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/security/NotificationAccessController.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/security/NotificationAccessController.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/remote/security/NotificationAccessController.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/remote/security/NotificationAccessController.java
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/util/ClassLoaderWithRepository.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/util/ClassLoaderWithRepository.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/remote/util/ClassLoaderWithRepository.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/remote/util/ClassLoaderWithRepository.java
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/util/ClassLogger.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/util/ClassLogger.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/remote/util/ClassLogger.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/remote/util/ClassLogger.java
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/util/EnvHelp.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/util/EnvHelp.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/remote/util/EnvHelp.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/remote/util/EnvHelp.java
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/util/OrderClassLoaders.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/util/OrderClassLoaders.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/remote/util/OrderClassLoaders.java
rename to jdk/src/java.management/share/classes/com/sun/jmx/remote/util/OrderClassLoaders.java
diff --git a/jdk/src/share/classes/com/sun/management/DiagnosticCommandMBean.java b/jdk/src/java.management/share/classes/com/sun/management/DiagnosticCommandMBean.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/management/DiagnosticCommandMBean.java
rename to jdk/src/java.management/share/classes/com/sun/management/DiagnosticCommandMBean.java
diff --git a/jdk/src/share/classes/com/sun/management/GarbageCollectionNotificationInfo.java b/jdk/src/java.management/share/classes/com/sun/management/GarbageCollectionNotificationInfo.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/management/GarbageCollectionNotificationInfo.java
rename to jdk/src/java.management/share/classes/com/sun/management/GarbageCollectionNotificationInfo.java
diff --git a/jdk/src/share/classes/com/sun/management/GarbageCollectorMXBean.java b/jdk/src/java.management/share/classes/com/sun/management/GarbageCollectorMXBean.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/management/GarbageCollectorMXBean.java
rename to jdk/src/java.management/share/classes/com/sun/management/GarbageCollectorMXBean.java
diff --git a/jdk/src/share/classes/com/sun/management/GcInfo.java b/jdk/src/java.management/share/classes/com/sun/management/GcInfo.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/management/GcInfo.java
rename to jdk/src/java.management/share/classes/com/sun/management/GcInfo.java
diff --git a/jdk/src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java b/jdk/src/java.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java
rename to jdk/src/java.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java
diff --git a/jdk/src/share/classes/com/sun/management/OperatingSystemMXBean.java b/jdk/src/java.management/share/classes/com/sun/management/OperatingSystemMXBean.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/management/OperatingSystemMXBean.java
rename to jdk/src/java.management/share/classes/com/sun/management/OperatingSystemMXBean.java
diff --git a/jdk/src/share/classes/com/sun/management/ThreadMXBean.java b/jdk/src/java.management/share/classes/com/sun/management/ThreadMXBean.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/management/ThreadMXBean.java
rename to jdk/src/java.management/share/classes/com/sun/management/ThreadMXBean.java
diff --git a/jdk/src/share/classes/com/sun/management/UnixOperatingSystemMXBean.java b/jdk/src/java.management/share/classes/com/sun/management/UnixOperatingSystemMXBean.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/management/UnixOperatingSystemMXBean.java
rename to jdk/src/java.management/share/classes/com/sun/management/UnixOperatingSystemMXBean.java
diff --git a/jdk/src/share/classes/com/sun/management/VMOption.java b/jdk/src/java.management/share/classes/com/sun/management/VMOption.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/management/VMOption.java
rename to jdk/src/java.management/share/classes/com/sun/management/VMOption.java
diff --git a/jdk/src/share/classes/com/sun/management/package-info.java b/jdk/src/java.management/share/classes/com/sun/management/package-info.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/management/package-info.java
rename to jdk/src/java.management/share/classes/com/sun/management/package-info.java
diff --git a/jdk/src/share/classes/java/lang/management/BufferPoolMXBean.java b/jdk/src/java.management/share/classes/java/lang/management/BufferPoolMXBean.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/management/BufferPoolMXBean.java
rename to jdk/src/java.management/share/classes/java/lang/management/BufferPoolMXBean.java
diff --git a/jdk/src/share/classes/java/lang/management/ClassLoadingMXBean.java b/jdk/src/java.management/share/classes/java/lang/management/ClassLoadingMXBean.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/management/ClassLoadingMXBean.java
rename to jdk/src/java.management/share/classes/java/lang/management/ClassLoadingMXBean.java
diff --git a/jdk/src/share/classes/java/lang/management/CompilationMXBean.java b/jdk/src/java.management/share/classes/java/lang/management/CompilationMXBean.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/management/CompilationMXBean.java
rename to jdk/src/java.management/share/classes/java/lang/management/CompilationMXBean.java
diff --git a/jdk/src/share/classes/java/lang/management/GarbageCollectorMXBean.java b/jdk/src/java.management/share/classes/java/lang/management/GarbageCollectorMXBean.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/management/GarbageCollectorMXBean.java
rename to jdk/src/java.management/share/classes/java/lang/management/GarbageCollectorMXBean.java
diff --git a/jdk/src/share/classes/java/lang/management/LockInfo.java b/jdk/src/java.management/share/classes/java/lang/management/LockInfo.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/management/LockInfo.java
rename to jdk/src/java.management/share/classes/java/lang/management/LockInfo.java
diff --git a/jdk/src/share/classes/java/lang/management/ManagementFactory.java b/jdk/src/java.management/share/classes/java/lang/management/ManagementFactory.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/management/ManagementFactory.java
rename to jdk/src/java.management/share/classes/java/lang/management/ManagementFactory.java
diff --git a/jdk/src/share/classes/java/lang/management/ManagementPermission.java b/jdk/src/java.management/share/classes/java/lang/management/ManagementPermission.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/management/ManagementPermission.java
rename to jdk/src/java.management/share/classes/java/lang/management/ManagementPermission.java
diff --git a/jdk/src/share/classes/java/lang/management/MemoryMXBean.java b/jdk/src/java.management/share/classes/java/lang/management/MemoryMXBean.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/management/MemoryMXBean.java
rename to jdk/src/java.management/share/classes/java/lang/management/MemoryMXBean.java
diff --git a/jdk/src/share/classes/java/lang/management/MemoryManagerMXBean.java b/jdk/src/java.management/share/classes/java/lang/management/MemoryManagerMXBean.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/management/MemoryManagerMXBean.java
rename to jdk/src/java.management/share/classes/java/lang/management/MemoryManagerMXBean.java
diff --git a/jdk/src/share/classes/java/lang/management/MemoryNotificationInfo.java b/jdk/src/java.management/share/classes/java/lang/management/MemoryNotificationInfo.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/management/MemoryNotificationInfo.java
rename to jdk/src/java.management/share/classes/java/lang/management/MemoryNotificationInfo.java
diff --git a/jdk/src/share/classes/java/lang/management/MemoryPoolMXBean.java b/jdk/src/java.management/share/classes/java/lang/management/MemoryPoolMXBean.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/management/MemoryPoolMXBean.java
rename to jdk/src/java.management/share/classes/java/lang/management/MemoryPoolMXBean.java
diff --git a/jdk/src/share/classes/java/lang/management/MemoryType.java b/jdk/src/java.management/share/classes/java/lang/management/MemoryType.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/management/MemoryType.java
rename to jdk/src/java.management/share/classes/java/lang/management/MemoryType.java
diff --git a/jdk/src/share/classes/java/lang/management/MemoryUsage.java b/jdk/src/java.management/share/classes/java/lang/management/MemoryUsage.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/management/MemoryUsage.java
rename to jdk/src/java.management/share/classes/java/lang/management/MemoryUsage.java
diff --git a/jdk/src/share/classes/java/lang/management/MonitorInfo.java b/jdk/src/java.management/share/classes/java/lang/management/MonitorInfo.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/management/MonitorInfo.java
rename to jdk/src/java.management/share/classes/java/lang/management/MonitorInfo.java
diff --git a/jdk/src/share/classes/java/lang/management/OperatingSystemMXBean.java b/jdk/src/java.management/share/classes/java/lang/management/OperatingSystemMXBean.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/management/OperatingSystemMXBean.java
rename to jdk/src/java.management/share/classes/java/lang/management/OperatingSystemMXBean.java
diff --git a/jdk/src/share/classes/java/lang/management/PlatformComponent.java b/jdk/src/java.management/share/classes/java/lang/management/PlatformComponent.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/management/PlatformComponent.java
rename to jdk/src/java.management/share/classes/java/lang/management/PlatformComponent.java
diff --git a/jdk/src/share/classes/java/lang/management/PlatformLoggingMXBean.java b/jdk/src/java.management/share/classes/java/lang/management/PlatformLoggingMXBean.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/management/PlatformLoggingMXBean.java
rename to jdk/src/java.management/share/classes/java/lang/management/PlatformLoggingMXBean.java
diff --git a/jdk/src/share/classes/java/lang/management/PlatformManagedObject.java b/jdk/src/java.management/share/classes/java/lang/management/PlatformManagedObject.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/management/PlatformManagedObject.java
rename to jdk/src/java.management/share/classes/java/lang/management/PlatformManagedObject.java
diff --git a/jdk/src/share/classes/java/lang/management/RuntimeMXBean.java b/jdk/src/java.management/share/classes/java/lang/management/RuntimeMXBean.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/management/RuntimeMXBean.java
rename to jdk/src/java.management/share/classes/java/lang/management/RuntimeMXBean.java
diff --git a/jdk/src/share/classes/java/lang/management/ThreadInfo.java b/jdk/src/java.management/share/classes/java/lang/management/ThreadInfo.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/management/ThreadInfo.java
rename to jdk/src/java.management/share/classes/java/lang/management/ThreadInfo.java
diff --git a/jdk/src/share/classes/java/lang/management/ThreadMXBean.java b/jdk/src/java.management/share/classes/java/lang/management/ThreadMXBean.java
similarity index 100%
rename from jdk/src/share/classes/java/lang/management/ThreadMXBean.java
rename to jdk/src/java.management/share/classes/java/lang/management/ThreadMXBean.java
diff --git a/jdk/src/share/classes/java/lang/management/package.html b/jdk/src/java.management/share/classes/java/lang/management/package.html
similarity index 100%
rename from jdk/src/share/classes/java/lang/management/package.html
rename to jdk/src/java.management/share/classes/java/lang/management/package.html
diff --git a/jdk/src/share/classes/javax/management/AndQueryExp.java b/jdk/src/java.management/share/classes/javax/management/AndQueryExp.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/AndQueryExp.java
rename to jdk/src/java.management/share/classes/javax/management/AndQueryExp.java
diff --git a/jdk/src/share/classes/javax/management/Attribute.java b/jdk/src/java.management/share/classes/javax/management/Attribute.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/Attribute.java
rename to jdk/src/java.management/share/classes/javax/management/Attribute.java
diff --git a/jdk/src/share/classes/javax/management/AttributeChangeNotification.java b/jdk/src/java.management/share/classes/javax/management/AttributeChangeNotification.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/AttributeChangeNotification.java
rename to jdk/src/java.management/share/classes/javax/management/AttributeChangeNotification.java
diff --git a/jdk/src/share/classes/javax/management/AttributeChangeNotificationFilter.java b/jdk/src/java.management/share/classes/javax/management/AttributeChangeNotificationFilter.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/AttributeChangeNotificationFilter.java
rename to jdk/src/java.management/share/classes/javax/management/AttributeChangeNotificationFilter.java
diff --git a/jdk/src/share/classes/javax/management/AttributeList.java b/jdk/src/java.management/share/classes/javax/management/AttributeList.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/AttributeList.java
rename to jdk/src/java.management/share/classes/javax/management/AttributeList.java
diff --git a/jdk/src/share/classes/javax/management/AttributeNotFoundException.java b/jdk/src/java.management/share/classes/javax/management/AttributeNotFoundException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/AttributeNotFoundException.java
rename to jdk/src/java.management/share/classes/javax/management/AttributeNotFoundException.java
diff --git a/jdk/src/share/classes/javax/management/AttributeValueExp.java b/jdk/src/java.management/share/classes/javax/management/AttributeValueExp.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/AttributeValueExp.java
rename to jdk/src/java.management/share/classes/javax/management/AttributeValueExp.java
diff --git a/jdk/src/share/classes/javax/management/BadAttributeValueExpException.java b/jdk/src/java.management/share/classes/javax/management/BadAttributeValueExpException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/BadAttributeValueExpException.java
rename to jdk/src/java.management/share/classes/javax/management/BadAttributeValueExpException.java
diff --git a/jdk/src/share/classes/javax/management/BadBinaryOpValueExpException.java b/jdk/src/java.management/share/classes/javax/management/BadBinaryOpValueExpException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/BadBinaryOpValueExpException.java
rename to jdk/src/java.management/share/classes/javax/management/BadBinaryOpValueExpException.java
diff --git a/jdk/src/share/classes/javax/management/BadStringOperationException.java b/jdk/src/java.management/share/classes/javax/management/BadStringOperationException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/BadStringOperationException.java
rename to jdk/src/java.management/share/classes/javax/management/BadStringOperationException.java
diff --git a/jdk/src/share/classes/javax/management/BetweenQueryExp.java b/jdk/src/java.management/share/classes/javax/management/BetweenQueryExp.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/BetweenQueryExp.java
rename to jdk/src/java.management/share/classes/javax/management/BetweenQueryExp.java
diff --git a/jdk/src/share/classes/javax/management/BinaryOpValueExp.java b/jdk/src/java.management/share/classes/javax/management/BinaryOpValueExp.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/BinaryOpValueExp.java
rename to jdk/src/java.management/share/classes/javax/management/BinaryOpValueExp.java
diff --git a/jdk/src/share/classes/javax/management/BinaryRelQueryExp.java b/jdk/src/java.management/share/classes/javax/management/BinaryRelQueryExp.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/BinaryRelQueryExp.java
rename to jdk/src/java.management/share/classes/javax/management/BinaryRelQueryExp.java
diff --git a/jdk/src/share/classes/javax/management/BooleanValueExp.java b/jdk/src/java.management/share/classes/javax/management/BooleanValueExp.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/BooleanValueExp.java
rename to jdk/src/java.management/share/classes/javax/management/BooleanValueExp.java
diff --git a/jdk/src/share/classes/javax/management/ClassAttributeValueExp.java b/jdk/src/java.management/share/classes/javax/management/ClassAttributeValueExp.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/ClassAttributeValueExp.java
rename to jdk/src/java.management/share/classes/javax/management/ClassAttributeValueExp.java
diff --git a/jdk/src/share/classes/javax/management/DefaultLoaderRepository.java b/jdk/src/java.management/share/classes/javax/management/DefaultLoaderRepository.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/DefaultLoaderRepository.java
rename to jdk/src/java.management/share/classes/javax/management/DefaultLoaderRepository.java
diff --git a/jdk/src/share/classes/javax/management/Descriptor.java b/jdk/src/java.management/share/classes/javax/management/Descriptor.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/Descriptor.java
rename to jdk/src/java.management/share/classes/javax/management/Descriptor.java
diff --git a/jdk/src/share/classes/javax/management/DescriptorAccess.java b/jdk/src/java.management/share/classes/javax/management/DescriptorAccess.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/DescriptorAccess.java
rename to jdk/src/java.management/share/classes/javax/management/DescriptorAccess.java
diff --git a/jdk/src/share/classes/javax/management/DescriptorKey.java b/jdk/src/java.management/share/classes/javax/management/DescriptorKey.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/DescriptorKey.java
rename to jdk/src/java.management/share/classes/javax/management/DescriptorKey.java
diff --git a/jdk/src/share/classes/javax/management/DescriptorRead.java b/jdk/src/java.management/share/classes/javax/management/DescriptorRead.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/DescriptorRead.java
rename to jdk/src/java.management/share/classes/javax/management/DescriptorRead.java
diff --git a/jdk/src/share/classes/javax/management/DynamicMBean.java b/jdk/src/java.management/share/classes/javax/management/DynamicMBean.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/DynamicMBean.java
rename to jdk/src/java.management/share/classes/javax/management/DynamicMBean.java
diff --git a/jdk/src/share/classes/javax/management/ImmutableDescriptor.java b/jdk/src/java.management/share/classes/javax/management/ImmutableDescriptor.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/ImmutableDescriptor.java
rename to jdk/src/java.management/share/classes/javax/management/ImmutableDescriptor.java
diff --git a/jdk/src/share/classes/javax/management/InQueryExp.java b/jdk/src/java.management/share/classes/javax/management/InQueryExp.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/InQueryExp.java
rename to jdk/src/java.management/share/classes/javax/management/InQueryExp.java
diff --git a/jdk/src/share/classes/javax/management/InstanceAlreadyExistsException.java b/jdk/src/java.management/share/classes/javax/management/InstanceAlreadyExistsException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/InstanceAlreadyExistsException.java
rename to jdk/src/java.management/share/classes/javax/management/InstanceAlreadyExistsException.java
diff --git a/jdk/src/share/classes/javax/management/InstanceNotFoundException.java b/jdk/src/java.management/share/classes/javax/management/InstanceNotFoundException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/InstanceNotFoundException.java
rename to jdk/src/java.management/share/classes/javax/management/InstanceNotFoundException.java
diff --git a/jdk/src/share/classes/javax/management/InstanceOfQueryExp.java b/jdk/src/java.management/share/classes/javax/management/InstanceOfQueryExp.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/InstanceOfQueryExp.java
rename to jdk/src/java.management/share/classes/javax/management/InstanceOfQueryExp.java
diff --git a/jdk/src/share/classes/javax/management/IntrospectionException.java b/jdk/src/java.management/share/classes/javax/management/IntrospectionException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/IntrospectionException.java
rename to jdk/src/java.management/share/classes/javax/management/IntrospectionException.java
diff --git a/jdk/src/share/classes/javax/management/InvalidApplicationException.java b/jdk/src/java.management/share/classes/javax/management/InvalidApplicationException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/InvalidApplicationException.java
rename to jdk/src/java.management/share/classes/javax/management/InvalidApplicationException.java
diff --git a/jdk/src/share/classes/javax/management/InvalidAttributeValueException.java b/jdk/src/java.management/share/classes/javax/management/InvalidAttributeValueException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/InvalidAttributeValueException.java
rename to jdk/src/java.management/share/classes/javax/management/InvalidAttributeValueException.java
diff --git a/jdk/src/share/classes/javax/management/JMException.java b/jdk/src/java.management/share/classes/javax/management/JMException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/JMException.java
rename to jdk/src/java.management/share/classes/javax/management/JMException.java
diff --git a/jdk/src/share/classes/javax/management/JMRuntimeException.java b/jdk/src/java.management/share/classes/javax/management/JMRuntimeException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/JMRuntimeException.java
rename to jdk/src/java.management/share/classes/javax/management/JMRuntimeException.java
diff --git a/jdk/src/share/classes/javax/management/JMX.java b/jdk/src/java.management/share/classes/javax/management/JMX.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/JMX.java
rename to jdk/src/java.management/share/classes/javax/management/JMX.java
diff --git a/jdk/src/share/classes/javax/management/ListenerNotFoundException.java b/jdk/src/java.management/share/classes/javax/management/ListenerNotFoundException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/ListenerNotFoundException.java
rename to jdk/src/java.management/share/classes/javax/management/ListenerNotFoundException.java
diff --git a/jdk/src/share/classes/javax/management/MBeanAttributeInfo.java b/jdk/src/java.management/share/classes/javax/management/MBeanAttributeInfo.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/MBeanAttributeInfo.java
rename to jdk/src/java.management/share/classes/javax/management/MBeanAttributeInfo.java
diff --git a/jdk/src/share/classes/javax/management/MBeanConstructorInfo.java b/jdk/src/java.management/share/classes/javax/management/MBeanConstructorInfo.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/MBeanConstructorInfo.java
rename to jdk/src/java.management/share/classes/javax/management/MBeanConstructorInfo.java
diff --git a/jdk/src/share/classes/javax/management/MBeanException.java b/jdk/src/java.management/share/classes/javax/management/MBeanException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/MBeanException.java
rename to jdk/src/java.management/share/classes/javax/management/MBeanException.java
diff --git a/jdk/src/share/classes/javax/management/MBeanFeatureInfo.java b/jdk/src/java.management/share/classes/javax/management/MBeanFeatureInfo.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/MBeanFeatureInfo.java
rename to jdk/src/java.management/share/classes/javax/management/MBeanFeatureInfo.java
diff --git a/jdk/src/share/classes/javax/management/MBeanInfo.java b/jdk/src/java.management/share/classes/javax/management/MBeanInfo.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/MBeanInfo.java
rename to jdk/src/java.management/share/classes/javax/management/MBeanInfo.java
diff --git a/jdk/src/share/classes/javax/management/MBeanNotificationInfo.java b/jdk/src/java.management/share/classes/javax/management/MBeanNotificationInfo.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/MBeanNotificationInfo.java
rename to jdk/src/java.management/share/classes/javax/management/MBeanNotificationInfo.java
diff --git a/jdk/src/share/classes/javax/management/MBeanOperationInfo.java b/jdk/src/java.management/share/classes/javax/management/MBeanOperationInfo.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/MBeanOperationInfo.java
rename to jdk/src/java.management/share/classes/javax/management/MBeanOperationInfo.java
diff --git a/jdk/src/share/classes/javax/management/MBeanParameterInfo.java b/jdk/src/java.management/share/classes/javax/management/MBeanParameterInfo.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/MBeanParameterInfo.java
rename to jdk/src/java.management/share/classes/javax/management/MBeanParameterInfo.java
diff --git a/jdk/src/share/classes/javax/management/MBeanPermission.java b/jdk/src/java.management/share/classes/javax/management/MBeanPermission.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/MBeanPermission.java
rename to jdk/src/java.management/share/classes/javax/management/MBeanPermission.java
diff --git a/jdk/src/share/classes/javax/management/MBeanRegistration.java b/jdk/src/java.management/share/classes/javax/management/MBeanRegistration.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/MBeanRegistration.java
rename to jdk/src/java.management/share/classes/javax/management/MBeanRegistration.java
diff --git a/jdk/src/share/classes/javax/management/MBeanRegistrationException.java b/jdk/src/java.management/share/classes/javax/management/MBeanRegistrationException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/MBeanRegistrationException.java
rename to jdk/src/java.management/share/classes/javax/management/MBeanRegistrationException.java
diff --git a/jdk/src/share/classes/javax/management/MBeanServer.java b/jdk/src/java.management/share/classes/javax/management/MBeanServer.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/MBeanServer.java
rename to jdk/src/java.management/share/classes/javax/management/MBeanServer.java
diff --git a/jdk/src/share/classes/javax/management/MBeanServerBuilder.java b/jdk/src/java.management/share/classes/javax/management/MBeanServerBuilder.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/MBeanServerBuilder.java
rename to jdk/src/java.management/share/classes/javax/management/MBeanServerBuilder.java
diff --git a/jdk/src/share/classes/javax/management/MBeanServerConnection.java b/jdk/src/java.management/share/classes/javax/management/MBeanServerConnection.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/MBeanServerConnection.java
rename to jdk/src/java.management/share/classes/javax/management/MBeanServerConnection.java
diff --git a/jdk/src/share/classes/javax/management/MBeanServerDelegate.java b/jdk/src/java.management/share/classes/javax/management/MBeanServerDelegate.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/MBeanServerDelegate.java
rename to jdk/src/java.management/share/classes/javax/management/MBeanServerDelegate.java
diff --git a/jdk/src/share/classes/javax/management/MBeanServerDelegateMBean.java b/jdk/src/java.management/share/classes/javax/management/MBeanServerDelegateMBean.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/MBeanServerDelegateMBean.java
rename to jdk/src/java.management/share/classes/javax/management/MBeanServerDelegateMBean.java
diff --git a/jdk/src/share/classes/javax/management/MBeanServerFactory.java b/jdk/src/java.management/share/classes/javax/management/MBeanServerFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/MBeanServerFactory.java
rename to jdk/src/java.management/share/classes/javax/management/MBeanServerFactory.java
diff --git a/jdk/src/share/classes/javax/management/MBeanServerInvocationHandler.java b/jdk/src/java.management/share/classes/javax/management/MBeanServerInvocationHandler.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/MBeanServerInvocationHandler.java
rename to jdk/src/java.management/share/classes/javax/management/MBeanServerInvocationHandler.java
diff --git a/jdk/src/share/classes/javax/management/MBeanServerNotification.java b/jdk/src/java.management/share/classes/javax/management/MBeanServerNotification.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/MBeanServerNotification.java
rename to jdk/src/java.management/share/classes/javax/management/MBeanServerNotification.java
diff --git a/jdk/src/share/classes/javax/management/MBeanServerPermission.java b/jdk/src/java.management/share/classes/javax/management/MBeanServerPermission.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/MBeanServerPermission.java
rename to jdk/src/java.management/share/classes/javax/management/MBeanServerPermission.java
diff --git a/jdk/src/share/classes/javax/management/MBeanTrustPermission.java b/jdk/src/java.management/share/classes/javax/management/MBeanTrustPermission.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/MBeanTrustPermission.java
rename to jdk/src/java.management/share/classes/javax/management/MBeanTrustPermission.java
diff --git a/jdk/src/share/classes/javax/management/MXBean.java b/jdk/src/java.management/share/classes/javax/management/MXBean.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/MXBean.java
rename to jdk/src/java.management/share/classes/javax/management/MXBean.java
diff --git a/jdk/src/share/classes/javax/management/MalformedObjectNameException.java b/jdk/src/java.management/share/classes/javax/management/MalformedObjectNameException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/MalformedObjectNameException.java
rename to jdk/src/java.management/share/classes/javax/management/MalformedObjectNameException.java
diff --git a/jdk/src/share/classes/javax/management/MatchQueryExp.java b/jdk/src/java.management/share/classes/javax/management/MatchQueryExp.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/MatchQueryExp.java
rename to jdk/src/java.management/share/classes/javax/management/MatchQueryExp.java
diff --git a/jdk/src/share/classes/javax/management/NotCompliantMBeanException.java b/jdk/src/java.management/share/classes/javax/management/NotCompliantMBeanException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/NotCompliantMBeanException.java
rename to jdk/src/java.management/share/classes/javax/management/NotCompliantMBeanException.java
diff --git a/jdk/src/share/classes/javax/management/NotQueryExp.java b/jdk/src/java.management/share/classes/javax/management/NotQueryExp.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/NotQueryExp.java
rename to jdk/src/java.management/share/classes/javax/management/NotQueryExp.java
diff --git a/jdk/src/share/classes/javax/management/Notification.java b/jdk/src/java.management/share/classes/javax/management/Notification.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/Notification.java
rename to jdk/src/java.management/share/classes/javax/management/Notification.java
diff --git a/jdk/src/share/classes/javax/management/NotificationBroadcaster.java b/jdk/src/java.management/share/classes/javax/management/NotificationBroadcaster.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/NotificationBroadcaster.java
rename to jdk/src/java.management/share/classes/javax/management/NotificationBroadcaster.java
diff --git a/jdk/src/share/classes/javax/management/NotificationBroadcasterSupport.java b/jdk/src/java.management/share/classes/javax/management/NotificationBroadcasterSupport.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/NotificationBroadcasterSupport.java
rename to jdk/src/java.management/share/classes/javax/management/NotificationBroadcasterSupport.java
diff --git a/jdk/src/share/classes/javax/management/NotificationEmitter.java b/jdk/src/java.management/share/classes/javax/management/NotificationEmitter.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/NotificationEmitter.java
rename to jdk/src/java.management/share/classes/javax/management/NotificationEmitter.java
diff --git a/jdk/src/share/classes/javax/management/NotificationFilter.java b/jdk/src/java.management/share/classes/javax/management/NotificationFilter.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/NotificationFilter.java
rename to jdk/src/java.management/share/classes/javax/management/NotificationFilter.java
diff --git a/jdk/src/share/classes/javax/management/NotificationFilterSupport.java b/jdk/src/java.management/share/classes/javax/management/NotificationFilterSupport.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/NotificationFilterSupport.java
rename to jdk/src/java.management/share/classes/javax/management/NotificationFilterSupport.java
diff --git a/jdk/src/share/classes/javax/management/NotificationListener.java b/jdk/src/java.management/share/classes/javax/management/NotificationListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/NotificationListener.java
rename to jdk/src/java.management/share/classes/javax/management/NotificationListener.java
diff --git a/jdk/src/share/classes/javax/management/NumericValueExp.java b/jdk/src/java.management/share/classes/javax/management/NumericValueExp.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/NumericValueExp.java
rename to jdk/src/java.management/share/classes/javax/management/NumericValueExp.java
diff --git a/jdk/src/share/classes/javax/management/ObjectInstance.java b/jdk/src/java.management/share/classes/javax/management/ObjectInstance.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/ObjectInstance.java
rename to jdk/src/java.management/share/classes/javax/management/ObjectInstance.java
diff --git a/jdk/src/share/classes/javax/management/ObjectName.java b/jdk/src/java.management/share/classes/javax/management/ObjectName.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/ObjectName.java
rename to jdk/src/java.management/share/classes/javax/management/ObjectName.java
diff --git a/jdk/src/share/classes/javax/management/OperationsException.java b/jdk/src/java.management/share/classes/javax/management/OperationsException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/OperationsException.java
rename to jdk/src/java.management/share/classes/javax/management/OperationsException.java
diff --git a/jdk/src/share/classes/javax/management/OrQueryExp.java b/jdk/src/java.management/share/classes/javax/management/OrQueryExp.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/OrQueryExp.java
rename to jdk/src/java.management/share/classes/javax/management/OrQueryExp.java
diff --git a/jdk/src/share/classes/javax/management/PersistentMBean.java b/jdk/src/java.management/share/classes/javax/management/PersistentMBean.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/PersistentMBean.java
rename to jdk/src/java.management/share/classes/javax/management/PersistentMBean.java
diff --git a/jdk/src/share/classes/javax/management/QualifiedAttributeValueExp.java b/jdk/src/java.management/share/classes/javax/management/QualifiedAttributeValueExp.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/QualifiedAttributeValueExp.java
rename to jdk/src/java.management/share/classes/javax/management/QualifiedAttributeValueExp.java
diff --git a/jdk/src/share/classes/javax/management/Query.java b/jdk/src/java.management/share/classes/javax/management/Query.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/Query.java
rename to jdk/src/java.management/share/classes/javax/management/Query.java
diff --git a/jdk/src/share/classes/javax/management/QueryEval.java b/jdk/src/java.management/share/classes/javax/management/QueryEval.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/QueryEval.java
rename to jdk/src/java.management/share/classes/javax/management/QueryEval.java
diff --git a/jdk/src/share/classes/javax/management/QueryExp.java b/jdk/src/java.management/share/classes/javax/management/QueryExp.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/QueryExp.java
rename to jdk/src/java.management/share/classes/javax/management/QueryExp.java
diff --git a/jdk/src/share/classes/javax/management/ReflectionException.java b/jdk/src/java.management/share/classes/javax/management/ReflectionException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/ReflectionException.java
rename to jdk/src/java.management/share/classes/javax/management/ReflectionException.java
diff --git a/jdk/src/share/classes/javax/management/RuntimeErrorException.java b/jdk/src/java.management/share/classes/javax/management/RuntimeErrorException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/RuntimeErrorException.java
rename to jdk/src/java.management/share/classes/javax/management/RuntimeErrorException.java
diff --git a/jdk/src/share/classes/javax/management/RuntimeMBeanException.java b/jdk/src/java.management/share/classes/javax/management/RuntimeMBeanException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/RuntimeMBeanException.java
rename to jdk/src/java.management/share/classes/javax/management/RuntimeMBeanException.java
diff --git a/jdk/src/share/classes/javax/management/RuntimeOperationsException.java b/jdk/src/java.management/share/classes/javax/management/RuntimeOperationsException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/RuntimeOperationsException.java
rename to jdk/src/java.management/share/classes/javax/management/RuntimeOperationsException.java
diff --git a/jdk/src/share/classes/javax/management/ServiceNotFoundException.java b/jdk/src/java.management/share/classes/javax/management/ServiceNotFoundException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/ServiceNotFoundException.java
rename to jdk/src/java.management/share/classes/javax/management/ServiceNotFoundException.java
diff --git a/jdk/src/share/classes/javax/management/StandardEmitterMBean.java b/jdk/src/java.management/share/classes/javax/management/StandardEmitterMBean.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/StandardEmitterMBean.java
rename to jdk/src/java.management/share/classes/javax/management/StandardEmitterMBean.java
diff --git a/jdk/src/share/classes/javax/management/StandardMBean.java b/jdk/src/java.management/share/classes/javax/management/StandardMBean.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/StandardMBean.java
rename to jdk/src/java.management/share/classes/javax/management/StandardMBean.java
diff --git a/jdk/src/share/classes/javax/management/StringValueExp.java b/jdk/src/java.management/share/classes/javax/management/StringValueExp.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/StringValueExp.java
rename to jdk/src/java.management/share/classes/javax/management/StringValueExp.java
diff --git a/jdk/src/share/classes/javax/management/ValueExp.java b/jdk/src/java.management/share/classes/javax/management/ValueExp.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/ValueExp.java
rename to jdk/src/java.management/share/classes/javax/management/ValueExp.java
diff --git a/jdk/src/share/classes/javax/management/loading/ClassLoaderRepository.java b/jdk/src/java.management/share/classes/javax/management/loading/ClassLoaderRepository.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/loading/ClassLoaderRepository.java
rename to jdk/src/java.management/share/classes/javax/management/loading/ClassLoaderRepository.java
diff --git a/jdk/src/share/classes/javax/management/loading/DefaultLoaderRepository.java b/jdk/src/java.management/share/classes/javax/management/loading/DefaultLoaderRepository.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/loading/DefaultLoaderRepository.java
rename to jdk/src/java.management/share/classes/javax/management/loading/DefaultLoaderRepository.java
diff --git a/jdk/src/share/classes/javax/management/loading/MLet.java b/jdk/src/java.management/share/classes/javax/management/loading/MLet.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/loading/MLet.java
rename to jdk/src/java.management/share/classes/javax/management/loading/MLet.java
diff --git a/jdk/src/share/classes/javax/management/loading/MLetContent.java b/jdk/src/java.management/share/classes/javax/management/loading/MLetContent.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/loading/MLetContent.java
rename to jdk/src/java.management/share/classes/javax/management/loading/MLetContent.java
diff --git a/jdk/src/share/classes/javax/management/loading/MLetMBean.java b/jdk/src/java.management/share/classes/javax/management/loading/MLetMBean.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/loading/MLetMBean.java
rename to jdk/src/java.management/share/classes/javax/management/loading/MLetMBean.java
diff --git a/jdk/src/share/classes/javax/management/loading/MLetObjectInputStream.java b/jdk/src/java.management/share/classes/javax/management/loading/MLetObjectInputStream.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/loading/MLetObjectInputStream.java
rename to jdk/src/java.management/share/classes/javax/management/loading/MLetObjectInputStream.java
diff --git a/jdk/src/share/classes/javax/management/loading/MLetParser.java b/jdk/src/java.management/share/classes/javax/management/loading/MLetParser.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/loading/MLetParser.java
rename to jdk/src/java.management/share/classes/javax/management/loading/MLetParser.java
diff --git a/jdk/src/share/classes/javax/management/loading/PrivateClassLoader.java b/jdk/src/java.management/share/classes/javax/management/loading/PrivateClassLoader.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/loading/PrivateClassLoader.java
rename to jdk/src/java.management/share/classes/javax/management/loading/PrivateClassLoader.java
diff --git a/jdk/src/share/classes/javax/management/loading/PrivateMLet.java b/jdk/src/java.management/share/classes/javax/management/loading/PrivateMLet.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/loading/PrivateMLet.java
rename to jdk/src/java.management/share/classes/javax/management/loading/PrivateMLet.java
diff --git a/jdk/src/share/classes/javax/management/loading/package.html b/jdk/src/java.management/share/classes/javax/management/loading/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/management/loading/package.html
rename to jdk/src/java.management/share/classes/javax/management/loading/package.html
diff --git a/jdk/src/share/classes/javax/management/modelmbean/DescriptorSupport.java b/jdk/src/java.management/share/classes/javax/management/modelmbean/DescriptorSupport.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/modelmbean/DescriptorSupport.java
rename to jdk/src/java.management/share/classes/javax/management/modelmbean/DescriptorSupport.java
diff --git a/jdk/src/share/classes/javax/management/modelmbean/InvalidTargetObjectTypeException.java b/jdk/src/java.management/share/classes/javax/management/modelmbean/InvalidTargetObjectTypeException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/modelmbean/InvalidTargetObjectTypeException.java
rename to jdk/src/java.management/share/classes/javax/management/modelmbean/InvalidTargetObjectTypeException.java
diff --git a/jdk/src/share/classes/javax/management/modelmbean/ModelMBean.java b/jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBean.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/modelmbean/ModelMBean.java
rename to jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBean.java
diff --git a/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanAttributeInfo.java b/jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanAttributeInfo.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/modelmbean/ModelMBeanAttributeInfo.java
rename to jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanAttributeInfo.java
diff --git a/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanConstructorInfo.java b/jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanConstructorInfo.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/modelmbean/ModelMBeanConstructorInfo.java
rename to jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanConstructorInfo.java
diff --git a/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanInfo.java b/jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanInfo.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/modelmbean/ModelMBeanInfo.java
rename to jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanInfo.java
diff --git a/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanInfoSupport.java b/jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanInfoSupport.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/modelmbean/ModelMBeanInfoSupport.java
rename to jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanInfoSupport.java
diff --git a/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanNotificationBroadcaster.java b/jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanNotificationBroadcaster.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/modelmbean/ModelMBeanNotificationBroadcaster.java
rename to jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanNotificationBroadcaster.java
diff --git a/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanNotificationInfo.java b/jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanNotificationInfo.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/modelmbean/ModelMBeanNotificationInfo.java
rename to jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanNotificationInfo.java
diff --git a/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanOperationInfo.java b/jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanOperationInfo.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/modelmbean/ModelMBeanOperationInfo.java
rename to jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanOperationInfo.java
diff --git a/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java b/jdk/src/java.management/share/classes/javax/management/modelmbean/RequiredModelMBean.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java
rename to jdk/src/java.management/share/classes/javax/management/modelmbean/RequiredModelMBean.java
diff --git a/jdk/src/share/classes/javax/management/modelmbean/XMLParseException.java b/jdk/src/java.management/share/classes/javax/management/modelmbean/XMLParseException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/modelmbean/XMLParseException.java
rename to jdk/src/java.management/share/classes/javax/management/modelmbean/XMLParseException.java
diff --git a/jdk/src/share/classes/javax/management/modelmbean/package.html b/jdk/src/java.management/share/classes/javax/management/modelmbean/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/management/modelmbean/package.html
rename to jdk/src/java.management/share/classes/javax/management/modelmbean/package.html
diff --git a/jdk/src/share/classes/javax/management/monitor/CounterMonitor.java b/jdk/src/java.management/share/classes/javax/management/monitor/CounterMonitor.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/monitor/CounterMonitor.java
rename to jdk/src/java.management/share/classes/javax/management/monitor/CounterMonitor.java
diff --git a/jdk/src/share/classes/javax/management/monitor/CounterMonitorMBean.java b/jdk/src/java.management/share/classes/javax/management/monitor/CounterMonitorMBean.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/monitor/CounterMonitorMBean.java
rename to jdk/src/java.management/share/classes/javax/management/monitor/CounterMonitorMBean.java
diff --git a/jdk/src/share/classes/javax/management/monitor/GaugeMonitor.java b/jdk/src/java.management/share/classes/javax/management/monitor/GaugeMonitor.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/monitor/GaugeMonitor.java
rename to jdk/src/java.management/share/classes/javax/management/monitor/GaugeMonitor.java
diff --git a/jdk/src/share/classes/javax/management/monitor/GaugeMonitorMBean.java b/jdk/src/java.management/share/classes/javax/management/monitor/GaugeMonitorMBean.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/monitor/GaugeMonitorMBean.java
rename to jdk/src/java.management/share/classes/javax/management/monitor/GaugeMonitorMBean.java
diff --git a/jdk/src/share/classes/javax/management/monitor/Monitor.java b/jdk/src/java.management/share/classes/javax/management/monitor/Monitor.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/monitor/Monitor.java
rename to jdk/src/java.management/share/classes/javax/management/monitor/Monitor.java
diff --git a/jdk/src/share/classes/javax/management/monitor/MonitorMBean.java b/jdk/src/java.management/share/classes/javax/management/monitor/MonitorMBean.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/monitor/MonitorMBean.java
rename to jdk/src/java.management/share/classes/javax/management/monitor/MonitorMBean.java
diff --git a/jdk/src/share/classes/javax/management/monitor/MonitorNotification.java b/jdk/src/java.management/share/classes/javax/management/monitor/MonitorNotification.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/monitor/MonitorNotification.java
rename to jdk/src/java.management/share/classes/javax/management/monitor/MonitorNotification.java
diff --git a/jdk/src/share/classes/javax/management/monitor/MonitorSettingException.java b/jdk/src/java.management/share/classes/javax/management/monitor/MonitorSettingException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/monitor/MonitorSettingException.java
rename to jdk/src/java.management/share/classes/javax/management/monitor/MonitorSettingException.java
diff --git a/jdk/src/share/classes/javax/management/monitor/StringMonitor.java b/jdk/src/java.management/share/classes/javax/management/monitor/StringMonitor.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/monitor/StringMonitor.java
rename to jdk/src/java.management/share/classes/javax/management/monitor/StringMonitor.java
diff --git a/jdk/src/share/classes/javax/management/monitor/StringMonitorMBean.java b/jdk/src/java.management/share/classes/javax/management/monitor/StringMonitorMBean.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/monitor/StringMonitorMBean.java
rename to jdk/src/java.management/share/classes/javax/management/monitor/StringMonitorMBean.java
diff --git a/jdk/src/share/classes/javax/management/monitor/package.html b/jdk/src/java.management/share/classes/javax/management/monitor/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/management/monitor/package.html
rename to jdk/src/java.management/share/classes/javax/management/monitor/package.html
diff --git a/jdk/src/share/classes/javax/management/openmbean/ArrayType.java b/jdk/src/java.management/share/classes/javax/management/openmbean/ArrayType.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/openmbean/ArrayType.java
rename to jdk/src/java.management/share/classes/javax/management/openmbean/ArrayType.java
diff --git a/jdk/src/share/classes/javax/management/openmbean/CompositeData.java b/jdk/src/java.management/share/classes/javax/management/openmbean/CompositeData.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/openmbean/CompositeData.java
rename to jdk/src/java.management/share/classes/javax/management/openmbean/CompositeData.java
diff --git a/jdk/src/share/classes/javax/management/openmbean/CompositeDataInvocationHandler.java b/jdk/src/java.management/share/classes/javax/management/openmbean/CompositeDataInvocationHandler.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/openmbean/CompositeDataInvocationHandler.java
rename to jdk/src/java.management/share/classes/javax/management/openmbean/CompositeDataInvocationHandler.java
diff --git a/jdk/src/share/classes/javax/management/openmbean/CompositeDataSupport.java b/jdk/src/java.management/share/classes/javax/management/openmbean/CompositeDataSupport.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/openmbean/CompositeDataSupport.java
rename to jdk/src/java.management/share/classes/javax/management/openmbean/CompositeDataSupport.java
diff --git a/jdk/src/share/classes/javax/management/openmbean/CompositeDataView.java b/jdk/src/java.management/share/classes/javax/management/openmbean/CompositeDataView.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/openmbean/CompositeDataView.java
rename to jdk/src/java.management/share/classes/javax/management/openmbean/CompositeDataView.java
diff --git a/jdk/src/share/classes/javax/management/openmbean/CompositeType.java b/jdk/src/java.management/share/classes/javax/management/openmbean/CompositeType.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/openmbean/CompositeType.java
rename to jdk/src/java.management/share/classes/javax/management/openmbean/CompositeType.java
diff --git a/jdk/src/share/classes/javax/management/openmbean/InvalidKeyException.java b/jdk/src/java.management/share/classes/javax/management/openmbean/InvalidKeyException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/openmbean/InvalidKeyException.java
rename to jdk/src/java.management/share/classes/javax/management/openmbean/InvalidKeyException.java
diff --git a/jdk/src/share/classes/javax/management/openmbean/InvalidOpenTypeException.java b/jdk/src/java.management/share/classes/javax/management/openmbean/InvalidOpenTypeException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/openmbean/InvalidOpenTypeException.java
rename to jdk/src/java.management/share/classes/javax/management/openmbean/InvalidOpenTypeException.java
diff --git a/jdk/src/share/classes/javax/management/openmbean/KeyAlreadyExistsException.java b/jdk/src/java.management/share/classes/javax/management/openmbean/KeyAlreadyExistsException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/openmbean/KeyAlreadyExistsException.java
rename to jdk/src/java.management/share/classes/javax/management/openmbean/KeyAlreadyExistsException.java
diff --git a/jdk/src/share/classes/javax/management/openmbean/OpenDataException.java b/jdk/src/java.management/share/classes/javax/management/openmbean/OpenDataException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/openmbean/OpenDataException.java
rename to jdk/src/java.management/share/classes/javax/management/openmbean/OpenDataException.java
diff --git a/jdk/src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfo.java b/jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanAttributeInfo.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfo.java
rename to jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanAttributeInfo.java
diff --git a/jdk/src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java b/jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java
rename to jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java
diff --git a/jdk/src/share/classes/javax/management/openmbean/OpenMBeanConstructorInfo.java b/jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanConstructorInfo.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/openmbean/OpenMBeanConstructorInfo.java
rename to jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanConstructorInfo.java
diff --git a/jdk/src/share/classes/javax/management/openmbean/OpenMBeanConstructorInfoSupport.java b/jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanConstructorInfoSupport.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/openmbean/OpenMBeanConstructorInfoSupport.java
rename to jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanConstructorInfoSupport.java
diff --git a/jdk/src/share/classes/javax/management/openmbean/OpenMBeanInfo.java b/jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanInfo.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/openmbean/OpenMBeanInfo.java
rename to jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanInfo.java
diff --git a/jdk/src/share/classes/javax/management/openmbean/OpenMBeanInfoSupport.java b/jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanInfoSupport.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/openmbean/OpenMBeanInfoSupport.java
rename to jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanInfoSupport.java
diff --git a/jdk/src/share/classes/javax/management/openmbean/OpenMBeanOperationInfo.java b/jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanOperationInfo.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/openmbean/OpenMBeanOperationInfo.java
rename to jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanOperationInfo.java
diff --git a/jdk/src/share/classes/javax/management/openmbean/OpenMBeanOperationInfoSupport.java b/jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanOperationInfoSupport.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/openmbean/OpenMBeanOperationInfoSupport.java
rename to jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanOperationInfoSupport.java
diff --git a/jdk/src/share/classes/javax/management/openmbean/OpenMBeanParameterInfo.java b/jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanParameterInfo.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/openmbean/OpenMBeanParameterInfo.java
rename to jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanParameterInfo.java
diff --git a/jdk/src/share/classes/javax/management/openmbean/OpenMBeanParameterInfoSupport.java b/jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanParameterInfoSupport.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/openmbean/OpenMBeanParameterInfoSupport.java
rename to jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanParameterInfoSupport.java
diff --git a/jdk/src/share/classes/javax/management/openmbean/OpenType.java b/jdk/src/java.management/share/classes/javax/management/openmbean/OpenType.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/openmbean/OpenType.java
rename to jdk/src/java.management/share/classes/javax/management/openmbean/OpenType.java
diff --git a/jdk/src/share/classes/javax/management/openmbean/SimpleType.java b/jdk/src/java.management/share/classes/javax/management/openmbean/SimpleType.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/openmbean/SimpleType.java
rename to jdk/src/java.management/share/classes/javax/management/openmbean/SimpleType.java
diff --git a/jdk/src/share/classes/javax/management/openmbean/TabularData.java b/jdk/src/java.management/share/classes/javax/management/openmbean/TabularData.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/openmbean/TabularData.java
rename to jdk/src/java.management/share/classes/javax/management/openmbean/TabularData.java
diff --git a/jdk/src/share/classes/javax/management/openmbean/TabularDataSupport.java b/jdk/src/java.management/share/classes/javax/management/openmbean/TabularDataSupport.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/openmbean/TabularDataSupport.java
rename to jdk/src/java.management/share/classes/javax/management/openmbean/TabularDataSupport.java
diff --git a/jdk/src/share/classes/javax/management/openmbean/TabularType.java b/jdk/src/java.management/share/classes/javax/management/openmbean/TabularType.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/openmbean/TabularType.java
rename to jdk/src/java.management/share/classes/javax/management/openmbean/TabularType.java
diff --git a/jdk/src/share/classes/javax/management/openmbean/package.html b/jdk/src/java.management/share/classes/javax/management/openmbean/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/management/openmbean/package.html
rename to jdk/src/java.management/share/classes/javax/management/openmbean/package.html
diff --git a/jdk/src/share/classes/javax/management/package.html b/jdk/src/java.management/share/classes/javax/management/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/management/package.html
rename to jdk/src/java.management/share/classes/javax/management/package.html
diff --git a/jdk/src/share/classes/javax/management/relation/InvalidRelationIdException.java b/jdk/src/java.management/share/classes/javax/management/relation/InvalidRelationIdException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/relation/InvalidRelationIdException.java
rename to jdk/src/java.management/share/classes/javax/management/relation/InvalidRelationIdException.java
diff --git a/jdk/src/share/classes/javax/management/relation/InvalidRelationServiceException.java b/jdk/src/java.management/share/classes/javax/management/relation/InvalidRelationServiceException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/relation/InvalidRelationServiceException.java
rename to jdk/src/java.management/share/classes/javax/management/relation/InvalidRelationServiceException.java
diff --git a/jdk/src/share/classes/javax/management/relation/InvalidRelationTypeException.java b/jdk/src/java.management/share/classes/javax/management/relation/InvalidRelationTypeException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/relation/InvalidRelationTypeException.java
rename to jdk/src/java.management/share/classes/javax/management/relation/InvalidRelationTypeException.java
diff --git a/jdk/src/share/classes/javax/management/relation/InvalidRoleInfoException.java b/jdk/src/java.management/share/classes/javax/management/relation/InvalidRoleInfoException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/relation/InvalidRoleInfoException.java
rename to jdk/src/java.management/share/classes/javax/management/relation/InvalidRoleInfoException.java
diff --git a/jdk/src/share/classes/javax/management/relation/InvalidRoleValueException.java b/jdk/src/java.management/share/classes/javax/management/relation/InvalidRoleValueException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/relation/InvalidRoleValueException.java
rename to jdk/src/java.management/share/classes/javax/management/relation/InvalidRoleValueException.java
diff --git a/jdk/src/share/classes/javax/management/relation/MBeanServerNotificationFilter.java b/jdk/src/java.management/share/classes/javax/management/relation/MBeanServerNotificationFilter.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/relation/MBeanServerNotificationFilter.java
rename to jdk/src/java.management/share/classes/javax/management/relation/MBeanServerNotificationFilter.java
diff --git a/jdk/src/share/classes/javax/management/relation/Relation.java b/jdk/src/java.management/share/classes/javax/management/relation/Relation.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/relation/Relation.java
rename to jdk/src/java.management/share/classes/javax/management/relation/Relation.java
diff --git a/jdk/src/share/classes/javax/management/relation/RelationException.java b/jdk/src/java.management/share/classes/javax/management/relation/RelationException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/relation/RelationException.java
rename to jdk/src/java.management/share/classes/javax/management/relation/RelationException.java
diff --git a/jdk/src/share/classes/javax/management/relation/RelationNotFoundException.java b/jdk/src/java.management/share/classes/javax/management/relation/RelationNotFoundException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/relation/RelationNotFoundException.java
rename to jdk/src/java.management/share/classes/javax/management/relation/RelationNotFoundException.java
diff --git a/jdk/src/share/classes/javax/management/relation/RelationNotification.java b/jdk/src/java.management/share/classes/javax/management/relation/RelationNotification.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/relation/RelationNotification.java
rename to jdk/src/java.management/share/classes/javax/management/relation/RelationNotification.java
diff --git a/jdk/src/share/classes/javax/management/relation/RelationService.java b/jdk/src/java.management/share/classes/javax/management/relation/RelationService.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/relation/RelationService.java
rename to jdk/src/java.management/share/classes/javax/management/relation/RelationService.java
diff --git a/jdk/src/share/classes/javax/management/relation/RelationServiceMBean.java b/jdk/src/java.management/share/classes/javax/management/relation/RelationServiceMBean.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/relation/RelationServiceMBean.java
rename to jdk/src/java.management/share/classes/javax/management/relation/RelationServiceMBean.java
diff --git a/jdk/src/share/classes/javax/management/relation/RelationServiceNotRegisteredException.java b/jdk/src/java.management/share/classes/javax/management/relation/RelationServiceNotRegisteredException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/relation/RelationServiceNotRegisteredException.java
rename to jdk/src/java.management/share/classes/javax/management/relation/RelationServiceNotRegisteredException.java
diff --git a/jdk/src/share/classes/javax/management/relation/RelationSupport.java b/jdk/src/java.management/share/classes/javax/management/relation/RelationSupport.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/relation/RelationSupport.java
rename to jdk/src/java.management/share/classes/javax/management/relation/RelationSupport.java
diff --git a/jdk/src/share/classes/javax/management/relation/RelationSupportMBean.java b/jdk/src/java.management/share/classes/javax/management/relation/RelationSupportMBean.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/relation/RelationSupportMBean.java
rename to jdk/src/java.management/share/classes/javax/management/relation/RelationSupportMBean.java
diff --git a/jdk/src/share/classes/javax/management/relation/RelationType.java b/jdk/src/java.management/share/classes/javax/management/relation/RelationType.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/relation/RelationType.java
rename to jdk/src/java.management/share/classes/javax/management/relation/RelationType.java
diff --git a/jdk/src/share/classes/javax/management/relation/RelationTypeNotFoundException.java b/jdk/src/java.management/share/classes/javax/management/relation/RelationTypeNotFoundException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/relation/RelationTypeNotFoundException.java
rename to jdk/src/java.management/share/classes/javax/management/relation/RelationTypeNotFoundException.java
diff --git a/jdk/src/share/classes/javax/management/relation/RelationTypeSupport.java b/jdk/src/java.management/share/classes/javax/management/relation/RelationTypeSupport.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/relation/RelationTypeSupport.java
rename to jdk/src/java.management/share/classes/javax/management/relation/RelationTypeSupport.java
diff --git a/jdk/src/share/classes/javax/management/relation/Role.java b/jdk/src/java.management/share/classes/javax/management/relation/Role.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/relation/Role.java
rename to jdk/src/java.management/share/classes/javax/management/relation/Role.java
diff --git a/jdk/src/share/classes/javax/management/relation/RoleInfo.java b/jdk/src/java.management/share/classes/javax/management/relation/RoleInfo.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/relation/RoleInfo.java
rename to jdk/src/java.management/share/classes/javax/management/relation/RoleInfo.java
diff --git a/jdk/src/share/classes/javax/management/relation/RoleInfoNotFoundException.java b/jdk/src/java.management/share/classes/javax/management/relation/RoleInfoNotFoundException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/relation/RoleInfoNotFoundException.java
rename to jdk/src/java.management/share/classes/javax/management/relation/RoleInfoNotFoundException.java
diff --git a/jdk/src/share/classes/javax/management/relation/RoleList.java b/jdk/src/java.management/share/classes/javax/management/relation/RoleList.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/relation/RoleList.java
rename to jdk/src/java.management/share/classes/javax/management/relation/RoleList.java
diff --git a/jdk/src/share/classes/javax/management/relation/RoleNotFoundException.java b/jdk/src/java.management/share/classes/javax/management/relation/RoleNotFoundException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/relation/RoleNotFoundException.java
rename to jdk/src/java.management/share/classes/javax/management/relation/RoleNotFoundException.java
diff --git a/jdk/src/share/classes/javax/management/relation/RoleResult.java b/jdk/src/java.management/share/classes/javax/management/relation/RoleResult.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/relation/RoleResult.java
rename to jdk/src/java.management/share/classes/javax/management/relation/RoleResult.java
diff --git a/jdk/src/share/classes/javax/management/relation/RoleStatus.java b/jdk/src/java.management/share/classes/javax/management/relation/RoleStatus.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/relation/RoleStatus.java
rename to jdk/src/java.management/share/classes/javax/management/relation/RoleStatus.java
diff --git a/jdk/src/share/classes/javax/management/relation/RoleUnresolved.java b/jdk/src/java.management/share/classes/javax/management/relation/RoleUnresolved.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/relation/RoleUnresolved.java
rename to jdk/src/java.management/share/classes/javax/management/relation/RoleUnresolved.java
diff --git a/jdk/src/share/classes/javax/management/relation/RoleUnresolvedList.java b/jdk/src/java.management/share/classes/javax/management/relation/RoleUnresolvedList.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/relation/RoleUnresolvedList.java
rename to jdk/src/java.management/share/classes/javax/management/relation/RoleUnresolvedList.java
diff --git a/jdk/src/share/classes/javax/management/relation/package.html b/jdk/src/java.management/share/classes/javax/management/relation/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/management/relation/package.html
rename to jdk/src/java.management/share/classes/javax/management/relation/package.html
diff --git a/jdk/src/share/classes/javax/management/remote/JMXAddressable.java b/jdk/src/java.management/share/classes/javax/management/remote/JMXAddressable.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/remote/JMXAddressable.java
rename to jdk/src/java.management/share/classes/javax/management/remote/JMXAddressable.java
diff --git a/jdk/src/share/classes/javax/management/remote/JMXAuthenticator.java b/jdk/src/java.management/share/classes/javax/management/remote/JMXAuthenticator.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/remote/JMXAuthenticator.java
rename to jdk/src/java.management/share/classes/javax/management/remote/JMXAuthenticator.java
diff --git a/jdk/src/share/classes/javax/management/remote/JMXConnectionNotification.java b/jdk/src/java.management/share/classes/javax/management/remote/JMXConnectionNotification.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/remote/JMXConnectionNotification.java
rename to jdk/src/java.management/share/classes/javax/management/remote/JMXConnectionNotification.java
diff --git a/jdk/src/share/classes/javax/management/remote/JMXConnector.java b/jdk/src/java.management/share/classes/javax/management/remote/JMXConnector.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/remote/JMXConnector.java
rename to jdk/src/java.management/share/classes/javax/management/remote/JMXConnector.java
diff --git a/jdk/src/share/classes/javax/management/remote/JMXConnectorFactory.java b/jdk/src/java.management/share/classes/javax/management/remote/JMXConnectorFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/remote/JMXConnectorFactory.java
rename to jdk/src/java.management/share/classes/javax/management/remote/JMXConnectorFactory.java
diff --git a/jdk/src/share/classes/javax/management/remote/JMXConnectorProvider.java b/jdk/src/java.management/share/classes/javax/management/remote/JMXConnectorProvider.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/remote/JMXConnectorProvider.java
rename to jdk/src/java.management/share/classes/javax/management/remote/JMXConnectorProvider.java
diff --git a/jdk/src/share/classes/javax/management/remote/JMXConnectorServer.java b/jdk/src/java.management/share/classes/javax/management/remote/JMXConnectorServer.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/remote/JMXConnectorServer.java
rename to jdk/src/java.management/share/classes/javax/management/remote/JMXConnectorServer.java
diff --git a/jdk/src/share/classes/javax/management/remote/JMXConnectorServerFactory.java b/jdk/src/java.management/share/classes/javax/management/remote/JMXConnectorServerFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/remote/JMXConnectorServerFactory.java
rename to jdk/src/java.management/share/classes/javax/management/remote/JMXConnectorServerFactory.java
diff --git a/jdk/src/share/classes/javax/management/remote/JMXConnectorServerMBean.java b/jdk/src/java.management/share/classes/javax/management/remote/JMXConnectorServerMBean.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/remote/JMXConnectorServerMBean.java
rename to jdk/src/java.management/share/classes/javax/management/remote/JMXConnectorServerMBean.java
diff --git a/jdk/src/share/classes/javax/management/remote/JMXConnectorServerProvider.java b/jdk/src/java.management/share/classes/javax/management/remote/JMXConnectorServerProvider.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/remote/JMXConnectorServerProvider.java
rename to jdk/src/java.management/share/classes/javax/management/remote/JMXConnectorServerProvider.java
diff --git a/jdk/src/share/classes/javax/management/remote/JMXPrincipal.java b/jdk/src/java.management/share/classes/javax/management/remote/JMXPrincipal.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/remote/JMXPrincipal.java
rename to jdk/src/java.management/share/classes/javax/management/remote/JMXPrincipal.java
diff --git a/jdk/src/share/classes/javax/management/remote/JMXProviderException.java b/jdk/src/java.management/share/classes/javax/management/remote/JMXProviderException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/remote/JMXProviderException.java
rename to jdk/src/java.management/share/classes/javax/management/remote/JMXProviderException.java
diff --git a/jdk/src/share/classes/javax/management/remote/JMXServerErrorException.java b/jdk/src/java.management/share/classes/javax/management/remote/JMXServerErrorException.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/remote/JMXServerErrorException.java
rename to jdk/src/java.management/share/classes/javax/management/remote/JMXServerErrorException.java
diff --git a/jdk/src/share/classes/javax/management/remote/JMXServiceURL.java b/jdk/src/java.management/share/classes/javax/management/remote/JMXServiceURL.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/remote/JMXServiceURL.java
rename to jdk/src/java.management/share/classes/javax/management/remote/JMXServiceURL.java
diff --git a/jdk/src/share/classes/javax/management/remote/MBeanServerForwarder.java b/jdk/src/java.management/share/classes/javax/management/remote/MBeanServerForwarder.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/remote/MBeanServerForwarder.java
rename to jdk/src/java.management/share/classes/javax/management/remote/MBeanServerForwarder.java
diff --git a/jdk/src/share/classes/javax/management/remote/NotificationResult.java b/jdk/src/java.management/share/classes/javax/management/remote/NotificationResult.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/remote/NotificationResult.java
rename to jdk/src/java.management/share/classes/javax/management/remote/NotificationResult.java
diff --git a/jdk/src/share/classes/javax/management/remote/SubjectDelegationPermission.java b/jdk/src/java.management/share/classes/javax/management/remote/SubjectDelegationPermission.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/remote/SubjectDelegationPermission.java
rename to jdk/src/java.management/share/classes/javax/management/remote/SubjectDelegationPermission.java
diff --git a/jdk/src/share/classes/javax/management/remote/TargetedNotification.java b/jdk/src/java.management/share/classes/javax/management/remote/TargetedNotification.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/remote/TargetedNotification.java
rename to jdk/src/java.management/share/classes/javax/management/remote/TargetedNotification.java
diff --git a/jdk/src/share/classes/javax/management/remote/package.html b/jdk/src/java.management/share/classes/javax/management/remote/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/management/remote/package.html
rename to jdk/src/java.management/share/classes/javax/management/remote/package.html
diff --git a/jdk/src/share/classes/javax/management/remote/rmi/NoCallStackClassLoader.java b/jdk/src/java.management/share/classes/javax/management/remote/rmi/NoCallStackClassLoader.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/remote/rmi/NoCallStackClassLoader.java
rename to jdk/src/java.management/share/classes/javax/management/remote/rmi/NoCallStackClassLoader.java
diff --git a/jdk/src/share/classes/javax/management/remote/rmi/RMIConnection.java b/jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIConnection.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/remote/rmi/RMIConnection.java
rename to jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIConnection.java
diff --git a/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java b/jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java
rename to jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java
diff --git a/jdk/src/share/classes/javax/management/remote/rmi/RMIConnector.java b/jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIConnector.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/remote/rmi/RMIConnector.java
rename to jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIConnector.java
diff --git a/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectorServer.java b/jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIConnectorServer.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/remote/rmi/RMIConnectorServer.java
rename to jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIConnectorServer.java
diff --git a/jdk/src/share/classes/javax/management/remote/rmi/RMIIIOPServerImpl.java b/jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIIIOPServerImpl.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/remote/rmi/RMIIIOPServerImpl.java
rename to jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIIIOPServerImpl.java
diff --git a/jdk/src/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java b/jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java
rename to jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java
diff --git a/jdk/src/share/classes/javax/management/remote/rmi/RMIServer.java b/jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIServer.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/remote/rmi/RMIServer.java
rename to jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIServer.java
diff --git a/jdk/src/share/classes/javax/management/remote/rmi/RMIServerImpl.java b/jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIServerImpl.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/remote/rmi/RMIServerImpl.java
rename to jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIServerImpl.java
diff --git a/jdk/src/share/classes/javax/management/remote/rmi/package.html b/jdk/src/java.management/share/classes/javax/management/remote/rmi/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/management/remote/rmi/package.html
rename to jdk/src/java.management/share/classes/javax/management/remote/rmi/package.html
diff --git a/jdk/src/share/classes/javax/management/timer/Timer.java b/jdk/src/java.management/share/classes/javax/management/timer/Timer.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/timer/Timer.java
rename to jdk/src/java.management/share/classes/javax/management/timer/Timer.java
diff --git a/jdk/src/share/classes/javax/management/timer/TimerAlarmClock.java b/jdk/src/java.management/share/classes/javax/management/timer/TimerAlarmClock.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/timer/TimerAlarmClock.java
rename to jdk/src/java.management/share/classes/javax/management/timer/TimerAlarmClock.java
diff --git a/jdk/src/share/classes/javax/management/timer/TimerAlarmClockNotification.java b/jdk/src/java.management/share/classes/javax/management/timer/TimerAlarmClockNotification.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/timer/TimerAlarmClockNotification.java
rename to jdk/src/java.management/share/classes/javax/management/timer/TimerAlarmClockNotification.java
diff --git a/jdk/src/share/classes/javax/management/timer/TimerMBean.java b/jdk/src/java.management/share/classes/javax/management/timer/TimerMBean.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/timer/TimerMBean.java
rename to jdk/src/java.management/share/classes/javax/management/timer/TimerMBean.java
diff --git a/jdk/src/share/classes/javax/management/timer/TimerNotification.java b/jdk/src/java.management/share/classes/javax/management/timer/TimerNotification.java
similarity index 100%
rename from jdk/src/share/classes/javax/management/timer/TimerNotification.java
rename to jdk/src/java.management/share/classes/javax/management/timer/TimerNotification.java
diff --git a/jdk/src/share/classes/javax/management/timer/package.html b/jdk/src/java.management/share/classes/javax/management/timer/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/management/timer/package.html
rename to jdk/src/java.management/share/classes/javax/management/timer/package.html
diff --git a/jdk/src/share/classes/com/sun/management/mgmt-overview.html b/jdk/src/java.management/share/classes/mgmt-overview.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/management/mgmt-overview.html
rename to jdk/src/java.management/share/classes/mgmt-overview.html
diff --git a/jdk/src/share/classes/sun/management/Agent.java b/jdk/src/java.management/share/classes/sun/management/Agent.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/Agent.java
rename to jdk/src/java.management/share/classes/sun/management/Agent.java
diff --git a/jdk/src/share/classes/sun/management/AgentConfigurationError.java b/jdk/src/java.management/share/classes/sun/management/AgentConfigurationError.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/AgentConfigurationError.java
rename to jdk/src/java.management/share/classes/sun/management/AgentConfigurationError.java
diff --git a/jdk/src/share/classes/sun/management/BaseOperatingSystemImpl.java b/jdk/src/java.management/share/classes/sun/management/BaseOperatingSystemImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/BaseOperatingSystemImpl.java
rename to jdk/src/java.management/share/classes/sun/management/BaseOperatingSystemImpl.java
diff --git a/jdk/src/share/classes/sun/management/ClassLoadingImpl.java b/jdk/src/java.management/share/classes/sun/management/ClassLoadingImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/ClassLoadingImpl.java
rename to jdk/src/java.management/share/classes/sun/management/ClassLoadingImpl.java
diff --git a/jdk/src/share/classes/sun/management/CompilationImpl.java b/jdk/src/java.management/share/classes/sun/management/CompilationImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/CompilationImpl.java
rename to jdk/src/java.management/share/classes/sun/management/CompilationImpl.java
diff --git a/jdk/src/share/classes/sun/management/CompilerThreadStat.java b/jdk/src/java.management/share/classes/sun/management/CompilerThreadStat.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/CompilerThreadStat.java
rename to jdk/src/java.management/share/classes/sun/management/CompilerThreadStat.java
diff --git a/jdk/src/share/classes/sun/management/ConnectorAddressLink.java b/jdk/src/java.management/share/classes/sun/management/ConnectorAddressLink.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/ConnectorAddressLink.java
rename to jdk/src/java.management/share/classes/sun/management/ConnectorAddressLink.java
diff --git a/jdk/src/share/classes/sun/management/DiagnosticCommandArgumentInfo.java b/jdk/src/java.management/share/classes/sun/management/DiagnosticCommandArgumentInfo.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/DiagnosticCommandArgumentInfo.java
rename to jdk/src/java.management/share/classes/sun/management/DiagnosticCommandArgumentInfo.java
diff --git a/jdk/src/share/classes/sun/management/DiagnosticCommandImpl.java b/jdk/src/java.management/share/classes/sun/management/DiagnosticCommandImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/DiagnosticCommandImpl.java
rename to jdk/src/java.management/share/classes/sun/management/DiagnosticCommandImpl.java
diff --git a/jdk/src/share/classes/sun/management/DiagnosticCommandInfo.java b/jdk/src/java.management/share/classes/sun/management/DiagnosticCommandInfo.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/DiagnosticCommandInfo.java
rename to jdk/src/java.management/share/classes/sun/management/DiagnosticCommandInfo.java
diff --git a/jdk/src/share/classes/sun/management/FileSystem.java b/jdk/src/java.management/share/classes/sun/management/FileSystem.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/FileSystem.java
rename to jdk/src/java.management/share/classes/sun/management/FileSystem.java
diff --git a/jdk/src/share/classes/sun/management/Flag.java b/jdk/src/java.management/share/classes/sun/management/Flag.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/Flag.java
rename to jdk/src/java.management/share/classes/sun/management/Flag.java
diff --git a/jdk/src/share/classes/sun/management/GarbageCollectionNotifInfoCompositeData.java b/jdk/src/java.management/share/classes/sun/management/GarbageCollectionNotifInfoCompositeData.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/GarbageCollectionNotifInfoCompositeData.java
rename to jdk/src/java.management/share/classes/sun/management/GarbageCollectionNotifInfoCompositeData.java
diff --git a/jdk/src/share/classes/sun/management/GarbageCollectorImpl.java b/jdk/src/java.management/share/classes/sun/management/GarbageCollectorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/GarbageCollectorImpl.java
rename to jdk/src/java.management/share/classes/sun/management/GarbageCollectorImpl.java
diff --git a/jdk/src/share/classes/sun/management/GcInfoBuilder.java b/jdk/src/java.management/share/classes/sun/management/GcInfoBuilder.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/GcInfoBuilder.java
rename to jdk/src/java.management/share/classes/sun/management/GcInfoBuilder.java
diff --git a/jdk/src/share/classes/sun/management/GcInfoCompositeData.java b/jdk/src/java.management/share/classes/sun/management/GcInfoCompositeData.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/GcInfoCompositeData.java
rename to jdk/src/java.management/share/classes/sun/management/GcInfoCompositeData.java
diff --git a/jdk/src/share/classes/sun/management/HotSpotDiagnostic.java b/jdk/src/java.management/share/classes/sun/management/HotSpotDiagnostic.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/HotSpotDiagnostic.java
rename to jdk/src/java.management/share/classes/sun/management/HotSpotDiagnostic.java
diff --git a/jdk/src/share/classes/sun/management/HotspotClassLoading.java b/jdk/src/java.management/share/classes/sun/management/HotspotClassLoading.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/HotspotClassLoading.java
rename to jdk/src/java.management/share/classes/sun/management/HotspotClassLoading.java
diff --git a/jdk/src/share/classes/sun/management/HotspotClassLoadingMBean.java b/jdk/src/java.management/share/classes/sun/management/HotspotClassLoadingMBean.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/HotspotClassLoadingMBean.java
rename to jdk/src/java.management/share/classes/sun/management/HotspotClassLoadingMBean.java
diff --git a/jdk/src/share/classes/sun/management/HotspotCompilation.java b/jdk/src/java.management/share/classes/sun/management/HotspotCompilation.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/HotspotCompilation.java
rename to jdk/src/java.management/share/classes/sun/management/HotspotCompilation.java
diff --git a/jdk/src/share/classes/sun/management/HotspotCompilationMBean.java b/jdk/src/java.management/share/classes/sun/management/HotspotCompilationMBean.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/HotspotCompilationMBean.java
rename to jdk/src/java.management/share/classes/sun/management/HotspotCompilationMBean.java
diff --git a/jdk/src/share/classes/sun/management/HotspotInternal.java b/jdk/src/java.management/share/classes/sun/management/HotspotInternal.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/HotspotInternal.java
rename to jdk/src/java.management/share/classes/sun/management/HotspotInternal.java
diff --git a/jdk/src/share/classes/sun/management/HotspotInternalMBean.java b/jdk/src/java.management/share/classes/sun/management/HotspotInternalMBean.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/HotspotInternalMBean.java
rename to jdk/src/java.management/share/classes/sun/management/HotspotInternalMBean.java
diff --git a/jdk/src/share/classes/sun/management/HotspotMemory.java b/jdk/src/java.management/share/classes/sun/management/HotspotMemory.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/HotspotMemory.java
rename to jdk/src/java.management/share/classes/sun/management/HotspotMemory.java
diff --git a/jdk/src/share/classes/sun/management/HotspotMemoryMBean.java b/jdk/src/java.management/share/classes/sun/management/HotspotMemoryMBean.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/HotspotMemoryMBean.java
rename to jdk/src/java.management/share/classes/sun/management/HotspotMemoryMBean.java
diff --git a/jdk/src/share/classes/sun/management/HotspotRuntime.java b/jdk/src/java.management/share/classes/sun/management/HotspotRuntime.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/HotspotRuntime.java
rename to jdk/src/java.management/share/classes/sun/management/HotspotRuntime.java
diff --git a/jdk/src/share/classes/sun/management/HotspotRuntimeMBean.java b/jdk/src/java.management/share/classes/sun/management/HotspotRuntimeMBean.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/HotspotRuntimeMBean.java
rename to jdk/src/java.management/share/classes/sun/management/HotspotRuntimeMBean.java
diff --git a/jdk/src/share/classes/sun/management/HotspotThread.java b/jdk/src/java.management/share/classes/sun/management/HotspotThread.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/HotspotThread.java
rename to jdk/src/java.management/share/classes/sun/management/HotspotThread.java
diff --git a/jdk/src/share/classes/sun/management/HotspotThreadMBean.java b/jdk/src/java.management/share/classes/sun/management/HotspotThreadMBean.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/HotspotThreadMBean.java
rename to jdk/src/java.management/share/classes/sun/management/HotspotThreadMBean.java
diff --git a/jdk/src/share/classes/sun/management/LazyCompositeData.java b/jdk/src/java.management/share/classes/sun/management/LazyCompositeData.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/LazyCompositeData.java
rename to jdk/src/java.management/share/classes/sun/management/LazyCompositeData.java
diff --git a/jdk/src/share/classes/sun/management/LockInfoCompositeData.java b/jdk/src/java.management/share/classes/sun/management/LockInfoCompositeData.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/LockInfoCompositeData.java
rename to jdk/src/java.management/share/classes/sun/management/LockInfoCompositeData.java
diff --git a/jdk/src/share/classes/sun/management/ManagementFactory.java b/jdk/src/java.management/share/classes/sun/management/ManagementFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/ManagementFactory.java
rename to jdk/src/java.management/share/classes/sun/management/ManagementFactory.java
diff --git a/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java b/jdk/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/ManagementFactoryHelper.java
rename to jdk/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java
diff --git a/jdk/src/share/classes/sun/management/MappedMXBeanType.java b/jdk/src/java.management/share/classes/sun/management/MappedMXBeanType.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/MappedMXBeanType.java
rename to jdk/src/java.management/share/classes/sun/management/MappedMXBeanType.java
diff --git a/jdk/src/share/classes/sun/management/MemoryImpl.java b/jdk/src/java.management/share/classes/sun/management/MemoryImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/MemoryImpl.java
rename to jdk/src/java.management/share/classes/sun/management/MemoryImpl.java
diff --git a/jdk/src/share/classes/sun/management/MemoryManagerImpl.java b/jdk/src/java.management/share/classes/sun/management/MemoryManagerImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/MemoryManagerImpl.java
rename to jdk/src/java.management/share/classes/sun/management/MemoryManagerImpl.java
diff --git a/jdk/src/share/classes/sun/management/MemoryNotifInfoCompositeData.java b/jdk/src/java.management/share/classes/sun/management/MemoryNotifInfoCompositeData.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/MemoryNotifInfoCompositeData.java
rename to jdk/src/java.management/share/classes/sun/management/MemoryNotifInfoCompositeData.java
diff --git a/jdk/src/share/classes/sun/management/MemoryPoolImpl.java b/jdk/src/java.management/share/classes/sun/management/MemoryPoolImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/MemoryPoolImpl.java
rename to jdk/src/java.management/share/classes/sun/management/MemoryPoolImpl.java
diff --git a/jdk/src/share/classes/sun/management/MemoryUsageCompositeData.java b/jdk/src/java.management/share/classes/sun/management/MemoryUsageCompositeData.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/MemoryUsageCompositeData.java
rename to jdk/src/java.management/share/classes/sun/management/MemoryUsageCompositeData.java
diff --git a/jdk/src/share/classes/sun/management/MethodInfo.java b/jdk/src/java.management/share/classes/sun/management/MethodInfo.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/MethodInfo.java
rename to jdk/src/java.management/share/classes/sun/management/MethodInfo.java
diff --git a/jdk/src/share/classes/sun/management/MonitorInfoCompositeData.java b/jdk/src/java.management/share/classes/sun/management/MonitorInfoCompositeData.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/MonitorInfoCompositeData.java
rename to jdk/src/java.management/share/classes/sun/management/MonitorInfoCompositeData.java
diff --git a/jdk/src/share/classes/sun/management/NotificationEmitterSupport.java b/jdk/src/java.management/share/classes/sun/management/NotificationEmitterSupport.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/NotificationEmitterSupport.java
rename to jdk/src/java.management/share/classes/sun/management/NotificationEmitterSupport.java
diff --git a/jdk/src/share/classes/sun/management/RuntimeImpl.java b/jdk/src/java.management/share/classes/sun/management/RuntimeImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/RuntimeImpl.java
rename to jdk/src/java.management/share/classes/sun/management/RuntimeImpl.java
diff --git a/jdk/src/share/classes/sun/management/Sensor.java b/jdk/src/java.management/share/classes/sun/management/Sensor.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/Sensor.java
rename to jdk/src/java.management/share/classes/sun/management/Sensor.java
diff --git a/jdk/src/share/classes/sun/management/StackTraceElementCompositeData.java b/jdk/src/java.management/share/classes/sun/management/StackTraceElementCompositeData.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/StackTraceElementCompositeData.java
rename to jdk/src/java.management/share/classes/sun/management/StackTraceElementCompositeData.java
diff --git a/jdk/src/share/classes/sun/management/ThreadImpl.java b/jdk/src/java.management/share/classes/sun/management/ThreadImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/ThreadImpl.java
rename to jdk/src/java.management/share/classes/sun/management/ThreadImpl.java
diff --git a/jdk/src/share/classes/sun/management/ThreadInfoCompositeData.java b/jdk/src/java.management/share/classes/sun/management/ThreadInfoCompositeData.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/ThreadInfoCompositeData.java
rename to jdk/src/java.management/share/classes/sun/management/ThreadInfoCompositeData.java
diff --git a/jdk/src/share/classes/sun/management/Util.java b/jdk/src/java.management/share/classes/sun/management/Util.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/Util.java
rename to jdk/src/java.management/share/classes/sun/management/Util.java
diff --git a/jdk/src/share/classes/sun/management/VMManagement.java b/jdk/src/java.management/share/classes/sun/management/VMManagement.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/VMManagement.java
rename to jdk/src/java.management/share/classes/sun/management/VMManagement.java
diff --git a/jdk/src/share/classes/sun/management/VMManagementImpl.java b/jdk/src/java.management/share/classes/sun/management/VMManagementImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/VMManagementImpl.java
rename to jdk/src/java.management/share/classes/sun/management/VMManagementImpl.java
diff --git a/jdk/src/share/classes/sun/management/VMOptionCompositeData.java b/jdk/src/java.management/share/classes/sun/management/VMOptionCompositeData.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/VMOptionCompositeData.java
rename to jdk/src/java.management/share/classes/sun/management/VMOptionCompositeData.java
diff --git a/jdk/src/share/classes/sun/management/counter/AbstractCounter.java b/jdk/src/java.management/share/classes/sun/management/counter/AbstractCounter.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/counter/AbstractCounter.java
rename to jdk/src/java.management/share/classes/sun/management/counter/AbstractCounter.java
diff --git a/jdk/src/share/classes/sun/management/counter/ByteArrayCounter.java b/jdk/src/java.management/share/classes/sun/management/counter/ByteArrayCounter.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/counter/ByteArrayCounter.java
rename to jdk/src/java.management/share/classes/sun/management/counter/ByteArrayCounter.java
diff --git a/jdk/src/share/classes/sun/management/counter/Counter.java b/jdk/src/java.management/share/classes/sun/management/counter/Counter.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/counter/Counter.java
rename to jdk/src/java.management/share/classes/sun/management/counter/Counter.java
diff --git a/jdk/src/share/classes/sun/management/counter/LongArrayCounter.java b/jdk/src/java.management/share/classes/sun/management/counter/LongArrayCounter.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/counter/LongArrayCounter.java
rename to jdk/src/java.management/share/classes/sun/management/counter/LongArrayCounter.java
diff --git a/jdk/src/share/classes/sun/management/counter/LongCounter.java b/jdk/src/java.management/share/classes/sun/management/counter/LongCounter.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/counter/LongCounter.java
rename to jdk/src/java.management/share/classes/sun/management/counter/LongCounter.java
diff --git a/jdk/src/share/classes/sun/management/counter/StringCounter.java b/jdk/src/java.management/share/classes/sun/management/counter/StringCounter.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/counter/StringCounter.java
rename to jdk/src/java.management/share/classes/sun/management/counter/StringCounter.java
diff --git a/jdk/src/share/classes/sun/management/counter/Units.java b/jdk/src/java.management/share/classes/sun/management/counter/Units.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/counter/Units.java
rename to jdk/src/java.management/share/classes/sun/management/counter/Units.java
diff --git a/jdk/src/share/classes/sun/management/counter/Variability.java b/jdk/src/java.management/share/classes/sun/management/counter/Variability.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/counter/Variability.java
rename to jdk/src/java.management/share/classes/sun/management/counter/Variability.java
diff --git a/jdk/src/share/classes/sun/management/counter/perf/ByteArrayCounterSnapshot.java b/jdk/src/java.management/share/classes/sun/management/counter/perf/ByteArrayCounterSnapshot.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/counter/perf/ByteArrayCounterSnapshot.java
rename to jdk/src/java.management/share/classes/sun/management/counter/perf/ByteArrayCounterSnapshot.java
diff --git a/jdk/src/share/classes/sun/management/counter/perf/InstrumentationException.java b/jdk/src/java.management/share/classes/sun/management/counter/perf/InstrumentationException.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/counter/perf/InstrumentationException.java
rename to jdk/src/java.management/share/classes/sun/management/counter/perf/InstrumentationException.java
diff --git a/jdk/src/share/classes/sun/management/counter/perf/LongArrayCounterSnapshot.java b/jdk/src/java.management/share/classes/sun/management/counter/perf/LongArrayCounterSnapshot.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/counter/perf/LongArrayCounterSnapshot.java
rename to jdk/src/java.management/share/classes/sun/management/counter/perf/LongArrayCounterSnapshot.java
diff --git a/jdk/src/share/classes/sun/management/counter/perf/LongCounterSnapshot.java b/jdk/src/java.management/share/classes/sun/management/counter/perf/LongCounterSnapshot.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/counter/perf/LongCounterSnapshot.java
rename to jdk/src/java.management/share/classes/sun/management/counter/perf/LongCounterSnapshot.java
diff --git a/jdk/src/share/classes/sun/management/counter/perf/PerfByteArrayCounter.java b/jdk/src/java.management/share/classes/sun/management/counter/perf/PerfByteArrayCounter.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/counter/perf/PerfByteArrayCounter.java
rename to jdk/src/java.management/share/classes/sun/management/counter/perf/PerfByteArrayCounter.java
diff --git a/jdk/src/share/classes/sun/management/counter/perf/PerfDataEntry.java b/jdk/src/java.management/share/classes/sun/management/counter/perf/PerfDataEntry.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/counter/perf/PerfDataEntry.java
rename to jdk/src/java.management/share/classes/sun/management/counter/perf/PerfDataEntry.java
diff --git a/jdk/src/share/classes/sun/management/counter/perf/PerfDataType.java b/jdk/src/java.management/share/classes/sun/management/counter/perf/PerfDataType.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/counter/perf/PerfDataType.java
rename to jdk/src/java.management/share/classes/sun/management/counter/perf/PerfDataType.java
diff --git a/jdk/src/share/classes/sun/management/counter/perf/PerfInstrumentation.java b/jdk/src/java.management/share/classes/sun/management/counter/perf/PerfInstrumentation.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/counter/perf/PerfInstrumentation.java
rename to jdk/src/java.management/share/classes/sun/management/counter/perf/PerfInstrumentation.java
diff --git a/jdk/src/share/classes/sun/management/counter/perf/PerfLongArrayCounter.java b/jdk/src/java.management/share/classes/sun/management/counter/perf/PerfLongArrayCounter.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/counter/perf/PerfLongArrayCounter.java
rename to jdk/src/java.management/share/classes/sun/management/counter/perf/PerfLongArrayCounter.java
diff --git a/jdk/src/share/classes/sun/management/counter/perf/PerfLongCounter.java b/jdk/src/java.management/share/classes/sun/management/counter/perf/PerfLongCounter.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/counter/perf/PerfLongCounter.java
rename to jdk/src/java.management/share/classes/sun/management/counter/perf/PerfLongCounter.java
diff --git a/jdk/src/share/classes/sun/management/counter/perf/PerfStringCounter.java b/jdk/src/java.management/share/classes/sun/management/counter/perf/PerfStringCounter.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/counter/perf/PerfStringCounter.java
rename to jdk/src/java.management/share/classes/sun/management/counter/perf/PerfStringCounter.java
diff --git a/jdk/src/share/classes/sun/management/counter/perf/Prologue.java b/jdk/src/java.management/share/classes/sun/management/counter/perf/Prologue.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/counter/perf/Prologue.java
rename to jdk/src/java.management/share/classes/sun/management/counter/perf/Prologue.java
diff --git a/jdk/src/share/classes/sun/management/counter/perf/StringCounterSnapshot.java b/jdk/src/java.management/share/classes/sun/management/counter/perf/StringCounterSnapshot.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/counter/perf/StringCounterSnapshot.java
rename to jdk/src/java.management/share/classes/sun/management/counter/perf/StringCounterSnapshot.java
diff --git a/jdk/src/share/classes/sun/management/jdp/JdpBroadcaster.java b/jdk/src/java.management/share/classes/sun/management/jdp/JdpBroadcaster.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/jdp/JdpBroadcaster.java
rename to jdk/src/java.management/share/classes/sun/management/jdp/JdpBroadcaster.java
diff --git a/jdk/src/share/classes/sun/management/jdp/JdpController.java b/jdk/src/java.management/share/classes/sun/management/jdp/JdpController.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/jdp/JdpController.java
rename to jdk/src/java.management/share/classes/sun/management/jdp/JdpController.java
diff --git a/jdk/src/share/classes/sun/management/jdp/JdpException.java b/jdk/src/java.management/share/classes/sun/management/jdp/JdpException.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/jdp/JdpException.java
rename to jdk/src/java.management/share/classes/sun/management/jdp/JdpException.java
diff --git a/jdk/src/share/classes/sun/management/jdp/JdpGenericPacket.java b/jdk/src/java.management/share/classes/sun/management/jdp/JdpGenericPacket.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/jdp/JdpGenericPacket.java
rename to jdk/src/java.management/share/classes/sun/management/jdp/JdpGenericPacket.java
diff --git a/jdk/src/share/classes/sun/management/jdp/JdpJmxPacket.java b/jdk/src/java.management/share/classes/sun/management/jdp/JdpJmxPacket.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/jdp/JdpJmxPacket.java
rename to jdk/src/java.management/share/classes/sun/management/jdp/JdpJmxPacket.java
diff --git a/jdk/src/share/classes/sun/management/jdp/JdpPacket.java b/jdk/src/java.management/share/classes/sun/management/jdp/JdpPacket.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/jdp/JdpPacket.java
rename to jdk/src/java.management/share/classes/sun/management/jdp/JdpPacket.java
diff --git a/jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java b/jdk/src/java.management/share/classes/sun/management/jdp/JdpPacketReader.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java
rename to jdk/src/java.management/share/classes/sun/management/jdp/JdpPacketReader.java
diff --git a/jdk/src/share/classes/sun/management/jdp/JdpPacketWriter.java b/jdk/src/java.management/share/classes/sun/management/jdp/JdpPacketWriter.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/jdp/JdpPacketWriter.java
rename to jdk/src/java.management/share/classes/sun/management/jdp/JdpPacketWriter.java
diff --git a/jdk/src/share/classes/sun/management/jdp/package-info.java b/jdk/src/java.management/share/classes/sun/management/jdp/package-info.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/jdp/package-info.java
rename to jdk/src/java.management/share/classes/sun/management/jdp/package-info.java
diff --git a/jdk/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java b/jdk/src/java.management/share/classes/sun/management/jmxremote/ConnectorBootstrap.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java
rename to jdk/src/java.management/share/classes/sun/management/jmxremote/ConnectorBootstrap.java
diff --git a/jdk/src/share/classes/sun/management/jmxremote/LocalRMIServerSocketFactory.java b/jdk/src/java.management/share/classes/sun/management/jmxremote/LocalRMIServerSocketFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/jmxremote/LocalRMIServerSocketFactory.java
rename to jdk/src/java.management/share/classes/sun/management/jmxremote/LocalRMIServerSocketFactory.java
diff --git a/jdk/src/share/classes/sun/management/jmxremote/SingleEntryRegistry.java b/jdk/src/java.management/share/classes/sun/management/jmxremote/SingleEntryRegistry.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/jmxremote/SingleEntryRegistry.java
rename to jdk/src/java.management/share/classes/sun/management/jmxremote/SingleEntryRegistry.java
diff --git a/jdk/src/share/classes/sun/management/jmxremote/package.html b/jdk/src/java.management/share/classes/sun/management/jmxremote/package.html
similarity index 100%
rename from jdk/src/share/classes/sun/management/jmxremote/package.html
rename to jdk/src/java.management/share/classes/sun/management/jmxremote/package.html
diff --git a/jdk/src/share/classes/sun/management/resources/agent.properties b/jdk/src/java.management/share/classes/sun/management/resources/agent.properties
similarity index 100%
rename from jdk/src/share/classes/sun/management/resources/agent.properties
rename to jdk/src/java.management/share/classes/sun/management/resources/agent.properties
diff --git a/jdk/src/share/classes/sun/management/resources/agent_de.properties b/jdk/src/java.management/share/classes/sun/management/resources/agent_de.properties
similarity index 100%
rename from jdk/src/share/classes/sun/management/resources/agent_de.properties
rename to jdk/src/java.management/share/classes/sun/management/resources/agent_de.properties
diff --git a/jdk/src/share/classes/sun/management/resources/agent_es.properties b/jdk/src/java.management/share/classes/sun/management/resources/agent_es.properties
similarity index 100%
rename from jdk/src/share/classes/sun/management/resources/agent_es.properties
rename to jdk/src/java.management/share/classes/sun/management/resources/agent_es.properties
diff --git a/jdk/src/share/classes/sun/management/resources/agent_fr.properties b/jdk/src/java.management/share/classes/sun/management/resources/agent_fr.properties
similarity index 100%
rename from jdk/src/share/classes/sun/management/resources/agent_fr.properties
rename to jdk/src/java.management/share/classes/sun/management/resources/agent_fr.properties
diff --git a/jdk/src/share/classes/sun/management/resources/agent_it.properties b/jdk/src/java.management/share/classes/sun/management/resources/agent_it.properties
similarity index 100%
rename from jdk/src/share/classes/sun/management/resources/agent_it.properties
rename to jdk/src/java.management/share/classes/sun/management/resources/agent_it.properties
diff --git a/jdk/src/share/classes/sun/management/resources/agent_ja.properties b/jdk/src/java.management/share/classes/sun/management/resources/agent_ja.properties
similarity index 100%
rename from jdk/src/share/classes/sun/management/resources/agent_ja.properties
rename to jdk/src/java.management/share/classes/sun/management/resources/agent_ja.properties
diff --git a/jdk/src/share/classes/sun/management/resources/agent_ko.properties b/jdk/src/java.management/share/classes/sun/management/resources/agent_ko.properties
similarity index 100%
rename from jdk/src/share/classes/sun/management/resources/agent_ko.properties
rename to jdk/src/java.management/share/classes/sun/management/resources/agent_ko.properties
diff --git a/jdk/src/share/classes/sun/management/resources/agent_pt_BR.properties b/jdk/src/java.management/share/classes/sun/management/resources/agent_pt_BR.properties
similarity index 100%
rename from jdk/src/share/classes/sun/management/resources/agent_pt_BR.properties
rename to jdk/src/java.management/share/classes/sun/management/resources/agent_pt_BR.properties
diff --git a/jdk/src/share/classes/sun/management/resources/agent_sv.properties b/jdk/src/java.management/share/classes/sun/management/resources/agent_sv.properties
similarity index 100%
rename from jdk/src/share/classes/sun/management/resources/agent_sv.properties
rename to jdk/src/java.management/share/classes/sun/management/resources/agent_sv.properties
diff --git a/jdk/src/share/classes/sun/management/resources/agent_zh_CN.properties b/jdk/src/java.management/share/classes/sun/management/resources/agent_zh_CN.properties
similarity index 100%
rename from jdk/src/share/classes/sun/management/resources/agent_zh_CN.properties
rename to jdk/src/java.management/share/classes/sun/management/resources/agent_zh_CN.properties
diff --git a/jdk/src/share/classes/sun/management/resources/agent_zh_TW.properties b/jdk/src/java.management/share/classes/sun/management/resources/agent_zh_TW.properties
similarity index 100%
rename from jdk/src/share/classes/sun/management/resources/agent_zh_TW.properties
rename to jdk/src/java.management/share/classes/sun/management/resources/agent_zh_TW.properties
diff --git a/jdk/src/share/lib/management/jmxremote.access b/jdk/src/java.management/share/conf/jmxremote.access
similarity index 100%
rename from jdk/src/share/lib/management/jmxremote.access
rename to jdk/src/java.management/share/conf/jmxremote.access
diff --git a/jdk/src/share/lib/management/jmxremote.password.template b/jdk/src/java.management/share/conf/jmxremote.password.template
similarity index 100%
rename from jdk/src/share/lib/management/jmxremote.password.template
rename to jdk/src/java.management/share/conf/jmxremote.password.template
diff --git a/jdk/src/share/lib/management/management.properties b/jdk/src/java.management/share/conf/management.properties
similarity index 100%
rename from jdk/src/share/lib/management/management.properties
rename to jdk/src/java.management/share/conf/management.properties
diff --git a/jdk/src/share/lib/management/snmp.acl.template b/jdk/src/java.management/share/conf/snmp.acl.template
similarity index 100%
rename from jdk/src/share/lib/management/snmp.acl.template
rename to jdk/src/java.management/share/conf/snmp.acl.template
diff --git a/jdk/src/share/javavm/export/jmm.h b/jdk/src/java.management/share/native/include/jmm.h
similarity index 100%
rename from jdk/src/share/javavm/export/jmm.h
rename to jdk/src/java.management/share/native/include/jmm.h
diff --git a/jdk/src/share/native/sun/management/ClassLoadingImpl.c b/jdk/src/java.management/share/native/libmanagement/ClassLoadingImpl.c
similarity index 100%
rename from jdk/src/share/native/sun/management/ClassLoadingImpl.c
rename to jdk/src/java.management/share/native/libmanagement/ClassLoadingImpl.c
diff --git a/jdk/src/share/native/sun/management/DiagnosticCommandImpl.c b/jdk/src/java.management/share/native/libmanagement/DiagnosticCommandImpl.c
similarity index 100%
rename from jdk/src/share/native/sun/management/DiagnosticCommandImpl.c
rename to jdk/src/java.management/share/native/libmanagement/DiagnosticCommandImpl.c
diff --git a/jdk/src/share/native/sun/management/Flag.c b/jdk/src/java.management/share/native/libmanagement/Flag.c
similarity index 100%
rename from jdk/src/share/native/sun/management/Flag.c
rename to jdk/src/java.management/share/native/libmanagement/Flag.c
diff --git a/jdk/src/share/native/sun/management/GarbageCollectorImpl.c b/jdk/src/java.management/share/native/libmanagement/GarbageCollectorImpl.c
similarity index 100%
rename from jdk/src/share/native/sun/management/GarbageCollectorImpl.c
rename to jdk/src/java.management/share/native/libmanagement/GarbageCollectorImpl.c
diff --git a/jdk/src/share/native/sun/management/GcInfoBuilder.c b/jdk/src/java.management/share/native/libmanagement/GcInfoBuilder.c
similarity index 100%
rename from jdk/src/share/native/sun/management/GcInfoBuilder.c
rename to jdk/src/java.management/share/native/libmanagement/GcInfoBuilder.c
diff --git a/jdk/src/share/native/sun/management/HotSpotDiagnostic.c b/jdk/src/java.management/share/native/libmanagement/HotSpotDiagnostic.c
similarity index 100%
rename from jdk/src/share/native/sun/management/HotSpotDiagnostic.c
rename to jdk/src/java.management/share/native/libmanagement/HotSpotDiagnostic.c
diff --git a/jdk/src/share/native/sun/management/HotspotThread.c b/jdk/src/java.management/share/native/libmanagement/HotspotThread.c
similarity index 100%
rename from jdk/src/share/native/sun/management/HotspotThread.c
rename to jdk/src/java.management/share/native/libmanagement/HotspotThread.c
diff --git a/jdk/src/share/native/sun/management/MemoryImpl.c b/jdk/src/java.management/share/native/libmanagement/MemoryImpl.c
similarity index 100%
rename from jdk/src/share/native/sun/management/MemoryImpl.c
rename to jdk/src/java.management/share/native/libmanagement/MemoryImpl.c
diff --git a/jdk/src/share/native/sun/management/MemoryManagerImpl.c b/jdk/src/java.management/share/native/libmanagement/MemoryManagerImpl.c
similarity index 100%
rename from jdk/src/share/native/sun/management/MemoryManagerImpl.c
rename to jdk/src/java.management/share/native/libmanagement/MemoryManagerImpl.c
diff --git a/jdk/src/share/native/sun/management/MemoryPoolImpl.c b/jdk/src/java.management/share/native/libmanagement/MemoryPoolImpl.c
similarity index 100%
rename from jdk/src/share/native/sun/management/MemoryPoolImpl.c
rename to jdk/src/java.management/share/native/libmanagement/MemoryPoolImpl.c
diff --git a/jdk/src/share/native/sun/management/ThreadImpl.c b/jdk/src/java.management/share/native/libmanagement/ThreadImpl.c
similarity index 100%
rename from jdk/src/share/native/sun/management/ThreadImpl.c
rename to jdk/src/java.management/share/native/libmanagement/ThreadImpl.c
diff --git a/jdk/src/share/native/sun/management/VMManagementImpl.c b/jdk/src/java.management/share/native/libmanagement/VMManagementImpl.c
similarity index 100%
rename from jdk/src/share/native/sun/management/VMManagementImpl.c
rename to jdk/src/java.management/share/native/libmanagement/VMManagementImpl.c
diff --git a/jdk/src/share/native/sun/management/management.c b/jdk/src/java.management/share/native/libmanagement/management.c
similarity index 100%
rename from jdk/src/share/native/sun/management/management.c
rename to jdk/src/java.management/share/native/libmanagement/management.c
diff --git a/jdk/src/share/native/sun/management/management.h b/jdk/src/java.management/share/native/libmanagement/management.h
similarity index 100%
rename from jdk/src/share/native/sun/management/management.h
rename to jdk/src/java.management/share/native/libmanagement/management.h
diff --git a/jdk/src/solaris/classes/sun/management/FileSystemImpl.java b/jdk/src/java.management/unix/classes/sun/management/FileSystemImpl.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/management/FileSystemImpl.java
rename to jdk/src/java.management/unix/classes/sun/management/FileSystemImpl.java
diff --git a/jdk/src/solaris/classes/sun/management/OperatingSystemImpl.java b/jdk/src/java.management/unix/classes/sun/management/OperatingSystemImpl.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/management/OperatingSystemImpl.java
rename to jdk/src/java.management/unix/classes/sun/management/OperatingSystemImpl.java
diff --git a/jdk/src/solaris/native/sun/management/FileSystemImpl.c b/jdk/src/java.management/unix/native/libmanagement/FileSystemImpl.c
similarity index 100%
rename from jdk/src/solaris/native/sun/management/FileSystemImpl.c
rename to jdk/src/java.management/unix/native/libmanagement/FileSystemImpl.c
diff --git a/jdk/src/solaris/native/sun/management/LinuxOperatingSystem.c b/jdk/src/java.management/unix/native/libmanagement/LinuxOperatingSystem.c
similarity index 100%
rename from jdk/src/solaris/native/sun/management/LinuxOperatingSystem.c
rename to jdk/src/java.management/unix/native/libmanagement/LinuxOperatingSystem.c
diff --git a/jdk/src/solaris/native/sun/management/MacosxOperatingSystem.c b/jdk/src/java.management/unix/native/libmanagement/MacosxOperatingSystem.c
similarity index 100%
rename from jdk/src/solaris/native/sun/management/MacosxOperatingSystem.c
rename to jdk/src/java.management/unix/native/libmanagement/MacosxOperatingSystem.c
diff --git a/jdk/src/solaris/native/sun/management/OperatingSystemImpl.c b/jdk/src/java.management/unix/native/libmanagement/OperatingSystemImpl.c
similarity index 100%
rename from jdk/src/solaris/native/sun/management/OperatingSystemImpl.c
rename to jdk/src/java.management/unix/native/libmanagement/OperatingSystemImpl.c
diff --git a/jdk/src/solaris/native/sun/management/SolarisOperatingSystem.c b/jdk/src/java.management/unix/native/libmanagement/SolarisOperatingSystem.c
similarity index 100%
rename from jdk/src/solaris/native/sun/management/SolarisOperatingSystem.c
rename to jdk/src/java.management/unix/native/libmanagement/SolarisOperatingSystem.c
diff --git a/jdk/src/windows/classes/sun/management/FileSystemImpl.java b/jdk/src/java.management/windows/classes/sun/management/FileSystemImpl.java
similarity index 100%
rename from jdk/src/windows/classes/sun/management/FileSystemImpl.java
rename to jdk/src/java.management/windows/classes/sun/management/FileSystemImpl.java
diff --git a/jdk/src/windows/classes/sun/management/OperatingSystemImpl.java b/jdk/src/java.management/windows/classes/sun/management/OperatingSystemImpl.java
similarity index 100%
rename from jdk/src/windows/classes/sun/management/OperatingSystemImpl.java
rename to jdk/src/java.management/windows/classes/sun/management/OperatingSystemImpl.java
diff --git a/jdk/src/windows/native/sun/management/FileSystemImpl.c b/jdk/src/java.management/windows/native/libmanagement/FileSystemImpl.c
similarity index 100%
rename from jdk/src/windows/native/sun/management/FileSystemImpl.c
rename to jdk/src/java.management/windows/native/libmanagement/FileSystemImpl.c
diff --git a/jdk/src/windows/native/sun/management/OperatingSystemImpl.c b/jdk/src/java.management/windows/native/libmanagement/OperatingSystemImpl.c
similarity index 100%
rename from jdk/src/windows/native/sun/management/OperatingSystemImpl.c
rename to jdk/src/java.management/windows/native/libmanagement/OperatingSystemImpl.c
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/AbstractLdapNamingEnumeration.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/AbstractLdapNamingEnumeration.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/AbstractLdapNamingEnumeration.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/AbstractLdapNamingEnumeration.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/BasicControl.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/BasicControl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/BasicControl.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/BasicControl.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/Ber.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/Ber.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/Ber.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/Ber.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/BerDecoder.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/BerDecoder.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/BerDecoder.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/BerDecoder.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/BerEncoder.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/BerEncoder.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/BerEncoder.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/BerEncoder.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/BindingWithControls.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/BindingWithControls.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/BindingWithControls.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/BindingWithControls.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/ClientId.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/ClientId.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/ClientId.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/ClientId.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/Connection.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/Connection.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/Connection.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/Connection.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/DefaultResponseControlFactory.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/DefaultResponseControlFactory.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/DefaultResponseControlFactory.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/DefaultResponseControlFactory.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/DigestClientId.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/DigestClientId.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/DigestClientId.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/DigestClientId.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/EntryChangeResponseControl.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/EntryChangeResponseControl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/EntryChangeResponseControl.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/EntryChangeResponseControl.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/EventQueue.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/EventQueue.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/EventQueue.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/EventQueue.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/EventSupport.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/EventSupport.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/EventSupport.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/EventSupport.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/Filter.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/Filter.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/Filter.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/Filter.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/LdapAttribute.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapAttribute.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/LdapAttribute.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapAttribute.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/LdapBindingEnumeration.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapBindingEnumeration.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/LdapBindingEnumeration.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapBindingEnumeration.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/LdapClient.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapClient.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/LdapClient.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapClient.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/LdapClientFactory.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapClientFactory.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/LdapClientFactory.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapClientFactory.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/LdapCtx.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapCtx.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/LdapCtx.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapCtx.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/LdapEntry.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapEntry.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/LdapEntry.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapEntry.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/LdapName.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapName.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/LdapName.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapName.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/LdapNameParser.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapNameParser.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/LdapNameParser.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapNameParser.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/LdapNamingEnumeration.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapNamingEnumeration.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/LdapNamingEnumeration.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapNamingEnumeration.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/LdapPoolManager.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapPoolManager.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/LdapPoolManager.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapPoolManager.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/LdapReferralContext.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapReferralContext.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/LdapReferralContext.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapReferralContext.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/LdapReferralException.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapReferralException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/LdapReferralException.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapReferralException.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/LdapRequest.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapRequest.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/LdapRequest.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapRequest.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/LdapResult.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapResult.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/LdapResult.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapResult.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/LdapSchemaCtx.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapSchemaCtx.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/LdapSchemaCtx.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapSchemaCtx.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/LdapSchemaParser.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapSchemaParser.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/LdapSchemaParser.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapSchemaParser.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/LdapSearchEnumeration.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapSearchEnumeration.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/LdapSearchEnumeration.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapSearchEnumeration.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/LdapURL.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapURL.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/LdapURL.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapURL.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/ManageReferralControl.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/ManageReferralControl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/ManageReferralControl.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/ManageReferralControl.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/NameClassPairWithControls.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/NameClassPairWithControls.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/NameClassPairWithControls.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/NameClassPairWithControls.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/NamingEventNotifier.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/NamingEventNotifier.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/NamingEventNotifier.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/NamingEventNotifier.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/NotifierArgs.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/NotifierArgs.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/NotifierArgs.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/NotifierArgs.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/Obj.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/Obj.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/Obj.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/Obj.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/PersistentSearchControl.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/PersistentSearchControl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/PersistentSearchControl.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/PersistentSearchControl.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/ReferralEnumeration.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/ReferralEnumeration.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/ReferralEnumeration.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/ReferralEnumeration.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/SearchResultWithControls.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/SearchResultWithControls.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/SearchResultWithControls.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/SearchResultWithControls.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/ServiceLocator.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/ServiceLocator.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/ServiceLocator.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/ServiceLocator.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/SimpleClientId.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/SimpleClientId.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/SimpleClientId.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/SimpleClientId.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/UnsolicitedResponseImpl.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/UnsolicitedResponseImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/UnsolicitedResponseImpl.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/UnsolicitedResponseImpl.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/VersionHelper.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/VersionHelper.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/VersionHelper.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/VersionHelper.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/ext/StartTlsResponseImpl.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/ext/StartTlsResponseImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/ext/StartTlsResponseImpl.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/ext/StartTlsResponseImpl.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/jndiprovider.properties b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/jndiprovider.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/jndiprovider.properties
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/jndiprovider.properties
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/pool/ConnectionDesc.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/ConnectionDesc.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/pool/ConnectionDesc.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/ConnectionDesc.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/pool/Connections.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/Connections.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/pool/Connections.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/Connections.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/pool/ConnectionsRef.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/ConnectionsRef.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/pool/ConnectionsRef.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/ConnectionsRef.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/pool/ConnectionsWeakRef.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/ConnectionsWeakRef.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/pool/ConnectionsWeakRef.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/ConnectionsWeakRef.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/pool/Pool.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/Pool.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/pool/Pool.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/Pool.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/pool/PoolCallback.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/PoolCallback.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/pool/PoolCallback.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/PoolCallback.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/pool/PoolCleaner.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/PoolCleaner.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/pool/PoolCleaner.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/PoolCleaner.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/pool/PooledConnection.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/PooledConnection.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/pool/PooledConnection.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/PooledConnection.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/pool/PooledConnectionFactory.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/PooledConnectionFactory.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/pool/PooledConnectionFactory.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/PooledConnectionFactory.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/sasl/LdapSasl.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/sasl/LdapSasl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/sasl/LdapSasl.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/sasl/LdapSasl.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/sasl/SaslInputStream.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/sasl/SaslInputStream.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/sasl/SaslInputStream.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/sasl/SaslInputStream.java
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/sasl/SaslOutputStream.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/sasl/SaslOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/ldap/sasl/SaslOutputStream.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/ldap/sasl/SaslOutputStream.java
diff --git a/jdk/src/share/classes/com/sun/jndi/toolkit/ctx/AtomicContext.java b/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/AtomicContext.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/toolkit/ctx/AtomicContext.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/AtomicContext.java
diff --git a/jdk/src/share/classes/com/sun/jndi/toolkit/ctx/AtomicDirContext.java b/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/AtomicDirContext.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/toolkit/ctx/AtomicDirContext.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/AtomicDirContext.java
diff --git a/jdk/src/share/classes/com/sun/jndi/toolkit/ctx/ComponentContext.java b/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/ComponentContext.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/toolkit/ctx/ComponentContext.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/ComponentContext.java
diff --git a/jdk/src/share/classes/com/sun/jndi/toolkit/ctx/ComponentDirContext.java b/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/ComponentDirContext.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/toolkit/ctx/ComponentDirContext.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/ComponentDirContext.java
diff --git a/jdk/src/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java b/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java
diff --git a/jdk/src/share/classes/com/sun/jndi/toolkit/ctx/HeadTail.java b/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/HeadTail.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/toolkit/ctx/HeadTail.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/HeadTail.java
diff --git a/jdk/src/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeContext.java b/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeContext.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeContext.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeContext.java
diff --git a/jdk/src/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeDirContext.java b/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeDirContext.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeDirContext.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeDirContext.java
diff --git a/jdk/src/share/classes/com/sun/jndi/toolkit/ctx/StringHeadTail.java b/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/StringHeadTail.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/toolkit/ctx/StringHeadTail.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/StringHeadTail.java
diff --git a/jdk/src/share/classes/com/sun/jndi/toolkit/dir/AttrFilter.java b/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/AttrFilter.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/toolkit/dir/AttrFilter.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/AttrFilter.java
diff --git a/jdk/src/share/classes/com/sun/jndi/toolkit/dir/ContainmentFilter.java b/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/ContainmentFilter.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/toolkit/dir/ContainmentFilter.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/ContainmentFilter.java
diff --git a/jdk/src/share/classes/com/sun/jndi/toolkit/dir/ContextEnumerator.java b/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/ContextEnumerator.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/toolkit/dir/ContextEnumerator.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/ContextEnumerator.java
diff --git a/jdk/src/share/classes/com/sun/jndi/toolkit/dir/DirSearch.java b/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/DirSearch.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/toolkit/dir/DirSearch.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/DirSearch.java
diff --git a/jdk/src/share/classes/com/sun/jndi/toolkit/dir/HierMemDirCtx.java b/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/HierMemDirCtx.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/toolkit/dir/HierMemDirCtx.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/HierMemDirCtx.java
diff --git a/jdk/src/share/classes/com/sun/jndi/toolkit/dir/LazySearchEnumerationImpl.java b/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/LazySearchEnumerationImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/toolkit/dir/LazySearchEnumerationImpl.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/LazySearchEnumerationImpl.java
diff --git a/jdk/src/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java b/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java
diff --git a/jdk/src/share/classes/com/sun/jndi/toolkit/url/GenericURLContext.java b/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/url/GenericURLContext.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/toolkit/url/GenericURLContext.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/url/GenericURLContext.java
diff --git a/jdk/src/share/classes/com/sun/jndi/toolkit/url/GenericURLDirContext.java b/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/url/GenericURLDirContext.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/toolkit/url/GenericURLDirContext.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/url/GenericURLDirContext.java
diff --git a/jdk/src/share/classes/com/sun/jndi/toolkit/url/Uri.java b/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/url/Uri.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/toolkit/url/Uri.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/url/Uri.java
diff --git a/jdk/src/share/classes/com/sun/jndi/toolkit/url/UrlUtil.java b/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/url/UrlUtil.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/toolkit/url/UrlUtil.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/url/UrlUtil.java
diff --git a/jdk/src/share/classes/com/sun/jndi/url/ldap/ldapURLContext.java b/jdk/src/java.naming/share/classes/com/sun/jndi/url/ldap/ldapURLContext.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/url/ldap/ldapURLContext.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/url/ldap/ldapURLContext.java
diff --git a/jdk/src/share/classes/com/sun/jndi/url/ldap/ldapURLContextFactory.java b/jdk/src/java.naming/share/classes/com/sun/jndi/url/ldap/ldapURLContextFactory.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/url/ldap/ldapURLContextFactory.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/url/ldap/ldapURLContextFactory.java
diff --git a/jdk/src/share/classes/com/sun/jndi/url/ldaps/ldapsURLContextFactory.java b/jdk/src/java.naming/share/classes/com/sun/jndi/url/ldaps/ldapsURLContextFactory.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/url/ldaps/ldapsURLContextFactory.java
rename to jdk/src/java.naming/share/classes/com/sun/jndi/url/ldaps/ldapsURLContextFactory.java
diff --git a/jdk/src/share/classes/com/sun/naming/internal/FactoryEnumeration.java b/jdk/src/java.naming/share/classes/com/sun/naming/internal/FactoryEnumeration.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/naming/internal/FactoryEnumeration.java
rename to jdk/src/java.naming/share/classes/com/sun/naming/internal/FactoryEnumeration.java
diff --git a/jdk/src/share/classes/com/sun/naming/internal/NamedWeakReference.java b/jdk/src/java.naming/share/classes/com/sun/naming/internal/NamedWeakReference.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/naming/internal/NamedWeakReference.java
rename to jdk/src/java.naming/share/classes/com/sun/naming/internal/NamedWeakReference.java
diff --git a/jdk/src/share/classes/com/sun/naming/internal/ResourceManager.java b/jdk/src/java.naming/share/classes/com/sun/naming/internal/ResourceManager.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/naming/internal/ResourceManager.java
rename to jdk/src/java.naming/share/classes/com/sun/naming/internal/ResourceManager.java
diff --git a/jdk/src/share/classes/com/sun/naming/internal/VersionHelper.java b/jdk/src/java.naming/share/classes/com/sun/naming/internal/VersionHelper.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/naming/internal/VersionHelper.java
rename to jdk/src/java.naming/share/classes/com/sun/naming/internal/VersionHelper.java
diff --git a/jdk/src/share/classes/javax/naming/AuthenticationException.java b/jdk/src/java.naming/share/classes/javax/naming/AuthenticationException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/AuthenticationException.java
rename to jdk/src/java.naming/share/classes/javax/naming/AuthenticationException.java
diff --git a/jdk/src/share/classes/javax/naming/AuthenticationNotSupportedException.java b/jdk/src/java.naming/share/classes/javax/naming/AuthenticationNotSupportedException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/AuthenticationNotSupportedException.java
rename to jdk/src/java.naming/share/classes/javax/naming/AuthenticationNotSupportedException.java
diff --git a/jdk/src/share/classes/javax/naming/BinaryRefAddr.java b/jdk/src/java.naming/share/classes/javax/naming/BinaryRefAddr.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/BinaryRefAddr.java
rename to jdk/src/java.naming/share/classes/javax/naming/BinaryRefAddr.java
diff --git a/jdk/src/share/classes/javax/naming/Binding.java b/jdk/src/java.naming/share/classes/javax/naming/Binding.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/Binding.java
rename to jdk/src/java.naming/share/classes/javax/naming/Binding.java
diff --git a/jdk/src/share/classes/javax/naming/CannotProceedException.java b/jdk/src/java.naming/share/classes/javax/naming/CannotProceedException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/CannotProceedException.java
rename to jdk/src/java.naming/share/classes/javax/naming/CannotProceedException.java
diff --git a/jdk/src/share/classes/javax/naming/CommunicationException.java b/jdk/src/java.naming/share/classes/javax/naming/CommunicationException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/CommunicationException.java
rename to jdk/src/java.naming/share/classes/javax/naming/CommunicationException.java
diff --git a/jdk/src/share/classes/javax/naming/CompositeName.java b/jdk/src/java.naming/share/classes/javax/naming/CompositeName.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/CompositeName.java
rename to jdk/src/java.naming/share/classes/javax/naming/CompositeName.java
diff --git a/jdk/src/share/classes/javax/naming/CompoundName.java b/jdk/src/java.naming/share/classes/javax/naming/CompoundName.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/CompoundName.java
rename to jdk/src/java.naming/share/classes/javax/naming/CompoundName.java
diff --git a/jdk/src/share/classes/javax/naming/ConfigurationException.java b/jdk/src/java.naming/share/classes/javax/naming/ConfigurationException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/ConfigurationException.java
rename to jdk/src/java.naming/share/classes/javax/naming/ConfigurationException.java
diff --git a/jdk/src/share/classes/javax/naming/Context.java b/jdk/src/java.naming/share/classes/javax/naming/Context.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/Context.java
rename to jdk/src/java.naming/share/classes/javax/naming/Context.java
diff --git a/jdk/src/share/classes/javax/naming/ContextNotEmptyException.java b/jdk/src/java.naming/share/classes/javax/naming/ContextNotEmptyException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/ContextNotEmptyException.java
rename to jdk/src/java.naming/share/classes/javax/naming/ContextNotEmptyException.java
diff --git a/jdk/src/share/classes/javax/naming/InitialContext.java b/jdk/src/java.naming/share/classes/javax/naming/InitialContext.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/InitialContext.java
rename to jdk/src/java.naming/share/classes/javax/naming/InitialContext.java
diff --git a/jdk/src/share/classes/javax/naming/InsufficientResourcesException.java b/jdk/src/java.naming/share/classes/javax/naming/InsufficientResourcesException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/InsufficientResourcesException.java
rename to jdk/src/java.naming/share/classes/javax/naming/InsufficientResourcesException.java
diff --git a/jdk/src/share/classes/javax/naming/InterruptedNamingException.java b/jdk/src/java.naming/share/classes/javax/naming/InterruptedNamingException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/InterruptedNamingException.java
rename to jdk/src/java.naming/share/classes/javax/naming/InterruptedNamingException.java
diff --git a/jdk/src/share/classes/javax/naming/InvalidNameException.java b/jdk/src/java.naming/share/classes/javax/naming/InvalidNameException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/InvalidNameException.java
rename to jdk/src/java.naming/share/classes/javax/naming/InvalidNameException.java
diff --git a/jdk/src/share/classes/javax/naming/LimitExceededException.java b/jdk/src/java.naming/share/classes/javax/naming/LimitExceededException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/LimitExceededException.java
rename to jdk/src/java.naming/share/classes/javax/naming/LimitExceededException.java
diff --git a/jdk/src/share/classes/javax/naming/LinkException.java b/jdk/src/java.naming/share/classes/javax/naming/LinkException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/LinkException.java
rename to jdk/src/java.naming/share/classes/javax/naming/LinkException.java
diff --git a/jdk/src/share/classes/javax/naming/LinkLoopException.java b/jdk/src/java.naming/share/classes/javax/naming/LinkLoopException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/LinkLoopException.java
rename to jdk/src/java.naming/share/classes/javax/naming/LinkLoopException.java
diff --git a/jdk/src/share/classes/javax/naming/LinkRef.java b/jdk/src/java.naming/share/classes/javax/naming/LinkRef.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/LinkRef.java
rename to jdk/src/java.naming/share/classes/javax/naming/LinkRef.java
diff --git a/jdk/src/share/classes/javax/naming/MalformedLinkException.java b/jdk/src/java.naming/share/classes/javax/naming/MalformedLinkException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/MalformedLinkException.java
rename to jdk/src/java.naming/share/classes/javax/naming/MalformedLinkException.java
diff --git a/jdk/src/share/classes/javax/naming/Name.java b/jdk/src/java.naming/share/classes/javax/naming/Name.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/Name.java
rename to jdk/src/java.naming/share/classes/javax/naming/Name.java
diff --git a/jdk/src/share/classes/javax/naming/NameAlreadyBoundException.java b/jdk/src/java.naming/share/classes/javax/naming/NameAlreadyBoundException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/NameAlreadyBoundException.java
rename to jdk/src/java.naming/share/classes/javax/naming/NameAlreadyBoundException.java
diff --git a/jdk/src/share/classes/javax/naming/NameClassPair.java b/jdk/src/java.naming/share/classes/javax/naming/NameClassPair.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/NameClassPair.java
rename to jdk/src/java.naming/share/classes/javax/naming/NameClassPair.java
diff --git a/jdk/src/share/classes/javax/naming/NameImpl.java b/jdk/src/java.naming/share/classes/javax/naming/NameImpl.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/NameImpl.java
rename to jdk/src/java.naming/share/classes/javax/naming/NameImpl.java
diff --git a/jdk/src/share/classes/javax/naming/NameNotFoundException.java b/jdk/src/java.naming/share/classes/javax/naming/NameNotFoundException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/NameNotFoundException.java
rename to jdk/src/java.naming/share/classes/javax/naming/NameNotFoundException.java
diff --git a/jdk/src/share/classes/javax/naming/NameParser.java b/jdk/src/java.naming/share/classes/javax/naming/NameParser.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/NameParser.java
rename to jdk/src/java.naming/share/classes/javax/naming/NameParser.java
diff --git a/jdk/src/share/classes/javax/naming/NamingEnumeration.java b/jdk/src/java.naming/share/classes/javax/naming/NamingEnumeration.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/NamingEnumeration.java
rename to jdk/src/java.naming/share/classes/javax/naming/NamingEnumeration.java
diff --git a/jdk/src/share/classes/javax/naming/NamingException.java b/jdk/src/java.naming/share/classes/javax/naming/NamingException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/NamingException.java
rename to jdk/src/java.naming/share/classes/javax/naming/NamingException.java
diff --git a/jdk/src/share/classes/javax/naming/NamingSecurityException.java b/jdk/src/java.naming/share/classes/javax/naming/NamingSecurityException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/NamingSecurityException.java
rename to jdk/src/java.naming/share/classes/javax/naming/NamingSecurityException.java
diff --git a/jdk/src/share/classes/javax/naming/NoInitialContextException.java b/jdk/src/java.naming/share/classes/javax/naming/NoInitialContextException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/NoInitialContextException.java
rename to jdk/src/java.naming/share/classes/javax/naming/NoInitialContextException.java
diff --git a/jdk/src/share/classes/javax/naming/NoPermissionException.java b/jdk/src/java.naming/share/classes/javax/naming/NoPermissionException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/NoPermissionException.java
rename to jdk/src/java.naming/share/classes/javax/naming/NoPermissionException.java
diff --git a/jdk/src/share/classes/javax/naming/NotContextException.java b/jdk/src/java.naming/share/classes/javax/naming/NotContextException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/NotContextException.java
rename to jdk/src/java.naming/share/classes/javax/naming/NotContextException.java
diff --git a/jdk/src/share/classes/javax/naming/OperationNotSupportedException.java b/jdk/src/java.naming/share/classes/javax/naming/OperationNotSupportedException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/OperationNotSupportedException.java
rename to jdk/src/java.naming/share/classes/javax/naming/OperationNotSupportedException.java
diff --git a/jdk/src/share/classes/javax/naming/PartialResultException.java b/jdk/src/java.naming/share/classes/javax/naming/PartialResultException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/PartialResultException.java
rename to jdk/src/java.naming/share/classes/javax/naming/PartialResultException.java
diff --git a/jdk/src/share/classes/javax/naming/RefAddr.java b/jdk/src/java.naming/share/classes/javax/naming/RefAddr.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/RefAddr.java
rename to jdk/src/java.naming/share/classes/javax/naming/RefAddr.java
diff --git a/jdk/src/share/classes/javax/naming/Reference.java b/jdk/src/java.naming/share/classes/javax/naming/Reference.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/Reference.java
rename to jdk/src/java.naming/share/classes/javax/naming/Reference.java
diff --git a/jdk/src/share/classes/javax/naming/Referenceable.java b/jdk/src/java.naming/share/classes/javax/naming/Referenceable.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/Referenceable.java
rename to jdk/src/java.naming/share/classes/javax/naming/Referenceable.java
diff --git a/jdk/src/share/classes/javax/naming/ReferralException.java b/jdk/src/java.naming/share/classes/javax/naming/ReferralException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/ReferralException.java
rename to jdk/src/java.naming/share/classes/javax/naming/ReferralException.java
diff --git a/jdk/src/share/classes/javax/naming/ServiceUnavailableException.java b/jdk/src/java.naming/share/classes/javax/naming/ServiceUnavailableException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/ServiceUnavailableException.java
rename to jdk/src/java.naming/share/classes/javax/naming/ServiceUnavailableException.java
diff --git a/jdk/src/share/classes/javax/naming/SizeLimitExceededException.java b/jdk/src/java.naming/share/classes/javax/naming/SizeLimitExceededException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/SizeLimitExceededException.java
rename to jdk/src/java.naming/share/classes/javax/naming/SizeLimitExceededException.java
diff --git a/jdk/src/share/classes/javax/naming/StringRefAddr.java b/jdk/src/java.naming/share/classes/javax/naming/StringRefAddr.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/StringRefAddr.java
rename to jdk/src/java.naming/share/classes/javax/naming/StringRefAddr.java
diff --git a/jdk/src/share/classes/javax/naming/TimeLimitExceededException.java b/jdk/src/java.naming/share/classes/javax/naming/TimeLimitExceededException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/TimeLimitExceededException.java
rename to jdk/src/java.naming/share/classes/javax/naming/TimeLimitExceededException.java
diff --git a/jdk/src/share/classes/javax/naming/directory/Attribute.java b/jdk/src/java.naming/share/classes/javax/naming/directory/Attribute.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/directory/Attribute.java
rename to jdk/src/java.naming/share/classes/javax/naming/directory/Attribute.java
diff --git a/jdk/src/share/classes/javax/naming/directory/AttributeInUseException.java b/jdk/src/java.naming/share/classes/javax/naming/directory/AttributeInUseException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/directory/AttributeInUseException.java
rename to jdk/src/java.naming/share/classes/javax/naming/directory/AttributeInUseException.java
diff --git a/jdk/src/share/classes/javax/naming/directory/AttributeModificationException.java b/jdk/src/java.naming/share/classes/javax/naming/directory/AttributeModificationException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/directory/AttributeModificationException.java
rename to jdk/src/java.naming/share/classes/javax/naming/directory/AttributeModificationException.java
diff --git a/jdk/src/share/classes/javax/naming/directory/Attributes.java b/jdk/src/java.naming/share/classes/javax/naming/directory/Attributes.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/directory/Attributes.java
rename to jdk/src/java.naming/share/classes/javax/naming/directory/Attributes.java
diff --git a/jdk/src/share/classes/javax/naming/directory/BasicAttribute.java b/jdk/src/java.naming/share/classes/javax/naming/directory/BasicAttribute.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/directory/BasicAttribute.java
rename to jdk/src/java.naming/share/classes/javax/naming/directory/BasicAttribute.java
diff --git a/jdk/src/share/classes/javax/naming/directory/BasicAttributes.java b/jdk/src/java.naming/share/classes/javax/naming/directory/BasicAttributes.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/directory/BasicAttributes.java
rename to jdk/src/java.naming/share/classes/javax/naming/directory/BasicAttributes.java
diff --git a/jdk/src/share/classes/javax/naming/directory/DirContext.java b/jdk/src/java.naming/share/classes/javax/naming/directory/DirContext.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/directory/DirContext.java
rename to jdk/src/java.naming/share/classes/javax/naming/directory/DirContext.java
diff --git a/jdk/src/share/classes/javax/naming/directory/InitialDirContext.java b/jdk/src/java.naming/share/classes/javax/naming/directory/InitialDirContext.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/directory/InitialDirContext.java
rename to jdk/src/java.naming/share/classes/javax/naming/directory/InitialDirContext.java
diff --git a/jdk/src/share/classes/javax/naming/directory/InvalidAttributeIdentifierException.java b/jdk/src/java.naming/share/classes/javax/naming/directory/InvalidAttributeIdentifierException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/directory/InvalidAttributeIdentifierException.java
rename to jdk/src/java.naming/share/classes/javax/naming/directory/InvalidAttributeIdentifierException.java
diff --git a/jdk/src/share/classes/javax/naming/directory/InvalidAttributeValueException.java b/jdk/src/java.naming/share/classes/javax/naming/directory/InvalidAttributeValueException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/directory/InvalidAttributeValueException.java
rename to jdk/src/java.naming/share/classes/javax/naming/directory/InvalidAttributeValueException.java
diff --git a/jdk/src/share/classes/javax/naming/directory/InvalidAttributesException.java b/jdk/src/java.naming/share/classes/javax/naming/directory/InvalidAttributesException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/directory/InvalidAttributesException.java
rename to jdk/src/java.naming/share/classes/javax/naming/directory/InvalidAttributesException.java
diff --git a/jdk/src/share/classes/javax/naming/directory/InvalidSearchControlsException.java b/jdk/src/java.naming/share/classes/javax/naming/directory/InvalidSearchControlsException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/directory/InvalidSearchControlsException.java
rename to jdk/src/java.naming/share/classes/javax/naming/directory/InvalidSearchControlsException.java
diff --git a/jdk/src/share/classes/javax/naming/directory/InvalidSearchFilterException.java b/jdk/src/java.naming/share/classes/javax/naming/directory/InvalidSearchFilterException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/directory/InvalidSearchFilterException.java
rename to jdk/src/java.naming/share/classes/javax/naming/directory/InvalidSearchFilterException.java
diff --git a/jdk/src/share/classes/javax/naming/directory/ModificationItem.java b/jdk/src/java.naming/share/classes/javax/naming/directory/ModificationItem.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/directory/ModificationItem.java
rename to jdk/src/java.naming/share/classes/javax/naming/directory/ModificationItem.java
diff --git a/jdk/src/share/classes/javax/naming/directory/NoSuchAttributeException.java b/jdk/src/java.naming/share/classes/javax/naming/directory/NoSuchAttributeException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/directory/NoSuchAttributeException.java
rename to jdk/src/java.naming/share/classes/javax/naming/directory/NoSuchAttributeException.java
diff --git a/jdk/src/share/classes/javax/naming/directory/SchemaViolationException.java b/jdk/src/java.naming/share/classes/javax/naming/directory/SchemaViolationException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/directory/SchemaViolationException.java
rename to jdk/src/java.naming/share/classes/javax/naming/directory/SchemaViolationException.java
diff --git a/jdk/src/share/classes/javax/naming/directory/SearchControls.java b/jdk/src/java.naming/share/classes/javax/naming/directory/SearchControls.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/directory/SearchControls.java
rename to jdk/src/java.naming/share/classes/javax/naming/directory/SearchControls.java
diff --git a/jdk/src/share/classes/javax/naming/directory/SearchResult.java b/jdk/src/java.naming/share/classes/javax/naming/directory/SearchResult.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/directory/SearchResult.java
rename to jdk/src/java.naming/share/classes/javax/naming/directory/SearchResult.java
diff --git a/jdk/src/share/classes/javax/naming/directory/package.html b/jdk/src/java.naming/share/classes/javax/naming/directory/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/naming/directory/package.html
rename to jdk/src/java.naming/share/classes/javax/naming/directory/package.html
diff --git a/jdk/src/share/classes/javax/naming/event/EventContext.java b/jdk/src/java.naming/share/classes/javax/naming/event/EventContext.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/event/EventContext.java
rename to jdk/src/java.naming/share/classes/javax/naming/event/EventContext.java
diff --git a/jdk/src/share/classes/javax/naming/event/EventDirContext.java b/jdk/src/java.naming/share/classes/javax/naming/event/EventDirContext.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/event/EventDirContext.java
rename to jdk/src/java.naming/share/classes/javax/naming/event/EventDirContext.java
diff --git a/jdk/src/share/classes/javax/naming/event/NamespaceChangeListener.java b/jdk/src/java.naming/share/classes/javax/naming/event/NamespaceChangeListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/event/NamespaceChangeListener.java
rename to jdk/src/java.naming/share/classes/javax/naming/event/NamespaceChangeListener.java
diff --git a/jdk/src/share/classes/javax/naming/event/NamingEvent.java b/jdk/src/java.naming/share/classes/javax/naming/event/NamingEvent.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/event/NamingEvent.java
rename to jdk/src/java.naming/share/classes/javax/naming/event/NamingEvent.java
diff --git a/jdk/src/share/classes/javax/naming/event/NamingExceptionEvent.java b/jdk/src/java.naming/share/classes/javax/naming/event/NamingExceptionEvent.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/event/NamingExceptionEvent.java
rename to jdk/src/java.naming/share/classes/javax/naming/event/NamingExceptionEvent.java
diff --git a/jdk/src/share/classes/javax/naming/event/NamingListener.java b/jdk/src/java.naming/share/classes/javax/naming/event/NamingListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/event/NamingListener.java
rename to jdk/src/java.naming/share/classes/javax/naming/event/NamingListener.java
diff --git a/jdk/src/share/classes/javax/naming/event/ObjectChangeListener.java b/jdk/src/java.naming/share/classes/javax/naming/event/ObjectChangeListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/event/ObjectChangeListener.java
rename to jdk/src/java.naming/share/classes/javax/naming/event/ObjectChangeListener.java
diff --git a/jdk/src/share/classes/javax/naming/event/package.html b/jdk/src/java.naming/share/classes/javax/naming/event/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/naming/event/package.html
rename to jdk/src/java.naming/share/classes/javax/naming/event/package.html
diff --git a/jdk/src/share/classes/javax/naming/ldap/BasicControl.java b/jdk/src/java.naming/share/classes/javax/naming/ldap/BasicControl.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/ldap/BasicControl.java
rename to jdk/src/java.naming/share/classes/javax/naming/ldap/BasicControl.java
diff --git a/jdk/src/share/classes/javax/naming/ldap/Control.java b/jdk/src/java.naming/share/classes/javax/naming/ldap/Control.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/ldap/Control.java
rename to jdk/src/java.naming/share/classes/javax/naming/ldap/Control.java
diff --git a/jdk/src/share/classes/javax/naming/ldap/ControlFactory.java b/jdk/src/java.naming/share/classes/javax/naming/ldap/ControlFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/ldap/ControlFactory.java
rename to jdk/src/java.naming/share/classes/javax/naming/ldap/ControlFactory.java
diff --git a/jdk/src/share/classes/javax/naming/ldap/ExtendedRequest.java b/jdk/src/java.naming/share/classes/javax/naming/ldap/ExtendedRequest.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/ldap/ExtendedRequest.java
rename to jdk/src/java.naming/share/classes/javax/naming/ldap/ExtendedRequest.java
diff --git a/jdk/src/share/classes/javax/naming/ldap/ExtendedResponse.java b/jdk/src/java.naming/share/classes/javax/naming/ldap/ExtendedResponse.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/ldap/ExtendedResponse.java
rename to jdk/src/java.naming/share/classes/javax/naming/ldap/ExtendedResponse.java
diff --git a/jdk/src/share/classes/javax/naming/ldap/HasControls.java b/jdk/src/java.naming/share/classes/javax/naming/ldap/HasControls.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/ldap/HasControls.java
rename to jdk/src/java.naming/share/classes/javax/naming/ldap/HasControls.java
diff --git a/jdk/src/share/classes/javax/naming/ldap/InitialLdapContext.java b/jdk/src/java.naming/share/classes/javax/naming/ldap/InitialLdapContext.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/ldap/InitialLdapContext.java
rename to jdk/src/java.naming/share/classes/javax/naming/ldap/InitialLdapContext.java
diff --git a/jdk/src/share/classes/javax/naming/ldap/LdapContext.java b/jdk/src/java.naming/share/classes/javax/naming/ldap/LdapContext.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/ldap/LdapContext.java
rename to jdk/src/java.naming/share/classes/javax/naming/ldap/LdapContext.java
diff --git a/jdk/src/share/classes/javax/naming/ldap/LdapName.java b/jdk/src/java.naming/share/classes/javax/naming/ldap/LdapName.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/ldap/LdapName.java
rename to jdk/src/java.naming/share/classes/javax/naming/ldap/LdapName.java
diff --git a/jdk/src/share/classes/javax/naming/ldap/LdapReferralException.java b/jdk/src/java.naming/share/classes/javax/naming/ldap/LdapReferralException.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/ldap/LdapReferralException.java
rename to jdk/src/java.naming/share/classes/javax/naming/ldap/LdapReferralException.java
diff --git a/jdk/src/share/classes/javax/naming/ldap/ManageReferralControl.java b/jdk/src/java.naming/share/classes/javax/naming/ldap/ManageReferralControl.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/ldap/ManageReferralControl.java
rename to jdk/src/java.naming/share/classes/javax/naming/ldap/ManageReferralControl.java
diff --git a/jdk/src/share/classes/javax/naming/ldap/PagedResultsControl.java b/jdk/src/java.naming/share/classes/javax/naming/ldap/PagedResultsControl.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/ldap/PagedResultsControl.java
rename to jdk/src/java.naming/share/classes/javax/naming/ldap/PagedResultsControl.java
diff --git a/jdk/src/share/classes/javax/naming/ldap/PagedResultsResponseControl.java b/jdk/src/java.naming/share/classes/javax/naming/ldap/PagedResultsResponseControl.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/ldap/PagedResultsResponseControl.java
rename to jdk/src/java.naming/share/classes/javax/naming/ldap/PagedResultsResponseControl.java
diff --git a/jdk/src/share/classes/javax/naming/ldap/Rdn.java b/jdk/src/java.naming/share/classes/javax/naming/ldap/Rdn.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/ldap/Rdn.java
rename to jdk/src/java.naming/share/classes/javax/naming/ldap/Rdn.java
diff --git a/jdk/src/share/classes/javax/naming/ldap/Rfc2253Parser.java b/jdk/src/java.naming/share/classes/javax/naming/ldap/Rfc2253Parser.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/ldap/Rfc2253Parser.java
rename to jdk/src/java.naming/share/classes/javax/naming/ldap/Rfc2253Parser.java
diff --git a/jdk/src/share/classes/javax/naming/ldap/SortControl.java b/jdk/src/java.naming/share/classes/javax/naming/ldap/SortControl.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/ldap/SortControl.java
rename to jdk/src/java.naming/share/classes/javax/naming/ldap/SortControl.java
diff --git a/jdk/src/share/classes/javax/naming/ldap/SortKey.java b/jdk/src/java.naming/share/classes/javax/naming/ldap/SortKey.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/ldap/SortKey.java
rename to jdk/src/java.naming/share/classes/javax/naming/ldap/SortKey.java
diff --git a/jdk/src/share/classes/javax/naming/ldap/SortResponseControl.java b/jdk/src/java.naming/share/classes/javax/naming/ldap/SortResponseControl.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/ldap/SortResponseControl.java
rename to jdk/src/java.naming/share/classes/javax/naming/ldap/SortResponseControl.java
diff --git a/jdk/src/share/classes/javax/naming/ldap/StartTlsRequest.java b/jdk/src/java.naming/share/classes/javax/naming/ldap/StartTlsRequest.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/ldap/StartTlsRequest.java
rename to jdk/src/java.naming/share/classes/javax/naming/ldap/StartTlsRequest.java
diff --git a/jdk/src/share/classes/javax/naming/ldap/StartTlsResponse.java b/jdk/src/java.naming/share/classes/javax/naming/ldap/StartTlsResponse.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/ldap/StartTlsResponse.java
rename to jdk/src/java.naming/share/classes/javax/naming/ldap/StartTlsResponse.java
diff --git a/jdk/src/share/classes/javax/naming/ldap/UnsolicitedNotification.java b/jdk/src/java.naming/share/classes/javax/naming/ldap/UnsolicitedNotification.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/ldap/UnsolicitedNotification.java
rename to jdk/src/java.naming/share/classes/javax/naming/ldap/UnsolicitedNotification.java
diff --git a/jdk/src/share/classes/javax/naming/ldap/UnsolicitedNotificationEvent.java b/jdk/src/java.naming/share/classes/javax/naming/ldap/UnsolicitedNotificationEvent.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/ldap/UnsolicitedNotificationEvent.java
rename to jdk/src/java.naming/share/classes/javax/naming/ldap/UnsolicitedNotificationEvent.java
diff --git a/jdk/src/share/classes/javax/naming/ldap/UnsolicitedNotificationListener.java b/jdk/src/java.naming/share/classes/javax/naming/ldap/UnsolicitedNotificationListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/ldap/UnsolicitedNotificationListener.java
rename to jdk/src/java.naming/share/classes/javax/naming/ldap/UnsolicitedNotificationListener.java
diff --git a/jdk/src/share/classes/javax/naming/ldap/package.html b/jdk/src/java.naming/share/classes/javax/naming/ldap/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/naming/ldap/package.html
rename to jdk/src/java.naming/share/classes/javax/naming/ldap/package.html
diff --git a/jdk/src/share/classes/javax/naming/package.html b/jdk/src/java.naming/share/classes/javax/naming/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/naming/package.html
rename to jdk/src/java.naming/share/classes/javax/naming/package.html
diff --git a/jdk/src/share/classes/javax/naming/spi/ContinuationContext.java b/jdk/src/java.naming/share/classes/javax/naming/spi/ContinuationContext.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/spi/ContinuationContext.java
rename to jdk/src/java.naming/share/classes/javax/naming/spi/ContinuationContext.java
diff --git a/jdk/src/share/classes/javax/naming/spi/ContinuationDirContext.java b/jdk/src/java.naming/share/classes/javax/naming/spi/ContinuationDirContext.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/spi/ContinuationDirContext.java
rename to jdk/src/java.naming/share/classes/javax/naming/spi/ContinuationDirContext.java
diff --git a/jdk/src/share/classes/javax/naming/spi/DirObjectFactory.java b/jdk/src/java.naming/share/classes/javax/naming/spi/DirObjectFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/spi/DirObjectFactory.java
rename to jdk/src/java.naming/share/classes/javax/naming/spi/DirObjectFactory.java
diff --git a/jdk/src/share/classes/javax/naming/spi/DirStateFactory.java b/jdk/src/java.naming/share/classes/javax/naming/spi/DirStateFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/spi/DirStateFactory.java
rename to jdk/src/java.naming/share/classes/javax/naming/spi/DirStateFactory.java
diff --git a/jdk/src/share/classes/javax/naming/spi/DirectoryManager.java b/jdk/src/java.naming/share/classes/javax/naming/spi/DirectoryManager.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/spi/DirectoryManager.java
rename to jdk/src/java.naming/share/classes/javax/naming/spi/DirectoryManager.java
diff --git a/jdk/src/share/classes/javax/naming/spi/InitialContextFactory.java b/jdk/src/java.naming/share/classes/javax/naming/spi/InitialContextFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/spi/InitialContextFactory.java
rename to jdk/src/java.naming/share/classes/javax/naming/spi/InitialContextFactory.java
diff --git a/jdk/src/share/classes/javax/naming/spi/InitialContextFactoryBuilder.java b/jdk/src/java.naming/share/classes/javax/naming/spi/InitialContextFactoryBuilder.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/spi/InitialContextFactoryBuilder.java
rename to jdk/src/java.naming/share/classes/javax/naming/spi/InitialContextFactoryBuilder.java
diff --git a/jdk/src/share/classes/javax/naming/spi/NamingManager.java b/jdk/src/java.naming/share/classes/javax/naming/spi/NamingManager.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/spi/NamingManager.java
rename to jdk/src/java.naming/share/classes/javax/naming/spi/NamingManager.java
diff --git a/jdk/src/share/classes/javax/naming/spi/ObjectFactory.java b/jdk/src/java.naming/share/classes/javax/naming/spi/ObjectFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/spi/ObjectFactory.java
rename to jdk/src/java.naming/share/classes/javax/naming/spi/ObjectFactory.java
diff --git a/jdk/src/share/classes/javax/naming/spi/ObjectFactoryBuilder.java b/jdk/src/java.naming/share/classes/javax/naming/spi/ObjectFactoryBuilder.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/spi/ObjectFactoryBuilder.java
rename to jdk/src/java.naming/share/classes/javax/naming/spi/ObjectFactoryBuilder.java
diff --git a/jdk/src/share/classes/javax/naming/spi/ResolveResult.java b/jdk/src/java.naming/share/classes/javax/naming/spi/ResolveResult.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/spi/ResolveResult.java
rename to jdk/src/java.naming/share/classes/javax/naming/spi/ResolveResult.java
diff --git a/jdk/src/share/classes/javax/naming/spi/Resolver.java b/jdk/src/java.naming/share/classes/javax/naming/spi/Resolver.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/spi/Resolver.java
rename to jdk/src/java.naming/share/classes/javax/naming/spi/Resolver.java
diff --git a/jdk/src/share/classes/javax/naming/spi/StateFactory.java b/jdk/src/java.naming/share/classes/javax/naming/spi/StateFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/naming/spi/StateFactory.java
rename to jdk/src/java.naming/share/classes/javax/naming/spi/StateFactory.java
diff --git a/jdk/src/share/classes/javax/naming/spi/package.html b/jdk/src/java.naming/share/classes/javax/naming/spi/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/naming/spi/package.html
rename to jdk/src/java.naming/share/classes/javax/naming/spi/package.html
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStore.java b/jdk/src/java.naming/share/classes/sun/security/provider/certpath/ldap/LDAPCertStore.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStore.java
rename to jdk/src/java.naming/share/classes/sun/security/provider/certpath/ldap/LDAPCertStore.java
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStoreHelper.java b/jdk/src/java.naming/share/classes/sun/security/provider/certpath/ldap/LDAPCertStoreHelper.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStoreHelper.java
rename to jdk/src/java.naming/share/classes/sun/security/provider/certpath/ldap/LDAPCertStoreHelper.java
diff --git a/jdk/src/macosx/classes/java/util/prefs/MacOSXPreferences.java b/jdk/src/java.prefs/macosx/classes/java/util/prefs/MacOSXPreferences.java
similarity index 100%
rename from jdk/src/macosx/classes/java/util/prefs/MacOSXPreferences.java
rename to jdk/src/java.prefs/macosx/classes/java/util/prefs/MacOSXPreferences.java
diff --git a/jdk/src/macosx/classes/java/util/prefs/MacOSXPreferencesFactory.java b/jdk/src/java.prefs/macosx/classes/java/util/prefs/MacOSXPreferencesFactory.java
similarity index 100%
rename from jdk/src/macosx/classes/java/util/prefs/MacOSXPreferencesFactory.java
rename to jdk/src/java.prefs/macosx/classes/java/util/prefs/MacOSXPreferencesFactory.java
diff --git a/jdk/src/macosx/classes/java/util/prefs/MacOSXPreferencesFile.java b/jdk/src/java.prefs/macosx/classes/java/util/prefs/MacOSXPreferencesFile.java
similarity index 100%
rename from jdk/src/macosx/classes/java/util/prefs/MacOSXPreferencesFile.java
rename to jdk/src/java.prefs/macosx/classes/java/util/prefs/MacOSXPreferencesFile.java
diff --git a/jdk/src/macosx/native/java/util/prefs/MacOSXPreferencesFile.m b/jdk/src/java.prefs/macosx/native/libprefs/MacOSXPreferencesFile.m
similarity index 100%
rename from jdk/src/macosx/native/java/util/prefs/MacOSXPreferencesFile.m
rename to jdk/src/java.prefs/macosx/native/libprefs/MacOSXPreferencesFile.m
diff --git a/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java b/jdk/src/java.prefs/share/classes/java/util/prefs/AbstractPreferences.java
similarity index 100%
rename from jdk/src/share/classes/java/util/prefs/AbstractPreferences.java
rename to jdk/src/java.prefs/share/classes/java/util/prefs/AbstractPreferences.java
diff --git a/jdk/src/share/classes/java/util/prefs/BackingStoreException.java b/jdk/src/java.prefs/share/classes/java/util/prefs/BackingStoreException.java
similarity index 100%
rename from jdk/src/share/classes/java/util/prefs/BackingStoreException.java
rename to jdk/src/java.prefs/share/classes/java/util/prefs/BackingStoreException.java
diff --git a/jdk/src/share/classes/java/util/prefs/Base64.java b/jdk/src/java.prefs/share/classes/java/util/prefs/Base64.java
similarity index 100%
rename from jdk/src/share/classes/java/util/prefs/Base64.java
rename to jdk/src/java.prefs/share/classes/java/util/prefs/Base64.java
diff --git a/jdk/src/share/classes/java/util/prefs/InvalidPreferencesFormatException.java b/jdk/src/java.prefs/share/classes/java/util/prefs/InvalidPreferencesFormatException.java
similarity index 100%
rename from jdk/src/share/classes/java/util/prefs/InvalidPreferencesFormatException.java
rename to jdk/src/java.prefs/share/classes/java/util/prefs/InvalidPreferencesFormatException.java
diff --git a/jdk/src/share/classes/java/util/prefs/NodeChangeEvent.java b/jdk/src/java.prefs/share/classes/java/util/prefs/NodeChangeEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/util/prefs/NodeChangeEvent.java
rename to jdk/src/java.prefs/share/classes/java/util/prefs/NodeChangeEvent.java
diff --git a/jdk/src/share/classes/java/util/prefs/NodeChangeListener.java b/jdk/src/java.prefs/share/classes/java/util/prefs/NodeChangeListener.java
similarity index 100%
rename from jdk/src/share/classes/java/util/prefs/NodeChangeListener.java
rename to jdk/src/java.prefs/share/classes/java/util/prefs/NodeChangeListener.java
diff --git a/jdk/src/share/classes/java/util/prefs/PreferenceChangeEvent.java b/jdk/src/java.prefs/share/classes/java/util/prefs/PreferenceChangeEvent.java
similarity index 100%
rename from jdk/src/share/classes/java/util/prefs/PreferenceChangeEvent.java
rename to jdk/src/java.prefs/share/classes/java/util/prefs/PreferenceChangeEvent.java
diff --git a/jdk/src/share/classes/java/util/prefs/PreferenceChangeListener.java b/jdk/src/java.prefs/share/classes/java/util/prefs/PreferenceChangeListener.java
similarity index 100%
rename from jdk/src/share/classes/java/util/prefs/PreferenceChangeListener.java
rename to jdk/src/java.prefs/share/classes/java/util/prefs/PreferenceChangeListener.java
diff --git a/jdk/src/share/classes/java/util/prefs/Preferences.java b/jdk/src/java.prefs/share/classes/java/util/prefs/Preferences.java
similarity index 100%
rename from jdk/src/share/classes/java/util/prefs/Preferences.java
rename to jdk/src/java.prefs/share/classes/java/util/prefs/Preferences.java
diff --git a/jdk/src/share/classes/java/util/prefs/PreferencesFactory.java b/jdk/src/java.prefs/share/classes/java/util/prefs/PreferencesFactory.java
similarity index 100%
rename from jdk/src/share/classes/java/util/prefs/PreferencesFactory.java
rename to jdk/src/java.prefs/share/classes/java/util/prefs/PreferencesFactory.java
diff --git a/jdk/src/share/classes/java/util/prefs/XmlSupport.java b/jdk/src/java.prefs/share/classes/java/util/prefs/XmlSupport.java
similarity index 100%
rename from jdk/src/share/classes/java/util/prefs/XmlSupport.java
rename to jdk/src/java.prefs/share/classes/java/util/prefs/XmlSupport.java
diff --git a/jdk/src/share/classes/java/util/prefs/package.html b/jdk/src/java.prefs/share/classes/java/util/prefs/package.html
similarity index 100%
rename from jdk/src/share/classes/java/util/prefs/package.html
rename to jdk/src/java.prefs/share/classes/java/util/prefs/package.html
diff --git a/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java b/jdk/src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferences.java
similarity index 100%
rename from jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java
rename to jdk/src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferences.java
diff --git a/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferencesFactory.java b/jdk/src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferencesFactory.java
similarity index 100%
rename from jdk/src/solaris/classes/java/util/prefs/FileSystemPreferencesFactory.java
rename to jdk/src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferencesFactory.java
diff --git a/jdk/src/solaris/native/java/util/prefs/FileSystemPreferences.c b/jdk/src/java.prefs/unix/native/libprefs/FileSystemPreferences.c
similarity index 100%
rename from jdk/src/solaris/native/java/util/prefs/FileSystemPreferences.c
rename to jdk/src/java.prefs/unix/native/libprefs/FileSystemPreferences.c
diff --git a/jdk/src/windows/classes/java/util/prefs/WindowsPreferences.java b/jdk/src/java.prefs/windows/classes/java/util/prefs/WindowsPreferences.java
similarity index 100%
rename from jdk/src/windows/classes/java/util/prefs/WindowsPreferences.java
rename to jdk/src/java.prefs/windows/classes/java/util/prefs/WindowsPreferences.java
diff --git a/jdk/src/windows/classes/java/util/prefs/WindowsPreferencesFactory.java b/jdk/src/java.prefs/windows/classes/java/util/prefs/WindowsPreferencesFactory.java
similarity index 100%
rename from jdk/src/windows/classes/java/util/prefs/WindowsPreferencesFactory.java
rename to jdk/src/java.prefs/windows/classes/java/util/prefs/WindowsPreferencesFactory.java
diff --git a/jdk/src/windows/native/java/util/prefs/WindowsPreferences.c b/jdk/src/java.prefs/windows/native/libprefs/WindowsPreferences.c
similarity index 100%
rename from jdk/src/windows/native/java/util/prefs/WindowsPreferences.c
rename to jdk/src/java.prefs/windows/native/libprefs/WindowsPreferences.c
diff --git a/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java b/jdk/src/java.rmi/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java
rename to jdk/src/java.rmi/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java
diff --git a/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java b/jdk/src/java.rmi/share/classes/com/sun/rmi/rmid/ExecPermission.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java
rename to jdk/src/java.rmi/share/classes/com/sun/rmi/rmid/ExecPermission.java
diff --git a/jdk/src/share/classes/java/rmi/AccessException.java b/jdk/src/java.rmi/share/classes/java/rmi/AccessException.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/AccessException.java
rename to jdk/src/java.rmi/share/classes/java/rmi/AccessException.java
diff --git a/jdk/src/share/classes/java/rmi/AlreadyBoundException.java b/jdk/src/java.rmi/share/classes/java/rmi/AlreadyBoundException.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/AlreadyBoundException.java
rename to jdk/src/java.rmi/share/classes/java/rmi/AlreadyBoundException.java
diff --git a/jdk/src/share/classes/java/rmi/ConnectException.java b/jdk/src/java.rmi/share/classes/java/rmi/ConnectException.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/ConnectException.java
rename to jdk/src/java.rmi/share/classes/java/rmi/ConnectException.java
diff --git a/jdk/src/share/classes/java/rmi/ConnectIOException.java b/jdk/src/java.rmi/share/classes/java/rmi/ConnectIOException.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/ConnectIOException.java
rename to jdk/src/java.rmi/share/classes/java/rmi/ConnectIOException.java
diff --git a/jdk/src/share/classes/java/rmi/MarshalException.java b/jdk/src/java.rmi/share/classes/java/rmi/MarshalException.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/MarshalException.java
rename to jdk/src/java.rmi/share/classes/java/rmi/MarshalException.java
diff --git a/jdk/src/share/classes/java/rmi/MarshalledObject.java b/jdk/src/java.rmi/share/classes/java/rmi/MarshalledObject.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/MarshalledObject.java
rename to jdk/src/java.rmi/share/classes/java/rmi/MarshalledObject.java
diff --git a/jdk/src/share/classes/java/rmi/Naming.java b/jdk/src/java.rmi/share/classes/java/rmi/Naming.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/Naming.java
rename to jdk/src/java.rmi/share/classes/java/rmi/Naming.java
diff --git a/jdk/src/share/classes/java/rmi/NoSuchObjectException.java b/jdk/src/java.rmi/share/classes/java/rmi/NoSuchObjectException.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/NoSuchObjectException.java
rename to jdk/src/java.rmi/share/classes/java/rmi/NoSuchObjectException.java
diff --git a/jdk/src/share/classes/java/rmi/NotBoundException.java b/jdk/src/java.rmi/share/classes/java/rmi/NotBoundException.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/NotBoundException.java
rename to jdk/src/java.rmi/share/classes/java/rmi/NotBoundException.java
diff --git a/jdk/src/share/classes/java/rmi/RMISecurityException.java b/jdk/src/java.rmi/share/classes/java/rmi/RMISecurityException.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/RMISecurityException.java
rename to jdk/src/java.rmi/share/classes/java/rmi/RMISecurityException.java
diff --git a/jdk/src/share/classes/java/rmi/RMISecurityManager.java b/jdk/src/java.rmi/share/classes/java/rmi/RMISecurityManager.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/RMISecurityManager.java
rename to jdk/src/java.rmi/share/classes/java/rmi/RMISecurityManager.java
diff --git a/jdk/src/share/classes/java/rmi/Remote.java b/jdk/src/java.rmi/share/classes/java/rmi/Remote.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/Remote.java
rename to jdk/src/java.rmi/share/classes/java/rmi/Remote.java
diff --git a/jdk/src/share/classes/java/rmi/RemoteException.java b/jdk/src/java.rmi/share/classes/java/rmi/RemoteException.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/RemoteException.java
rename to jdk/src/java.rmi/share/classes/java/rmi/RemoteException.java
diff --git a/jdk/src/share/classes/java/rmi/ServerError.java b/jdk/src/java.rmi/share/classes/java/rmi/ServerError.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/ServerError.java
rename to jdk/src/java.rmi/share/classes/java/rmi/ServerError.java
diff --git a/jdk/src/share/classes/java/rmi/ServerException.java b/jdk/src/java.rmi/share/classes/java/rmi/ServerException.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/ServerException.java
rename to jdk/src/java.rmi/share/classes/java/rmi/ServerException.java
diff --git a/jdk/src/share/classes/java/rmi/ServerRuntimeException.java b/jdk/src/java.rmi/share/classes/java/rmi/ServerRuntimeException.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/ServerRuntimeException.java
rename to jdk/src/java.rmi/share/classes/java/rmi/ServerRuntimeException.java
diff --git a/jdk/src/share/classes/java/rmi/StubNotFoundException.java b/jdk/src/java.rmi/share/classes/java/rmi/StubNotFoundException.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/StubNotFoundException.java
rename to jdk/src/java.rmi/share/classes/java/rmi/StubNotFoundException.java
diff --git a/jdk/src/share/classes/java/rmi/UnexpectedException.java b/jdk/src/java.rmi/share/classes/java/rmi/UnexpectedException.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/UnexpectedException.java
rename to jdk/src/java.rmi/share/classes/java/rmi/UnexpectedException.java
diff --git a/jdk/src/share/classes/java/rmi/UnknownHostException.java b/jdk/src/java.rmi/share/classes/java/rmi/UnknownHostException.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/UnknownHostException.java
rename to jdk/src/java.rmi/share/classes/java/rmi/UnknownHostException.java
diff --git a/jdk/src/share/classes/java/rmi/UnmarshalException.java b/jdk/src/java.rmi/share/classes/java/rmi/UnmarshalException.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/UnmarshalException.java
rename to jdk/src/java.rmi/share/classes/java/rmi/UnmarshalException.java
diff --git a/jdk/src/share/classes/java/rmi/activation/Activatable.java b/jdk/src/java.rmi/share/classes/java/rmi/activation/Activatable.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/activation/Activatable.java
rename to jdk/src/java.rmi/share/classes/java/rmi/activation/Activatable.java
diff --git a/jdk/src/share/classes/java/rmi/activation/ActivateFailedException.java b/jdk/src/java.rmi/share/classes/java/rmi/activation/ActivateFailedException.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/activation/ActivateFailedException.java
rename to jdk/src/java.rmi/share/classes/java/rmi/activation/ActivateFailedException.java
diff --git a/jdk/src/share/classes/java/rmi/activation/ActivationDesc.java b/jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationDesc.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/activation/ActivationDesc.java
rename to jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationDesc.java
diff --git a/jdk/src/share/classes/java/rmi/activation/ActivationException.java b/jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationException.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/activation/ActivationException.java
rename to jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationException.java
diff --git a/jdk/src/share/classes/java/rmi/activation/ActivationGroup.java b/jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationGroup.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/activation/ActivationGroup.java
rename to jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationGroup.java
diff --git a/jdk/src/share/classes/java/rmi/activation/ActivationGroupDesc.java b/jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationGroupDesc.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/activation/ActivationGroupDesc.java
rename to jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationGroupDesc.java
diff --git a/jdk/src/share/classes/java/rmi/activation/ActivationGroupID.java b/jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationGroupID.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/activation/ActivationGroupID.java
rename to jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationGroupID.java
diff --git a/jdk/src/share/classes/java/rmi/activation/ActivationID.java b/jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationID.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/activation/ActivationID.java
rename to jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationID.java
diff --git a/jdk/src/share/classes/java/rmi/activation/ActivationInstantiator.java b/jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationInstantiator.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/activation/ActivationInstantiator.java
rename to jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationInstantiator.java
diff --git a/jdk/src/share/classes/java/rmi/activation/ActivationMonitor.java b/jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationMonitor.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/activation/ActivationMonitor.java
rename to jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationMonitor.java
diff --git a/jdk/src/share/classes/java/rmi/activation/ActivationSystem.java b/jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationSystem.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/activation/ActivationSystem.java
rename to jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationSystem.java
diff --git a/jdk/src/share/classes/java/rmi/activation/Activator.java b/jdk/src/java.rmi/share/classes/java/rmi/activation/Activator.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/activation/Activator.java
rename to jdk/src/java.rmi/share/classes/java/rmi/activation/Activator.java
diff --git a/jdk/src/share/classes/java/rmi/activation/UnknownGroupException.java b/jdk/src/java.rmi/share/classes/java/rmi/activation/UnknownGroupException.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/activation/UnknownGroupException.java
rename to jdk/src/java.rmi/share/classes/java/rmi/activation/UnknownGroupException.java
diff --git a/jdk/src/share/classes/java/rmi/activation/UnknownObjectException.java b/jdk/src/java.rmi/share/classes/java/rmi/activation/UnknownObjectException.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/activation/UnknownObjectException.java
rename to jdk/src/java.rmi/share/classes/java/rmi/activation/UnknownObjectException.java
diff --git a/jdk/src/share/classes/java/rmi/activation/package.html b/jdk/src/java.rmi/share/classes/java/rmi/activation/package.html
similarity index 100%
rename from jdk/src/share/classes/java/rmi/activation/package.html
rename to jdk/src/java.rmi/share/classes/java/rmi/activation/package.html
diff --git a/jdk/src/share/classes/java/rmi/dgc/DGC.java b/jdk/src/java.rmi/share/classes/java/rmi/dgc/DGC.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/dgc/DGC.java
rename to jdk/src/java.rmi/share/classes/java/rmi/dgc/DGC.java
diff --git a/jdk/src/share/classes/java/rmi/dgc/Lease.java b/jdk/src/java.rmi/share/classes/java/rmi/dgc/Lease.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/dgc/Lease.java
rename to jdk/src/java.rmi/share/classes/java/rmi/dgc/Lease.java
diff --git a/jdk/src/share/classes/java/rmi/dgc/VMID.java b/jdk/src/java.rmi/share/classes/java/rmi/dgc/VMID.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/dgc/VMID.java
rename to jdk/src/java.rmi/share/classes/java/rmi/dgc/VMID.java
diff --git a/jdk/src/share/classes/java/rmi/dgc/package.html b/jdk/src/java.rmi/share/classes/java/rmi/dgc/package.html
similarity index 100%
rename from jdk/src/share/classes/java/rmi/dgc/package.html
rename to jdk/src/java.rmi/share/classes/java/rmi/dgc/package.html
diff --git a/jdk/src/share/classes/java/rmi/package.html b/jdk/src/java.rmi/share/classes/java/rmi/package.html
similarity index 100%
rename from jdk/src/share/classes/java/rmi/package.html
rename to jdk/src/java.rmi/share/classes/java/rmi/package.html
diff --git a/jdk/src/share/classes/java/rmi/registry/LocateRegistry.java b/jdk/src/java.rmi/share/classes/java/rmi/registry/LocateRegistry.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/registry/LocateRegistry.java
rename to jdk/src/java.rmi/share/classes/java/rmi/registry/LocateRegistry.java
diff --git a/jdk/src/share/classes/java/rmi/registry/Registry.java b/jdk/src/java.rmi/share/classes/java/rmi/registry/Registry.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/registry/Registry.java
rename to jdk/src/java.rmi/share/classes/java/rmi/registry/Registry.java
diff --git a/jdk/src/share/classes/java/rmi/registry/RegistryHandler.java b/jdk/src/java.rmi/share/classes/java/rmi/registry/RegistryHandler.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/registry/RegistryHandler.java
rename to jdk/src/java.rmi/share/classes/java/rmi/registry/RegistryHandler.java
diff --git a/jdk/src/share/classes/java/rmi/registry/package.html b/jdk/src/java.rmi/share/classes/java/rmi/registry/package.html
similarity index 100%
rename from jdk/src/share/classes/java/rmi/registry/package.html
rename to jdk/src/java.rmi/share/classes/java/rmi/registry/package.html
diff --git a/jdk/src/share/classes/java/rmi/server/ExportException.java b/jdk/src/java.rmi/share/classes/java/rmi/server/ExportException.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/server/ExportException.java
rename to jdk/src/java.rmi/share/classes/java/rmi/server/ExportException.java
diff --git a/jdk/src/share/classes/java/rmi/server/LoaderHandler.java b/jdk/src/java.rmi/share/classes/java/rmi/server/LoaderHandler.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/server/LoaderHandler.java
rename to jdk/src/java.rmi/share/classes/java/rmi/server/LoaderHandler.java
diff --git a/jdk/src/share/classes/java/rmi/server/LogStream.java b/jdk/src/java.rmi/share/classes/java/rmi/server/LogStream.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/server/LogStream.java
rename to jdk/src/java.rmi/share/classes/java/rmi/server/LogStream.java
diff --git a/jdk/src/share/classes/java/rmi/server/ObjID.java b/jdk/src/java.rmi/share/classes/java/rmi/server/ObjID.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/server/ObjID.java
rename to jdk/src/java.rmi/share/classes/java/rmi/server/ObjID.java
diff --git a/jdk/src/share/classes/java/rmi/server/Operation.java b/jdk/src/java.rmi/share/classes/java/rmi/server/Operation.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/server/Operation.java
rename to jdk/src/java.rmi/share/classes/java/rmi/server/Operation.java
diff --git a/jdk/src/share/classes/java/rmi/server/RMIClassLoader.java b/jdk/src/java.rmi/share/classes/java/rmi/server/RMIClassLoader.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/server/RMIClassLoader.java
rename to jdk/src/java.rmi/share/classes/java/rmi/server/RMIClassLoader.java
diff --git a/jdk/src/share/classes/java/rmi/server/RMIClassLoaderSpi.java b/jdk/src/java.rmi/share/classes/java/rmi/server/RMIClassLoaderSpi.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/server/RMIClassLoaderSpi.java
rename to jdk/src/java.rmi/share/classes/java/rmi/server/RMIClassLoaderSpi.java
diff --git a/jdk/src/share/classes/java/rmi/server/RMIClientSocketFactory.java b/jdk/src/java.rmi/share/classes/java/rmi/server/RMIClientSocketFactory.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/server/RMIClientSocketFactory.java
rename to jdk/src/java.rmi/share/classes/java/rmi/server/RMIClientSocketFactory.java
diff --git a/jdk/src/share/classes/java/rmi/server/RMIFailureHandler.java b/jdk/src/java.rmi/share/classes/java/rmi/server/RMIFailureHandler.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/server/RMIFailureHandler.java
rename to jdk/src/java.rmi/share/classes/java/rmi/server/RMIFailureHandler.java
diff --git a/jdk/src/share/classes/java/rmi/server/RMIServerSocketFactory.java b/jdk/src/java.rmi/share/classes/java/rmi/server/RMIServerSocketFactory.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/server/RMIServerSocketFactory.java
rename to jdk/src/java.rmi/share/classes/java/rmi/server/RMIServerSocketFactory.java
diff --git a/jdk/src/share/classes/java/rmi/server/RMISocketFactory.java b/jdk/src/java.rmi/share/classes/java/rmi/server/RMISocketFactory.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/server/RMISocketFactory.java
rename to jdk/src/java.rmi/share/classes/java/rmi/server/RMISocketFactory.java
diff --git a/jdk/src/share/classes/java/rmi/server/RemoteCall.java b/jdk/src/java.rmi/share/classes/java/rmi/server/RemoteCall.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/server/RemoteCall.java
rename to jdk/src/java.rmi/share/classes/java/rmi/server/RemoteCall.java
diff --git a/jdk/src/share/classes/java/rmi/server/RemoteObject.java b/jdk/src/java.rmi/share/classes/java/rmi/server/RemoteObject.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/server/RemoteObject.java
rename to jdk/src/java.rmi/share/classes/java/rmi/server/RemoteObject.java
diff --git a/jdk/src/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java b/jdk/src/java.rmi/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java
rename to jdk/src/java.rmi/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java
diff --git a/jdk/src/share/classes/java/rmi/server/RemoteRef.java b/jdk/src/java.rmi/share/classes/java/rmi/server/RemoteRef.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/server/RemoteRef.java
rename to jdk/src/java.rmi/share/classes/java/rmi/server/RemoteRef.java
diff --git a/jdk/src/share/classes/java/rmi/server/RemoteServer.java b/jdk/src/java.rmi/share/classes/java/rmi/server/RemoteServer.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/server/RemoteServer.java
rename to jdk/src/java.rmi/share/classes/java/rmi/server/RemoteServer.java
diff --git a/jdk/src/share/classes/java/rmi/server/RemoteStub.java b/jdk/src/java.rmi/share/classes/java/rmi/server/RemoteStub.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/server/RemoteStub.java
rename to jdk/src/java.rmi/share/classes/java/rmi/server/RemoteStub.java
diff --git a/jdk/src/share/classes/java/rmi/server/ServerCloneException.java b/jdk/src/java.rmi/share/classes/java/rmi/server/ServerCloneException.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/server/ServerCloneException.java
rename to jdk/src/java.rmi/share/classes/java/rmi/server/ServerCloneException.java
diff --git a/jdk/src/share/classes/java/rmi/server/ServerNotActiveException.java b/jdk/src/java.rmi/share/classes/java/rmi/server/ServerNotActiveException.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/server/ServerNotActiveException.java
rename to jdk/src/java.rmi/share/classes/java/rmi/server/ServerNotActiveException.java
diff --git a/jdk/src/share/classes/java/rmi/server/ServerRef.java b/jdk/src/java.rmi/share/classes/java/rmi/server/ServerRef.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/server/ServerRef.java
rename to jdk/src/java.rmi/share/classes/java/rmi/server/ServerRef.java
diff --git a/jdk/src/share/classes/java/rmi/server/Skeleton.java b/jdk/src/java.rmi/share/classes/java/rmi/server/Skeleton.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/server/Skeleton.java
rename to jdk/src/java.rmi/share/classes/java/rmi/server/Skeleton.java
diff --git a/jdk/src/share/classes/java/rmi/server/SkeletonMismatchException.java b/jdk/src/java.rmi/share/classes/java/rmi/server/SkeletonMismatchException.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/server/SkeletonMismatchException.java
rename to jdk/src/java.rmi/share/classes/java/rmi/server/SkeletonMismatchException.java
diff --git a/jdk/src/share/classes/java/rmi/server/SkeletonNotFoundException.java b/jdk/src/java.rmi/share/classes/java/rmi/server/SkeletonNotFoundException.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/server/SkeletonNotFoundException.java
rename to jdk/src/java.rmi/share/classes/java/rmi/server/SkeletonNotFoundException.java
diff --git a/jdk/src/share/classes/java/rmi/server/SocketSecurityException.java b/jdk/src/java.rmi/share/classes/java/rmi/server/SocketSecurityException.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/server/SocketSecurityException.java
rename to jdk/src/java.rmi/share/classes/java/rmi/server/SocketSecurityException.java
diff --git a/jdk/src/share/classes/java/rmi/server/UID.java b/jdk/src/java.rmi/share/classes/java/rmi/server/UID.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/server/UID.java
rename to jdk/src/java.rmi/share/classes/java/rmi/server/UID.java
diff --git a/jdk/src/share/classes/java/rmi/server/UnicastRemoteObject.java b/jdk/src/java.rmi/share/classes/java/rmi/server/UnicastRemoteObject.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/server/UnicastRemoteObject.java
rename to jdk/src/java.rmi/share/classes/java/rmi/server/UnicastRemoteObject.java
diff --git a/jdk/src/share/classes/java/rmi/server/Unreferenced.java b/jdk/src/java.rmi/share/classes/java/rmi/server/Unreferenced.java
similarity index 100%
rename from jdk/src/share/classes/java/rmi/server/Unreferenced.java
rename to jdk/src/java.rmi/share/classes/java/rmi/server/Unreferenced.java
diff --git a/jdk/src/share/classes/java/rmi/server/package.html b/jdk/src/java.rmi/share/classes/java/rmi/server/package.html
similarity index 100%
rename from jdk/src/share/classes/java/rmi/server/package.html
rename to jdk/src/java.rmi/share/classes/java/rmi/server/package.html
diff --git a/jdk/src/share/classes/javax/rmi/ssl/SslRMIClientSocketFactory.java b/jdk/src/java.rmi/share/classes/javax/rmi/ssl/SslRMIClientSocketFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/rmi/ssl/SslRMIClientSocketFactory.java
rename to jdk/src/java.rmi/share/classes/javax/rmi/ssl/SslRMIClientSocketFactory.java
diff --git a/jdk/src/share/classes/javax/rmi/ssl/SslRMIServerSocketFactory.java b/jdk/src/java.rmi/share/classes/javax/rmi/ssl/SslRMIServerSocketFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/rmi/ssl/SslRMIServerSocketFactory.java
rename to jdk/src/java.rmi/share/classes/javax/rmi/ssl/SslRMIServerSocketFactory.java
diff --git a/jdk/src/share/classes/javax/rmi/ssl/package.html b/jdk/src/java.rmi/share/classes/javax/rmi/ssl/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/rmi/ssl/package.html
rename to jdk/src/java.rmi/share/classes/javax/rmi/ssl/package.html
diff --git a/jdk/src/share/classes/sun/rmi/log/LogHandler.java b/jdk/src/java.rmi/share/classes/sun/rmi/log/LogHandler.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/log/LogHandler.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/log/LogHandler.java
diff --git a/jdk/src/share/classes/sun/rmi/log/LogInputStream.java b/jdk/src/java.rmi/share/classes/sun/rmi/log/LogInputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/log/LogInputStream.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/log/LogInputStream.java
diff --git a/jdk/src/share/classes/sun/rmi/log/LogOutputStream.java b/jdk/src/java.rmi/share/classes/sun/rmi/log/LogOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/log/LogOutputStream.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/log/LogOutputStream.java
diff --git a/jdk/src/share/classes/sun/rmi/log/ReliableLog.java b/jdk/src/java.rmi/share/classes/sun/rmi/log/ReliableLog.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/log/ReliableLog.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/log/ReliableLog.java
diff --git a/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java b/jdk/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl.java
diff --git a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry.properties b/jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry.properties
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry.properties
rename to jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry.properties
diff --git a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties b/jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties
rename to jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties
diff --git a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_es.properties b/jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_es.properties
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_es.properties
rename to jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_es.properties
diff --git a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_fr.properties b/jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_fr.properties
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_fr.properties
rename to jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_fr.properties
diff --git a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_it.properties b/jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_it.properties
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_it.properties
rename to jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_it.properties
diff --git a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_ja.properties b/jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_ja.properties
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_ja.properties
rename to jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_ja.properties
diff --git a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_ko.properties b/jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_ko.properties
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_ko.properties
rename to jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_ko.properties
diff --git a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_pt_BR.properties b/jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_pt_BR.properties
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_pt_BR.properties
rename to jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_pt_BR.properties
diff --git a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_sv.properties b/jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_sv.properties
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_sv.properties
rename to jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_sv.properties
diff --git a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_zh_CN.properties b/jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_zh_CN.properties
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_zh_CN.properties
rename to jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_zh_CN.properties
diff --git a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_zh_TW.properties b/jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_zh_TW.properties
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_zh_TW.properties
rename to jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_zh_TW.properties
diff --git a/jdk/src/share/classes/sun/rmi/runtime/Log.java b/jdk/src/java.rmi/share/classes/sun/rmi/runtime/Log.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/runtime/Log.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/runtime/Log.java
diff --git a/jdk/src/share/classes/sun/rmi/runtime/NewThreadAction.java b/jdk/src/java.rmi/share/classes/sun/rmi/runtime/NewThreadAction.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/runtime/NewThreadAction.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/runtime/NewThreadAction.java
diff --git a/jdk/src/share/classes/sun/rmi/runtime/RuntimeUtil.java b/jdk/src/java.rmi/share/classes/sun/rmi/runtime/RuntimeUtil.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/runtime/RuntimeUtil.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/runtime/RuntimeUtil.java
diff --git a/jdk/src/share/classes/sun/rmi/server/ActivatableRef.java b/jdk/src/java.rmi/share/classes/sun/rmi/server/ActivatableRef.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/server/ActivatableRef.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/server/ActivatableRef.java
diff --git a/jdk/src/share/classes/sun/rmi/server/ActivatableServerRef.java b/jdk/src/java.rmi/share/classes/sun/rmi/server/ActivatableServerRef.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/server/ActivatableServerRef.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/server/ActivatableServerRef.java
diff --git a/jdk/src/share/classes/sun/rmi/server/Activation.java b/jdk/src/java.rmi/share/classes/sun/rmi/server/Activation.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/server/Activation.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/server/Activation.java
diff --git a/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java b/jdk/src/java.rmi/share/classes/sun/rmi/server/ActivationGroupImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/server/ActivationGroupImpl.java
diff --git a/jdk/src/share/classes/sun/rmi/server/ActivationGroupInit.java b/jdk/src/java.rmi/share/classes/sun/rmi/server/ActivationGroupInit.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/server/ActivationGroupInit.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/server/ActivationGroupInit.java
diff --git a/jdk/src/share/classes/sun/rmi/server/Dispatcher.java b/jdk/src/java.rmi/share/classes/sun/rmi/server/Dispatcher.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/server/Dispatcher.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/server/Dispatcher.java
diff --git a/jdk/src/share/classes/sun/rmi/server/InactiveGroupException.java b/jdk/src/java.rmi/share/classes/sun/rmi/server/InactiveGroupException.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/server/InactiveGroupException.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/server/InactiveGroupException.java
diff --git a/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java b/jdk/src/java.rmi/share/classes/sun/rmi/server/LoaderHandler.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/server/LoaderHandler.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/server/LoaderHandler.java
diff --git a/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java b/jdk/src/java.rmi/share/classes/sun/rmi/server/MarshalInputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/server/MarshalInputStream.java
diff --git a/jdk/src/share/classes/sun/rmi/server/MarshalOutputStream.java b/jdk/src/java.rmi/share/classes/sun/rmi/server/MarshalOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/server/MarshalOutputStream.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/server/MarshalOutputStream.java
diff --git a/jdk/src/share/classes/sun/rmi/server/UnicastRef.java b/jdk/src/java.rmi/share/classes/sun/rmi/server/UnicastRef.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/server/UnicastRef.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/server/UnicastRef.java
diff --git a/jdk/src/share/classes/sun/rmi/server/UnicastRef2.java b/jdk/src/java.rmi/share/classes/sun/rmi/server/UnicastRef2.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/server/UnicastRef2.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/server/UnicastRef2.java
diff --git a/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java b/jdk/src/java.rmi/share/classes/sun/rmi/server/UnicastServerRef.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/server/UnicastServerRef.java
diff --git a/jdk/src/share/classes/sun/rmi/server/UnicastServerRef2.java b/jdk/src/java.rmi/share/classes/sun/rmi/server/UnicastServerRef2.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/server/UnicastServerRef2.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/server/UnicastServerRef2.java
diff --git a/jdk/src/share/classes/sun/rmi/server/Util.java b/jdk/src/java.rmi/share/classes/sun/rmi/server/Util.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/server/Util.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/server/Util.java
diff --git a/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java b/jdk/src/java.rmi/share/classes/sun/rmi/server/WeakClassHashMap.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/server/WeakClassHashMap.java
diff --git a/jdk/src/share/classes/sun/rmi/server/resources/rmid.properties b/jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid.properties
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/server/resources/rmid.properties
rename to jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid.properties
diff --git a/jdk/src/share/classes/sun/rmi/server/resources/rmid_de.properties b/jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_de.properties
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/server/resources/rmid_de.properties
rename to jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_de.properties
diff --git a/jdk/src/share/classes/sun/rmi/server/resources/rmid_es.properties b/jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_es.properties
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/server/resources/rmid_es.properties
rename to jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_es.properties
diff --git a/jdk/src/share/classes/sun/rmi/server/resources/rmid_fr.properties b/jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_fr.properties
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/server/resources/rmid_fr.properties
rename to jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_fr.properties
diff --git a/jdk/src/share/classes/sun/rmi/server/resources/rmid_it.properties b/jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_it.properties
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/server/resources/rmid_it.properties
rename to jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_it.properties
diff --git a/jdk/src/share/classes/sun/rmi/server/resources/rmid_ja.properties b/jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_ja.properties
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/server/resources/rmid_ja.properties
rename to jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_ja.properties
diff --git a/jdk/src/share/classes/sun/rmi/server/resources/rmid_ko.properties b/jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_ko.properties
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/server/resources/rmid_ko.properties
rename to jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_ko.properties
diff --git a/jdk/src/share/classes/sun/rmi/server/resources/rmid_pt_BR.properties b/jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_pt_BR.properties
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/server/resources/rmid_pt_BR.properties
rename to jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_pt_BR.properties
diff --git a/jdk/src/share/classes/sun/rmi/server/resources/rmid_sv.properties b/jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_sv.properties
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/server/resources/rmid_sv.properties
rename to jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_sv.properties
diff --git a/jdk/src/share/classes/sun/rmi/server/resources/rmid_zh_CN.properties b/jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_zh_CN.properties
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/server/resources/rmid_zh_CN.properties
rename to jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_zh_CN.properties
diff --git a/jdk/src/share/classes/sun/rmi/server/resources/rmid_zh_TW.properties b/jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_zh_TW.properties
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/server/resources/rmid_zh_TW.properties
rename to jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_zh_TW.properties
diff --git a/jdk/src/share/classes/sun/rmi/transport/Channel.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/Channel.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/Channel.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/Channel.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/Connection.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/Connection.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/Connection.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/Connection.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/ConnectionInputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/ConnectionInputStream.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/ConnectionOutputStream.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/ConnectionOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/ConnectionOutputStream.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/ConnectionOutputStream.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/DGCAckHandler.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/DGCAckHandler.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/DGCClient.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/DGCClient.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/DGCClient.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/DGCClient.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/DGCImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/DGCImpl.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/DGCImpl.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/Endpoint.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/Endpoint.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/Endpoint.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/Endpoint.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/LiveRef.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/LiveRef.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/LiveRef.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/LiveRef.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/ObjectEndpoint.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/ObjectEndpoint.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/ObjectEndpoint.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/ObjectEndpoint.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/ObjectTable.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/ObjectTable.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/ObjectTable.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/StreamRemoteCall.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/StreamRemoteCall.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/StreamRemoteCall.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/StreamRemoteCall.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/Target.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/Target.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/Target.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/Target.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/Transport.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/Transport.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/Transport.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/Transport.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/TransportConstants.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/TransportConstants.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/TransportConstants.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/TransportConstants.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/WeakRef.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/WeakRef.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/WeakRef.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/WeakRef.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/CGIHandler.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/CGIHandler.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/proxy/HttpAwareServerSocket.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpAwareServerSocket.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/proxy/HttpAwareServerSocket.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpAwareServerSocket.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/proxy/HttpInputStream.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpInputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/proxy/HttpInputStream.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpInputStream.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/proxy/HttpOutputStream.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/proxy/HttpOutputStream.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpOutputStream.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/proxy/HttpReceiveSocket.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpReceiveSocket.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/proxy/HttpReceiveSocket.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpReceiveSocket.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/proxy/HttpSendInputStream.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpSendInputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/proxy/HttpSendInputStream.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpSendInputStream.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/proxy/HttpSendOutputStream.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpSendOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/proxy/HttpSendOutputStream.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpSendOutputStream.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/proxy/HttpSendSocket.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpSendSocket.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/proxy/HttpSendSocket.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpSendSocket.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/proxy/RMIDirectSocketFactory.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/RMIDirectSocketFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/proxy/RMIDirectSocketFactory.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/RMIDirectSocketFactory.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/proxy/RMIHttpToCGISocketFactory.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/RMIHttpToCGISocketFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/proxy/RMIHttpToCGISocketFactory.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/RMIHttpToCGISocketFactory.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/proxy/RMIHttpToPortSocketFactory.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/RMIHttpToPortSocketFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/proxy/RMIHttpToPortSocketFactory.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/RMIHttpToPortSocketFactory.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/proxy/RMISocketInfo.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/RMISocketInfo.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/proxy/RMISocketInfo.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/RMISocketInfo.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/proxy/WrappedSocket.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/WrappedSocket.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/proxy/WrappedSocket.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/WrappedSocket.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/tcp/MultiplexConnectionInfo.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/MultiplexConnectionInfo.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/tcp/MultiplexConnectionInfo.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/MultiplexConnectionInfo.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/tcp/MultiplexInputStream.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/MultiplexInputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/tcp/MultiplexInputStream.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/MultiplexInputStream.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/tcp/MultiplexOutputStream.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/MultiplexOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/tcp/MultiplexOutputStream.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/MultiplexOutputStream.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPChannel.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPChannel.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/tcp/TCPConnection.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPConnection.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/tcp/TCPConnection.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPConnection.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java
diff --git a/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPTransport.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java
rename to jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPTransport.java
diff --git a/jdk/src/share/doc/stub/java/rmi/activation/ActivationGroup_Stub.java b/jdk/src/java.rmi/share/doc/stub/java/rmi/activation/ActivationGroup_Stub.java
similarity index 100%
rename from jdk/src/share/doc/stub/java/rmi/activation/ActivationGroup_Stub.java
rename to jdk/src/java.rmi/share/doc/stub/java/rmi/activation/ActivationGroup_Stub.java
diff --git a/jdk/src/solaris/bin/java-rmi.cgi.sh b/jdk/src/java.rmi/unix/bin/java-rmi.cgi.sh
similarity index 100%
rename from jdk/src/solaris/bin/java-rmi.cgi.sh
rename to jdk/src/java.rmi/unix/bin/java-rmi.cgi.sh
diff --git a/jdk/src/share/classes/javax/script/AbstractScriptEngine.java b/jdk/src/java.scripting/share/classes/javax/script/AbstractScriptEngine.java
similarity index 100%
rename from jdk/src/share/classes/javax/script/AbstractScriptEngine.java
rename to jdk/src/java.scripting/share/classes/javax/script/AbstractScriptEngine.java
diff --git a/jdk/src/share/classes/javax/script/Bindings.java b/jdk/src/java.scripting/share/classes/javax/script/Bindings.java
similarity index 100%
rename from jdk/src/share/classes/javax/script/Bindings.java
rename to jdk/src/java.scripting/share/classes/javax/script/Bindings.java
diff --git a/jdk/src/share/classes/javax/script/Compilable.java b/jdk/src/java.scripting/share/classes/javax/script/Compilable.java
similarity index 100%
rename from jdk/src/share/classes/javax/script/Compilable.java
rename to jdk/src/java.scripting/share/classes/javax/script/Compilable.java
diff --git a/jdk/src/share/classes/javax/script/CompiledScript.java b/jdk/src/java.scripting/share/classes/javax/script/CompiledScript.java
similarity index 100%
rename from jdk/src/share/classes/javax/script/CompiledScript.java
rename to jdk/src/java.scripting/share/classes/javax/script/CompiledScript.java
diff --git a/jdk/src/share/classes/javax/script/Invocable.java b/jdk/src/java.scripting/share/classes/javax/script/Invocable.java
similarity index 100%
rename from jdk/src/share/classes/javax/script/Invocable.java
rename to jdk/src/java.scripting/share/classes/javax/script/Invocable.java
diff --git a/jdk/src/share/classes/javax/script/ScriptContext.java b/jdk/src/java.scripting/share/classes/javax/script/ScriptContext.java
similarity index 100%
rename from jdk/src/share/classes/javax/script/ScriptContext.java
rename to jdk/src/java.scripting/share/classes/javax/script/ScriptContext.java
diff --git a/jdk/src/share/classes/javax/script/ScriptEngine.java b/jdk/src/java.scripting/share/classes/javax/script/ScriptEngine.java
similarity index 100%
rename from jdk/src/share/classes/javax/script/ScriptEngine.java
rename to jdk/src/java.scripting/share/classes/javax/script/ScriptEngine.java
diff --git a/jdk/src/share/classes/javax/script/ScriptEngineFactory.java b/jdk/src/java.scripting/share/classes/javax/script/ScriptEngineFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/script/ScriptEngineFactory.java
rename to jdk/src/java.scripting/share/classes/javax/script/ScriptEngineFactory.java
diff --git a/jdk/src/share/classes/javax/script/ScriptEngineManager.java b/jdk/src/java.scripting/share/classes/javax/script/ScriptEngineManager.java
similarity index 100%
rename from jdk/src/share/classes/javax/script/ScriptEngineManager.java
rename to jdk/src/java.scripting/share/classes/javax/script/ScriptEngineManager.java
diff --git a/jdk/src/share/classes/javax/script/ScriptException.java b/jdk/src/java.scripting/share/classes/javax/script/ScriptException.java
similarity index 100%
rename from jdk/src/share/classes/javax/script/ScriptException.java
rename to jdk/src/java.scripting/share/classes/javax/script/ScriptException.java
diff --git a/jdk/src/share/classes/javax/script/SimpleBindings.java b/jdk/src/java.scripting/share/classes/javax/script/SimpleBindings.java
similarity index 100%
rename from jdk/src/share/classes/javax/script/SimpleBindings.java
rename to jdk/src/java.scripting/share/classes/javax/script/SimpleBindings.java
diff --git a/jdk/src/share/classes/javax/script/SimpleScriptContext.java b/jdk/src/java.scripting/share/classes/javax/script/SimpleScriptContext.java
similarity index 100%
rename from jdk/src/share/classes/javax/script/SimpleScriptContext.java
rename to jdk/src/java.scripting/share/classes/javax/script/SimpleScriptContext.java
diff --git a/jdk/src/share/classes/javax/script/package.html b/jdk/src/java.scripting/share/classes/javax/script/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/script/package.html
rename to jdk/src/java.scripting/share/classes/javax/script/package.html
diff --git a/jdk/src/share/classes/java/security/acl/Acl.java b/jdk/src/java.security.acl/share/classes/java/security/acl/Acl.java
similarity index 100%
rename from jdk/src/share/classes/java/security/acl/Acl.java
rename to jdk/src/java.security.acl/share/classes/java/security/acl/Acl.java
diff --git a/jdk/src/share/classes/java/security/acl/AclEntry.java b/jdk/src/java.security.acl/share/classes/java/security/acl/AclEntry.java
similarity index 100%
rename from jdk/src/share/classes/java/security/acl/AclEntry.java
rename to jdk/src/java.security.acl/share/classes/java/security/acl/AclEntry.java
diff --git a/jdk/src/share/classes/java/security/acl/AclNotFoundException.java b/jdk/src/java.security.acl/share/classes/java/security/acl/AclNotFoundException.java
similarity index 100%
rename from jdk/src/share/classes/java/security/acl/AclNotFoundException.java
rename to jdk/src/java.security.acl/share/classes/java/security/acl/AclNotFoundException.java
diff --git a/jdk/src/share/classes/java/security/acl/Group.java b/jdk/src/java.security.acl/share/classes/java/security/acl/Group.java
similarity index 100%
rename from jdk/src/share/classes/java/security/acl/Group.java
rename to jdk/src/java.security.acl/share/classes/java/security/acl/Group.java
diff --git a/jdk/src/share/classes/java/security/acl/LastOwnerException.java b/jdk/src/java.security.acl/share/classes/java/security/acl/LastOwnerException.java
similarity index 100%
rename from jdk/src/share/classes/java/security/acl/LastOwnerException.java
rename to jdk/src/java.security.acl/share/classes/java/security/acl/LastOwnerException.java
diff --git a/jdk/src/share/classes/java/security/acl/NotOwnerException.java b/jdk/src/java.security.acl/share/classes/java/security/acl/NotOwnerException.java
similarity index 100%
rename from jdk/src/share/classes/java/security/acl/NotOwnerException.java
rename to jdk/src/java.security.acl/share/classes/java/security/acl/NotOwnerException.java
diff --git a/jdk/src/share/classes/java/security/acl/Owner.java b/jdk/src/java.security.acl/share/classes/java/security/acl/Owner.java
similarity index 100%
rename from jdk/src/share/classes/java/security/acl/Owner.java
rename to jdk/src/java.security.acl/share/classes/java/security/acl/Owner.java
diff --git a/jdk/src/share/classes/java/security/acl/Permission.java b/jdk/src/java.security.acl/share/classes/java/security/acl/Permission.java
similarity index 100%
rename from jdk/src/share/classes/java/security/acl/Permission.java
rename to jdk/src/java.security.acl/share/classes/java/security/acl/Permission.java
diff --git a/jdk/src/share/classes/java/security/acl/package-info.java b/jdk/src/java.security.acl/share/classes/java/security/acl/package-info.java
similarity index 100%
rename from jdk/src/share/classes/java/security/acl/package-info.java
rename to jdk/src/java.security.acl/share/classes/java/security/acl/package-info.java
diff --git a/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java b/jdk/src/java.security.acl/share/classes/sun/security/acl/AclEntryImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/acl/AclEntryImpl.java
rename to jdk/src/java.security.acl/share/classes/sun/security/acl/AclEntryImpl.java
diff --git a/jdk/src/share/classes/sun/security/acl/AclImpl.java b/jdk/src/java.security.acl/share/classes/sun/security/acl/AclImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/acl/AclImpl.java
rename to jdk/src/java.security.acl/share/classes/sun/security/acl/AclImpl.java
diff --git a/jdk/src/share/classes/sun/security/acl/AllPermissionsImpl.java b/jdk/src/java.security.acl/share/classes/sun/security/acl/AllPermissionsImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/acl/AllPermissionsImpl.java
rename to jdk/src/java.security.acl/share/classes/sun/security/acl/AllPermissionsImpl.java
diff --git a/jdk/src/share/classes/sun/security/acl/GroupImpl.java b/jdk/src/java.security.acl/share/classes/sun/security/acl/GroupImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/acl/GroupImpl.java
rename to jdk/src/java.security.acl/share/classes/sun/security/acl/GroupImpl.java
diff --git a/jdk/src/share/classes/sun/security/acl/OwnerImpl.java b/jdk/src/java.security.acl/share/classes/sun/security/acl/OwnerImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/acl/OwnerImpl.java
rename to jdk/src/java.security.acl/share/classes/sun/security/acl/OwnerImpl.java
diff --git a/jdk/src/share/classes/sun/security/acl/PermissionImpl.java b/jdk/src/java.security.acl/share/classes/sun/security/acl/PermissionImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/acl/PermissionImpl.java
rename to jdk/src/java.security.acl/share/classes/sun/security/acl/PermissionImpl.java
diff --git a/jdk/src/share/classes/sun/security/acl/PrincipalImpl.java b/jdk/src/java.security.acl/share/classes/sun/security/acl/PrincipalImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/acl/PrincipalImpl.java
rename to jdk/src/java.security.acl/share/classes/sun/security/acl/PrincipalImpl.java
diff --git a/jdk/src/share/classes/sun/security/acl/WorldGroupImpl.java b/jdk/src/java.security.acl/share/classes/sun/security/acl/WorldGroupImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/acl/WorldGroupImpl.java
rename to jdk/src/java.security.acl/share/classes/sun/security/acl/WorldGroupImpl.java
diff --git a/jdk/src/macosx/native/sun/security/krb5/SCDynamicStoreConfig.m b/jdk/src/java.security.jgss/macosx/native/libosxkrb5/SCDynamicStoreConfig.m
similarity index 100%
rename from jdk/src/macosx/native/sun/security/krb5/SCDynamicStoreConfig.m
rename to jdk/src/java.security.jgss/macosx/native/libosxkrb5/SCDynamicStoreConfig.m
diff --git a/jdk/src/share/native/sun/security/krb5/nativeccache.c b/jdk/src/java.security.jgss/macosx/native/libosxkrb5/nativeccache.c
similarity index 100%
rename from jdk/src/share/native/sun/security/krb5/nativeccache.c
rename to jdk/src/java.security.jgss/macosx/native/libosxkrb5/nativeccache.c
diff --git a/jdk/src/share/classes/com/sun/security/jgss/AuthorizationDataEntry.java b/jdk/src/java.security.jgss/share/classes/com/sun/security/jgss/AuthorizationDataEntry.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/jgss/AuthorizationDataEntry.java
rename to jdk/src/java.security.jgss/share/classes/com/sun/security/jgss/AuthorizationDataEntry.java
diff --git a/jdk/src/share/classes/com/sun/security/jgss/ExtendedGSSContext.java b/jdk/src/java.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSContext.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/jgss/ExtendedGSSContext.java
rename to jdk/src/java.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSContext.java
diff --git a/jdk/src/share/classes/com/sun/security/jgss/ExtendedGSSCredential.java b/jdk/src/java.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSCredential.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/jgss/ExtendedGSSCredential.java
rename to jdk/src/java.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSCredential.java
diff --git a/jdk/src/share/classes/com/sun/security/jgss/GSSUtil.java b/jdk/src/java.security.jgss/share/classes/com/sun/security/jgss/GSSUtil.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/jgss/GSSUtil.java
rename to jdk/src/java.security.jgss/share/classes/com/sun/security/jgss/GSSUtil.java
diff --git a/jdk/src/share/classes/com/sun/security/jgss/InquireSecContextPermission.java b/jdk/src/java.security.jgss/share/classes/com/sun/security/jgss/InquireSecContextPermission.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/jgss/InquireSecContextPermission.java
rename to jdk/src/java.security.jgss/share/classes/com/sun/security/jgss/InquireSecContextPermission.java
diff --git a/jdk/src/share/classes/com/sun/security/jgss/InquireType.java b/jdk/src/java.security.jgss/share/classes/com/sun/security/jgss/InquireType.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/jgss/InquireType.java
rename to jdk/src/java.security.jgss/share/classes/com/sun/security/jgss/InquireType.java
diff --git a/jdk/src/share/classes/com/sun/security/jgss/package-info.java b/jdk/src/java.security.jgss/share/classes/com/sun/security/jgss/package-info.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/jgss/package-info.java
rename to jdk/src/java.security.jgss/share/classes/com/sun/security/jgss/package-info.java
diff --git a/jdk/src/share/classes/com/sun/security/sasl/gsskerb/FactoryImpl.java b/jdk/src/java.security.jgss/share/classes/com/sun/security/sasl/gsskerb/FactoryImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/sasl/gsskerb/FactoryImpl.java
rename to jdk/src/java.security.jgss/share/classes/com/sun/security/sasl/gsskerb/FactoryImpl.java
diff --git a/jdk/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Base.java b/jdk/src/java.security.jgss/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Base.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Base.java
rename to jdk/src/java.security.jgss/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Base.java
diff --git a/jdk/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Client.java b/jdk/src/java.security.jgss/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Client.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Client.java
rename to jdk/src/java.security.jgss/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Client.java
diff --git a/jdk/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Server.java b/jdk/src/java.security.jgss/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Server.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Server.java
rename to jdk/src/java.security.jgss/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Server.java
diff --git a/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java b/jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/DelegationPermission.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java
rename to jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/DelegationPermission.java
diff --git a/jdk/src/share/classes/javax/security/auth/kerberos/EncryptionKey.java b/jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/EncryptionKey.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/kerberos/EncryptionKey.java
rename to jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/EncryptionKey.java
diff --git a/jdk/src/share/classes/javax/security/auth/kerberos/JavaxSecurityAuthKerberosAccessImpl.java b/jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/JavaxSecurityAuthKerberosAccessImpl.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/kerberos/JavaxSecurityAuthKerberosAccessImpl.java
rename to jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/JavaxSecurityAuthKerberosAccessImpl.java
diff --git a/jdk/src/share/classes/javax/security/auth/kerberos/KerberosCredMessage.java b/jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosCredMessage.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/kerberos/KerberosCredMessage.java
rename to jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosCredMessage.java
diff --git a/jdk/src/share/classes/javax/security/auth/kerberos/KerberosKey.java b/jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosKey.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/kerberos/KerberosKey.java
rename to jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosKey.java
diff --git a/jdk/src/share/classes/javax/security/auth/kerberos/KerberosPrincipal.java b/jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosPrincipal.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/kerberos/KerberosPrincipal.java
rename to jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosPrincipal.java
diff --git a/jdk/src/share/classes/javax/security/auth/kerberos/KerberosTicket.java b/jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosTicket.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/kerberos/KerberosTicket.java
rename to jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosTicket.java
diff --git a/jdk/src/share/classes/javax/security/auth/kerberos/KeyImpl.java b/jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KeyImpl.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/kerberos/KeyImpl.java
rename to jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KeyImpl.java
diff --git a/jdk/src/share/classes/javax/security/auth/kerberos/KeyTab.java b/jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KeyTab.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/kerberos/KeyTab.java
rename to jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KeyTab.java
diff --git a/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java b/jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/ServicePermission.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java
rename to jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/ServicePermission.java
diff --git a/jdk/src/share/classes/javax/security/auth/kerberos/package-info.java b/jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/package-info.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/auth/kerberos/package-info.java
rename to jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/package-info.java
diff --git a/jdk/src/share/classes/com/sun/security/jgss/jgss-overview.html b/jdk/src/java.security.jgss/share/classes/jgss-overview.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/jgss/jgss-overview.html
rename to jdk/src/java.security.jgss/share/classes/jgss-overview.html
diff --git a/jdk/src/share/classes/org/ietf/jgss/ChannelBinding.java b/jdk/src/java.security.jgss/share/classes/org/ietf/jgss/ChannelBinding.java
similarity index 100%
rename from jdk/src/share/classes/org/ietf/jgss/ChannelBinding.java
rename to jdk/src/java.security.jgss/share/classes/org/ietf/jgss/ChannelBinding.java
diff --git a/jdk/src/share/classes/org/ietf/jgss/GSSContext.java b/jdk/src/java.security.jgss/share/classes/org/ietf/jgss/GSSContext.java
similarity index 100%
rename from jdk/src/share/classes/org/ietf/jgss/GSSContext.java
rename to jdk/src/java.security.jgss/share/classes/org/ietf/jgss/GSSContext.java
diff --git a/jdk/src/share/classes/org/ietf/jgss/GSSCredential.java b/jdk/src/java.security.jgss/share/classes/org/ietf/jgss/GSSCredential.java
similarity index 100%
rename from jdk/src/share/classes/org/ietf/jgss/GSSCredential.java
rename to jdk/src/java.security.jgss/share/classes/org/ietf/jgss/GSSCredential.java
diff --git a/jdk/src/share/classes/org/ietf/jgss/GSSException.java b/jdk/src/java.security.jgss/share/classes/org/ietf/jgss/GSSException.java
similarity index 100%
rename from jdk/src/share/classes/org/ietf/jgss/GSSException.java
rename to jdk/src/java.security.jgss/share/classes/org/ietf/jgss/GSSException.java
diff --git a/jdk/src/share/classes/org/ietf/jgss/GSSManager.java b/jdk/src/java.security.jgss/share/classes/org/ietf/jgss/GSSManager.java
similarity index 100%
rename from jdk/src/share/classes/org/ietf/jgss/GSSManager.java
rename to jdk/src/java.security.jgss/share/classes/org/ietf/jgss/GSSManager.java
diff --git a/jdk/src/share/classes/org/ietf/jgss/GSSName.java b/jdk/src/java.security.jgss/share/classes/org/ietf/jgss/GSSName.java
similarity index 100%
rename from jdk/src/share/classes/org/ietf/jgss/GSSName.java
rename to jdk/src/java.security.jgss/share/classes/org/ietf/jgss/GSSName.java
diff --git a/jdk/src/share/classes/org/ietf/jgss/MessageProp.java b/jdk/src/java.security.jgss/share/classes/org/ietf/jgss/MessageProp.java
similarity index 100%
rename from jdk/src/share/classes/org/ietf/jgss/MessageProp.java
rename to jdk/src/java.security.jgss/share/classes/org/ietf/jgss/MessageProp.java
diff --git a/jdk/src/share/classes/org/ietf/jgss/Oid.java b/jdk/src/java.security.jgss/share/classes/org/ietf/jgss/Oid.java
similarity index 100%
rename from jdk/src/share/classes/org/ietf/jgss/Oid.java
rename to jdk/src/java.security.jgss/share/classes/org/ietf/jgss/Oid.java
diff --git a/jdk/src/share/classes/org/ietf/jgss/package.html b/jdk/src/java.security.jgss/share/classes/org/ietf/jgss/package.html
similarity index 100%
rename from jdk/src/share/classes/org/ietf/jgss/package.html
rename to jdk/src/java.security.jgss/share/classes/org/ietf/jgss/package.html
diff --git a/jdk/src/share/classes/sun/net/www/protocol/http/spnego/NegotiateCallbackHandler.java b/jdk/src/java.security.jgss/share/classes/sun/net/www/protocol/http/spnego/NegotiateCallbackHandler.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/protocol/http/spnego/NegotiateCallbackHandler.java
rename to jdk/src/java.security.jgss/share/classes/sun/net/www/protocol/http/spnego/NegotiateCallbackHandler.java
diff --git a/jdk/src/share/classes/sun/net/www/protocol/http/spnego/NegotiatorImpl.java b/jdk/src/java.security.jgss/share/classes/sun/net/www/protocol/http/spnego/NegotiatorImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/www/protocol/http/spnego/NegotiatorImpl.java
rename to jdk/src/java.security.jgss/share/classes/sun/net/www/protocol/http/spnego/NegotiatorImpl.java
diff --git a/jdk/src/share/classes/sun/security/jgss/GSSCaller.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSCaller.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/GSSCaller.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSCaller.java
diff --git a/jdk/src/share/classes/sun/security/jgss/GSSContextImpl.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSContextImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/GSSContextImpl.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSContextImpl.java
diff --git a/jdk/src/share/classes/sun/security/jgss/GSSCredentialImpl.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSCredentialImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/GSSCredentialImpl.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSCredentialImpl.java
diff --git a/jdk/src/share/classes/sun/security/jgss/GSSExceptionImpl.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSExceptionImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/GSSExceptionImpl.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSExceptionImpl.java
diff --git a/jdk/src/share/classes/sun/security/jgss/GSSHeader.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSHeader.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/GSSHeader.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSHeader.java
diff --git a/jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSManagerImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSManagerImpl.java
diff --git a/jdk/src/share/classes/sun/security/jgss/GSSNameImpl.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSNameImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/GSSNameImpl.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSNameImpl.java
diff --git a/jdk/src/share/classes/sun/security/jgss/GSSToken.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSToken.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/GSSToken.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSToken.java
diff --git a/jdk/src/share/classes/sun/security/jgss/GSSUtil.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSUtil.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/GSSUtil.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSUtil.java
diff --git a/jdk/src/share/classes/sun/security/jgss/HttpCaller.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/HttpCaller.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/HttpCaller.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/HttpCaller.java
diff --git a/jdk/src/share/classes/sun/security/jgss/LoginConfigImpl.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/LoginConfigImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/LoginConfigImpl.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/LoginConfigImpl.java
diff --git a/jdk/src/share/classes/sun/security/jgss/ProviderList.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/ProviderList.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/ProviderList.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/ProviderList.java
diff --git a/jdk/src/share/classes/sun/security/jgss/SunProvider.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/SunProvider.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/SunProvider.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/SunProvider.java
diff --git a/jdk/src/share/classes/sun/security/jgss/TokenTracker.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/TokenTracker.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/TokenTracker.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/TokenTracker.java
diff --git a/jdk/src/share/classes/sun/security/jgss/krb5/AcceptSecContextToken.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/AcceptSecContextToken.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/krb5/AcceptSecContextToken.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/AcceptSecContextToken.java
diff --git a/jdk/src/share/classes/sun/security/jgss/krb5/CipherHelper.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/CipherHelper.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/krb5/CipherHelper.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/CipherHelper.java
diff --git a/jdk/src/share/classes/sun/security/jgss/krb5/InitSecContextToken.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/InitSecContextToken.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/krb5/InitSecContextToken.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/InitSecContextToken.java
diff --git a/jdk/src/share/classes/sun/security/jgss/krb5/InitialToken.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/InitialToken.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/krb5/InitialToken.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/InitialToken.java
diff --git a/jdk/src/share/classes/sun/security/jgss/krb5/Krb5AcceptCredential.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5AcceptCredential.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/krb5/Krb5AcceptCredential.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5AcceptCredential.java
diff --git a/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Context.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5Context.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/krb5/Krb5Context.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5Context.java
diff --git a/jdk/src/share/classes/sun/security/jgss/krb5/Krb5CredElement.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5CredElement.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/krb5/Krb5CredElement.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5CredElement.java
diff --git a/jdk/src/share/classes/sun/security/jgss/krb5/Krb5InitCredential.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5InitCredential.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/krb5/Krb5InitCredential.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5InitCredential.java
diff --git a/jdk/src/share/classes/sun/security/jgss/krb5/Krb5MechFactory.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5MechFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/krb5/Krb5MechFactory.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5MechFactory.java
diff --git a/jdk/src/share/classes/sun/security/jgss/krb5/Krb5NameElement.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5NameElement.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/krb5/Krb5NameElement.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5NameElement.java
diff --git a/jdk/src/share/classes/sun/security/jgss/krb5/Krb5ProxyCredential.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5ProxyCredential.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/krb5/Krb5ProxyCredential.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5ProxyCredential.java
diff --git a/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Token.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5Token.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/krb5/Krb5Token.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5Token.java
diff --git a/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5Util.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5Util.java
diff --git a/jdk/src/share/classes/sun/security/jgss/krb5/MessageToken.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/MessageToken.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/krb5/MessageToken.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/MessageToken.java
diff --git a/jdk/src/share/classes/sun/security/jgss/krb5/MessageToken_v2.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/MessageToken_v2.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/krb5/MessageToken_v2.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/MessageToken_v2.java
diff --git a/jdk/src/share/classes/sun/security/jgss/krb5/MicToken.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/MicToken.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/krb5/MicToken.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/MicToken.java
diff --git a/jdk/src/share/classes/sun/security/jgss/krb5/MicToken_v2.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/MicToken_v2.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/krb5/MicToken_v2.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/MicToken_v2.java
diff --git a/jdk/src/share/classes/sun/security/jgss/krb5/ServiceCreds.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/ServiceCreds.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/krb5/ServiceCreds.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/ServiceCreds.java
diff --git a/jdk/src/share/classes/sun/security/jgss/krb5/SubjectComber.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/SubjectComber.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/krb5/SubjectComber.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/SubjectComber.java
diff --git a/jdk/src/share/classes/sun/security/jgss/krb5/WrapToken.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/WrapToken.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/krb5/WrapToken.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/WrapToken.java
diff --git a/jdk/src/share/classes/sun/security/jgss/krb5/WrapToken_v2.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/WrapToken_v2.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/krb5/WrapToken_v2.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/WrapToken_v2.java
diff --git a/jdk/src/share/classes/sun/security/jgss/spi/GSSContextSpi.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/spi/GSSContextSpi.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/spi/GSSContextSpi.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/spi/GSSContextSpi.java
diff --git a/jdk/src/share/classes/sun/security/jgss/spi/GSSCredentialSpi.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/spi/GSSCredentialSpi.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/spi/GSSCredentialSpi.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/spi/GSSCredentialSpi.java
diff --git a/jdk/src/share/classes/sun/security/jgss/spi/GSSNameSpi.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/spi/GSSNameSpi.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/spi/GSSNameSpi.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/spi/GSSNameSpi.java
diff --git a/jdk/src/share/classes/sun/security/jgss/spi/MechanismFactory.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/spi/MechanismFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/spi/MechanismFactory.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/spi/MechanismFactory.java
diff --git a/jdk/src/share/classes/sun/security/jgss/spnego/NegTokenInit.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/spnego/NegTokenInit.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/spnego/NegTokenInit.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/spnego/NegTokenInit.java
diff --git a/jdk/src/share/classes/sun/security/jgss/spnego/NegTokenTarg.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/spnego/NegTokenTarg.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/spnego/NegTokenTarg.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/spnego/NegTokenTarg.java
diff --git a/jdk/src/share/classes/sun/security/jgss/spnego/SpNegoContext.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/spnego/SpNegoContext.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/spnego/SpNegoContext.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/spnego/SpNegoContext.java
diff --git a/jdk/src/share/classes/sun/security/jgss/spnego/SpNegoCredElement.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/spnego/SpNegoCredElement.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/spnego/SpNegoCredElement.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/spnego/SpNegoCredElement.java
diff --git a/jdk/src/share/classes/sun/security/jgss/spnego/SpNegoMechFactory.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/spnego/SpNegoMechFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/spnego/SpNegoMechFactory.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/spnego/SpNegoMechFactory.java
diff --git a/jdk/src/share/classes/sun/security/jgss/spnego/SpNegoToken.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/spnego/SpNegoToken.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/spnego/SpNegoToken.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/spnego/SpNegoToken.java
diff --git a/jdk/src/share/classes/sun/security/jgss/wrapper/GSSCredElement.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/GSSCredElement.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/wrapper/GSSCredElement.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/GSSCredElement.java
diff --git a/jdk/src/share/classes/sun/security/jgss/wrapper/GSSLibStub.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/GSSLibStub.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/wrapper/GSSLibStub.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/GSSLibStub.java
diff --git a/jdk/src/share/classes/sun/security/jgss/wrapper/GSSNameElement.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/GSSNameElement.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/wrapper/GSSNameElement.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/GSSNameElement.java
diff --git a/jdk/src/share/classes/sun/security/jgss/wrapper/Krb5Util.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/Krb5Util.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/wrapper/Krb5Util.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/Krb5Util.java
diff --git a/jdk/src/share/classes/sun/security/jgss/wrapper/NativeGSSContext.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/NativeGSSContext.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/wrapper/NativeGSSContext.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/NativeGSSContext.java
diff --git a/jdk/src/share/classes/sun/security/jgss/wrapper/NativeGSSFactory.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/NativeGSSFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/wrapper/NativeGSSFactory.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/NativeGSSFactory.java
diff --git a/jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java
diff --git a/jdk/src/share/classes/sun/security/krb5/Asn1Exception.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/Asn1Exception.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/Asn1Exception.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/Asn1Exception.java
diff --git a/jdk/src/share/classes/sun/security/krb5/Checksum.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/Checksum.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/Checksum.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/Checksum.java
diff --git a/jdk/src/share/classes/sun/security/krb5/Config.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/Config.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/Config.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/Config.java
diff --git a/jdk/src/share/classes/sun/security/krb5/Confounder.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/Confounder.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/Confounder.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/Confounder.java
diff --git a/jdk/src/share/classes/sun/security/krb5/Credentials.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/Credentials.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/Credentials.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/Credentials.java
diff --git a/jdk/src/share/classes/sun/security/krb5/EncryptedData.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/EncryptedData.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/EncryptedData.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/EncryptedData.java
diff --git a/jdk/src/share/classes/sun/security/krb5/EncryptionKey.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/EncryptionKey.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/EncryptionKey.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/EncryptionKey.java
diff --git a/jdk/src/share/classes/sun/security/krb5/JavaxSecurityAuthKerberosAccess.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/JavaxSecurityAuthKerberosAccess.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/JavaxSecurityAuthKerberosAccess.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/JavaxSecurityAuthKerberosAccess.java
diff --git a/jdk/src/share/classes/sun/security/krb5/KdcComm.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KdcComm.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/KdcComm.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/KdcComm.java
diff --git a/jdk/src/share/classes/sun/security/krb5/KerberosSecrets.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KerberosSecrets.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/KerberosSecrets.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/KerberosSecrets.java
diff --git a/jdk/src/share/classes/sun/security/krb5/KrbApRep.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbApRep.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/KrbApRep.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbApRep.java
diff --git a/jdk/src/share/classes/sun/security/krb5/KrbApReq.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbApReq.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/KrbApReq.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbApReq.java
diff --git a/jdk/src/share/classes/sun/security/krb5/KrbAppMessage.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbAppMessage.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/KrbAppMessage.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbAppMessage.java
diff --git a/jdk/src/share/classes/sun/security/krb5/KrbAsRep.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbAsRep.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/KrbAsRep.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbAsRep.java
diff --git a/jdk/src/share/classes/sun/security/krb5/KrbAsReq.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbAsReq.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/KrbAsReq.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbAsReq.java
diff --git a/jdk/src/share/classes/sun/security/krb5/KrbAsReqBuilder.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbAsReqBuilder.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/KrbAsReqBuilder.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbAsReqBuilder.java
diff --git a/jdk/src/share/classes/sun/security/krb5/KrbCred.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbCred.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/KrbCred.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbCred.java
diff --git a/jdk/src/share/classes/sun/security/krb5/KrbCryptoException.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbCryptoException.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/KrbCryptoException.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbCryptoException.java
diff --git a/jdk/src/share/classes/sun/security/krb5/KrbException.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbException.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/KrbException.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbException.java
diff --git a/jdk/src/share/classes/sun/security/krb5/KrbKdcRep.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbKdcRep.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/KrbKdcRep.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbKdcRep.java
diff --git a/jdk/src/share/classes/sun/security/krb5/KrbPriv.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbPriv.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/KrbPriv.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbPriv.java
diff --git a/jdk/src/share/classes/sun/security/krb5/KrbSafe.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbSafe.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/KrbSafe.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbSafe.java
diff --git a/jdk/src/share/classes/sun/security/krb5/KrbServiceLocator.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbServiceLocator.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/KrbServiceLocator.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbServiceLocator.java
diff --git a/jdk/src/share/classes/sun/security/krb5/KrbTgsRep.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbTgsRep.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/KrbTgsRep.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbTgsRep.java
diff --git a/jdk/src/share/classes/sun/security/krb5/KrbTgsReq.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbTgsReq.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/KrbTgsReq.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbTgsReq.java
diff --git a/jdk/src/share/classes/sun/security/krb5/PrincipalName.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/PrincipalName.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/PrincipalName.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/PrincipalName.java
diff --git a/jdk/src/share/classes/sun/security/krb5/Realm.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/Realm.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/Realm.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/Realm.java
diff --git a/jdk/src/share/classes/sun/security/krb5/RealmException.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/RealmException.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/RealmException.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/RealmException.java
diff --git a/jdk/src/share/classes/sun/security/krb5/SCDynamicStoreConfig.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/SCDynamicStoreConfig.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/SCDynamicStoreConfig.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/SCDynamicStoreConfig.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/APOptions.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/APOptions.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/APOptions.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/APOptions.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/APRep.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/APRep.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/APRep.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/APRep.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/APReq.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/APReq.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/APReq.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/APReq.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/ASRep.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ASRep.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/ASRep.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ASRep.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/ASReq.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ASReq.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/ASReq.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ASReq.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/AuthContext.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/AuthContext.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/AuthContext.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/AuthContext.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/Authenticator.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/Authenticator.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/AuthorizationData.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/AuthorizationData.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationDataEntry.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/AuthorizationDataEntry.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/AuthorizationDataEntry.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/AuthorizationDataEntry.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/CredentialsUtil.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/CredentialsUtil.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/CredentialsUtil.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/CredentialsUtil.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/ETypeInfo.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ETypeInfo.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/ETypeInfo.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ETypeInfo.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/ETypeInfo2.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ETypeInfo2.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/ETypeInfo2.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ETypeInfo2.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncAPRepPart.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncAPRepPart.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/EncASRepPart.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncASRepPart.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/EncASRepPart.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncASRepPart.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/EncKDCRepPart.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncKDCRepPart.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/EncKDCRepPart.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncKDCRepPart.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/EncKrbCredPart.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncKrbCredPart.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/EncKrbCredPart.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncKrbCredPart.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/EncKrbPrivPart.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncKrbPrivPart.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/EncKrbPrivPart.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncKrbPrivPart.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/EncTGSRepPart.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncTGSRepPart.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/EncTGSRepPart.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncTGSRepPart.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/EncTicketPart.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncTicketPart.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/EncTicketPart.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncTicketPart.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/HostAddress.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/HostAddress.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/HostAddress.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/HostAddress.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/HostAddresses.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/HostAddresses.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/KDCOptions.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KDCOptions.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/KDCOptions.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KDCOptions.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/KDCRep.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KDCRep.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/KDCRep.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KDCRep.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KDCReq.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KDCReq.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KDCReqBody.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KDCReqBody.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBCred.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBCred.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBError.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/KRBError.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBError.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/KRBPriv.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBPriv.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/KRBPriv.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBPriv.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/KRBSafe.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBSafe.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/KRBSafe.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBSafe.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/KRBSafeBody.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBSafeBody.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/KRBSafeBody.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBSafeBody.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/KdcErrException.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KdcErrException.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/KdcErrException.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KdcErrException.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/KerberosTime.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KerberosTime.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/KerberosTime.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KerberosTime.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/Krb5.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/Krb5.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/Krb5.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/Krb5.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/KrbApErrException.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KrbApErrException.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/KrbApErrException.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KrbApErrException.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KrbCredInfo.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KrbCredInfo.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/KrbErrException.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KrbErrException.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/KrbErrException.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KrbErrException.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/LastReq.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/LastReq.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/LastReq.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/LastReqEntry.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/LastReqEntry.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/LastReqEntry.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/LastReqEntry.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/LocalSeqNumber.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/LocalSeqNumber.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/LocalSeqNumber.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/LocalSeqNumber.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/LoginOptions.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/LoginOptions.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/LoginOptions.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/LoginOptions.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/MethodData.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/MethodData.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/MethodData.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/MethodData.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/NetClient.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/NetClient.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/NetClient.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/NetClient.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/PAData.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/PAData.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/PAData.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/PAData.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/PAEncTSEnc.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/PAEncTSEnc.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/PAEncTSEnc.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/PAEncTSEnc.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/PAForUserEnc.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/PAForUserEnc.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/PAForUserEnc.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/PAForUserEnc.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/ReplayCache.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ReplayCache.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/ReplayCache.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ReplayCache.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/SeqNumber.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/SeqNumber.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/SeqNumber.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/SeqNumber.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/TGSRep.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/TGSRep.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/TGSRep.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/TGSRep.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/TGSReq.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/TGSReq.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/TGSReq.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/TGSReq.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/Ticket.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/Ticket.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/Ticket.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/Ticket.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/TicketFlags.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/TicketFlags.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/TicketFlags.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/TicketFlags.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/TransitedEncoding.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/TransitedEncoding.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/TransitedEncoding.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/TransitedEncoding.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/ccache/CCacheInputStream.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/CCacheInputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/ccache/CCacheInputStream.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/CCacheInputStream.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/ccache/CCacheOutputStream.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/CCacheOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/ccache/CCacheOutputStream.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/CCacheOutputStream.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/ccache/Credentials.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/Credentials.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/ccache/Credentials.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/Credentials.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/ccache/CredentialsCache.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/CredentialsCache.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/ccache/CredentialsCache.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/CredentialsCache.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCCacheConstants.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCCacheConstants.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCCacheConstants.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCCacheConstants.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java
similarity index 91%
rename from jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java
index 3337d9fd5cf..2335cc23eb9 100644
--- a/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java
+++ b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java
@@ -43,7 +43,6 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
-import java.lang.reflect.*;
 
 /**
  * CredentialsCache stores credentials(tickets, session keys, etc) in a
@@ -388,52 +387,36 @@ public class FileCredentialsCache extends CredentialsCache
 
         /*
          * For Unix platforms we use the default cache name to be
-         * /tmp/krbcc_uid ; for all other platforms  we use
-         * {user_home}/krb5_cc{user_name}
-         * Please note that for Windows 2K we will use LSA to get
+         * /tmp/krb5cc_uid ; for all other platforms  we use
+         * {user_home}/krb5cc_{user_name}
+         * Please note that for Windows we will use LSA to get
          * the TGT from the the default cache even before we come here;
          * however when we create cache we will create a cache under
-         * {user_home}/krb5_cc{user_name} for non-Unix platforms including
-         * Windows 2K.
+         * {user_home}/krb5cc_{user_name} for non-Unix platforms including
+         * Windows.
          */
 
-        if (osname != null) {
-            String cmd = null;
-            String uidStr = null;
-            long uid = 0;
-
-            if (osname.startsWith("SunOS") ||
-                (osname.startsWith("Linux"))) {
-                try {
-                    Class c = Class.forName
-                        ("com.sun.security.auth.module.UnixSystem");
-                    Constructor constructor = c.getConstructor();
-                    Object obj = constructor.newInstance();
-                    Method method = c.getMethod("getUid");
-                    uid =  ((Long)method.invoke(obj)).longValue();
-                    name = File.separator + "tmp" +
+        if (osname != null && !osname.startsWith("Windows")) {
+            long uid = sun.misc.VM.getuid();
+            if (uid != -1) {
+                name = File.separator + "tmp" +
                         File.separator + stdCacheNameComponent + "_" + uid;
-                    if (DEBUG) {
-                        System.out.println(">>>KinitOptions cache name is " +
-                                           name);
-                    }
-                    return name;
-                } catch (Exception e) {
-                    if (DEBUG) {
-                        System.out.println("Exception in obtaining uid " +
-                                            "for Unix platforms " +
-                                            "Using user's home directory");
-
-
-                        e.printStackTrace();
-                    }
+                if (DEBUG) {
+                    System.out.println(">>>KinitOptions cache name is " +
+                            name);
+                }
+                return name;
+            } else {
+                if (DEBUG) {
+                    System.out.println("Error in obtaining uid " +
+                                        "for Unix platforms " +
+                                        "Using user's home directory");
                 }
             }
         }
 
         // we did not get the uid;
 
-
         String user_name =
             java.security.AccessController.doPrivileged(
                         new sun.security.action.GetPropertyAction("user.name"));
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/ccache/MemoryCredentialsCache.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/MemoryCredentialsCache.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/ccache/MemoryCredentialsCache.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/MemoryCredentialsCache.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/ccache/Tag.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/Tag.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/ccache/Tag.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/Tag.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/crypto/Aes128.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Aes128.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/crypto/Aes128.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Aes128.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/crypto/Aes128CtsHmacSha1EType.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Aes128CtsHmacSha1EType.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/crypto/Aes128CtsHmacSha1EType.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Aes128CtsHmacSha1EType.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/crypto/Aes256.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Aes256.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/crypto/Aes256.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Aes256.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/crypto/Aes256CtsHmacSha1EType.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Aes256CtsHmacSha1EType.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/crypto/Aes256CtsHmacSha1EType.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Aes256CtsHmacSha1EType.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/crypto/ArcFourHmac.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/ArcFourHmac.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/crypto/ArcFourHmac.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/ArcFourHmac.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/crypto/ArcFourHmacEType.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/ArcFourHmacEType.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/crypto/ArcFourHmacEType.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/ArcFourHmacEType.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/crypto/CksumType.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/CksumType.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/crypto/CksumType.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/CksumType.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/crypto/Crc32CksumType.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Crc32CksumType.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/crypto/Crc32CksumType.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Crc32CksumType.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/crypto/Des.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Des.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/crypto/Des.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Des.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/crypto/Des3.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Des3.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/crypto/Des3.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Des3.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/crypto/Des3CbcHmacSha1KdEType.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Des3CbcHmacSha1KdEType.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/crypto/Des3CbcHmacSha1KdEType.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Des3CbcHmacSha1KdEType.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/crypto/DesCbcCrcEType.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/DesCbcCrcEType.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/crypto/DesCbcCrcEType.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/DesCbcCrcEType.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/crypto/DesCbcEType.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/DesCbcEType.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/crypto/DesCbcEType.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/DesCbcEType.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/crypto/DesCbcMd5EType.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/DesCbcMd5EType.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/crypto/DesCbcMd5EType.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/DesCbcMd5EType.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/crypto/DesMacCksumType.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/DesMacCksumType.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/crypto/DesMacCksumType.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/DesMacCksumType.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/crypto/DesMacKCksumType.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/DesMacKCksumType.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/crypto/DesMacKCksumType.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/DesMacKCksumType.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/EType.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/EType.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/crypto/HmacMd5ArcFourCksumType.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/HmacMd5ArcFourCksumType.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/crypto/HmacMd5ArcFourCksumType.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/HmacMd5ArcFourCksumType.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/crypto/HmacSha1Aes128CksumType.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/HmacSha1Aes128CksumType.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/crypto/HmacSha1Aes128CksumType.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/HmacSha1Aes128CksumType.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/crypto/HmacSha1Aes256CksumType.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/HmacSha1Aes256CksumType.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/crypto/HmacSha1Aes256CksumType.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/HmacSha1Aes256CksumType.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/crypto/HmacSha1Des3KdCksumType.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/HmacSha1Des3KdCksumType.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/crypto/HmacSha1Des3KdCksumType.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/HmacSha1Des3KdCksumType.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/crypto/KeyUsage.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/KeyUsage.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/crypto/KeyUsage.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/KeyUsage.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/crypto/Nonce.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Nonce.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/crypto/Nonce.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Nonce.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/crypto/NullEType.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/NullEType.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/crypto/NullEType.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/NullEType.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/crypto/RsaMd5CksumType.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/RsaMd5CksumType.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/crypto/RsaMd5CksumType.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/RsaMd5CksumType.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/crypto/RsaMd5DesCksumType.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/RsaMd5DesCksumType.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/crypto/RsaMd5DesCksumType.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/RsaMd5DesCksumType.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/crypto/crc32.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/crc32.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/crypto/crc32.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/crc32.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/crypto/dk/AesDkCrypto.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/dk/AesDkCrypto.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/crypto/dk/AesDkCrypto.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/dk/AesDkCrypto.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/crypto/dk/ArcFourCrypto.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/dk/ArcFourCrypto.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/crypto/dk/ArcFourCrypto.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/dk/ArcFourCrypto.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/crypto/dk/Des3DkCrypto.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/dk/Des3DkCrypto.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/crypto/dk/Des3DkCrypto.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/dk/Des3DkCrypto.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTab.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTab.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTabConstants.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTabConstants.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTabConstants.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTabConstants.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTabEntry.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTabEntry.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTabEntry.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTabEntry.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTabInputStream.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTabInputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTabInputStream.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTabInputStream.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTabOutputStream.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTabOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTabOutputStream.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTabOutputStream.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/rcache/AuthList.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/AuthList.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/rcache/AuthList.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/AuthList.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/rcache/AuthTime.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/AuthTime.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/rcache/AuthTime.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/AuthTime.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/rcache/AuthTimeWithHash.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/AuthTimeWithHash.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/rcache/AuthTimeWithHash.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/AuthTimeWithHash.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/rcache/DflCache.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/DflCache.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/rcache/DflCache.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/DflCache.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/rcache/MemoryCache.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/MemoryCache.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/rcache/MemoryCache.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/MemoryCache.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/util/KerberosFlags.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/util/KerberosFlags.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/util/KerberosFlags.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/util/KerberosFlags.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/util/KerberosString.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/util/KerberosString.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/util/KerberosString.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/util/KerberosString.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/util/KrbDataInputStream.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/util/KrbDataInputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/util/KrbDataInputStream.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/util/KrbDataInputStream.java
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/util/KrbDataOutputStream.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/util/KrbDataOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/krb5/internal/util/KrbDataOutputStream.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/util/KrbDataOutputStream.java
diff --git a/jdk/src/share/classes/sun/security/ssl/krb5/KerberosClientKeyExchangeImpl.java b/jdk/src/java.security.jgss/share/classes/sun/security/ssl/krb5/KerberosClientKeyExchangeImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/krb5/KerberosClientKeyExchangeImpl.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/ssl/krb5/KerberosClientKeyExchangeImpl.java
diff --git a/jdk/src/share/classes/sun/security/ssl/krb5/KerberosPreMasterSecret.java b/jdk/src/java.security.jgss/share/classes/sun/security/ssl/krb5/KerberosPreMasterSecret.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/krb5/KerberosPreMasterSecret.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/ssl/krb5/KerberosPreMasterSecret.java
diff --git a/jdk/src/share/classes/sun/security/ssl/krb5/Krb5ProxyImpl.java b/jdk/src/java.security.jgss/share/classes/sun/security/ssl/krb5/Krb5ProxyImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ssl/krb5/Krb5ProxyImpl.java
rename to jdk/src/java.security.jgss/share/classes/sun/security/ssl/krb5/Krb5ProxyImpl.java
diff --git a/jdk/src/share/native/sun/security/jgss/wrapper/GSSLibStub.c b/jdk/src/java.security.jgss/share/native/libj2gss/GSSLibStub.c
similarity index 100%
rename from jdk/src/share/native/sun/security/jgss/wrapper/GSSLibStub.c
rename to jdk/src/java.security.jgss/share/native/libj2gss/GSSLibStub.c
diff --git a/jdk/src/share/native/sun/security/jgss/wrapper/NativeUtil.c b/jdk/src/java.security.jgss/share/native/libj2gss/NativeUtil.c
similarity index 100%
rename from jdk/src/share/native/sun/security/jgss/wrapper/NativeUtil.c
rename to jdk/src/java.security.jgss/share/native/libj2gss/NativeUtil.c
diff --git a/jdk/src/share/native/sun/security/jgss/wrapper/NativeUtil.h b/jdk/src/java.security.jgss/share/native/libj2gss/NativeUtil.h
similarity index 100%
rename from jdk/src/share/native/sun/security/jgss/wrapper/NativeUtil.h
rename to jdk/src/java.security.jgss/share/native/libj2gss/NativeUtil.h
diff --git a/jdk/src/share/native/sun/security/jgss/wrapper/gssapi.h b/jdk/src/java.security.jgss/share/native/libj2gss/gssapi.h
similarity index 100%
rename from jdk/src/share/native/sun/security/jgss/wrapper/gssapi.h
rename to jdk/src/java.security.jgss/share/native/libj2gss/gssapi.h
diff --git a/jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c b/jdk/src/java.security.jgss/unix/native/libj2gss/NativeFunc.c
similarity index 100%
rename from jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c
rename to jdk/src/java.security.jgss/unix/native/libj2gss/NativeFunc.c
diff --git a/jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h b/jdk/src/java.security.jgss/unix/native/libj2gss/NativeFunc.h
similarity index 100%
rename from jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h
rename to jdk/src/java.security.jgss/unix/native/libj2gss/NativeFunc.h
diff --git a/jdk/src/windows/classes/sun/security/krb5/internal/tools/Kinit.java b/jdk/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Kinit.java
similarity index 100%
rename from jdk/src/windows/classes/sun/security/krb5/internal/tools/Kinit.java
rename to jdk/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Kinit.java
diff --git a/jdk/src/windows/classes/sun/security/krb5/internal/tools/KinitOptions.java b/jdk/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/KinitOptions.java
similarity index 100%
rename from jdk/src/windows/classes/sun/security/krb5/internal/tools/KinitOptions.java
rename to jdk/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/KinitOptions.java
diff --git a/jdk/src/windows/classes/sun/security/krb5/internal/tools/Klist.java b/jdk/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Klist.java
similarity index 100%
rename from jdk/src/windows/classes/sun/security/krb5/internal/tools/Klist.java
rename to jdk/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Klist.java
diff --git a/jdk/src/windows/classes/sun/security/krb5/internal/tools/Ktab.java b/jdk/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Ktab.java
similarity index 100%
rename from jdk/src/windows/classes/sun/security/krb5/internal/tools/Ktab.java
rename to jdk/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Ktab.java
diff --git a/jdk/src/windows/native/sun/security/krb5/NativeCreds.c b/jdk/src/java.security.jgss/windows/native/libw2k_lsa_auth/NativeCreds.c
similarity index 100%
rename from jdk/src/windows/native/sun/security/krb5/NativeCreds.c
rename to jdk/src/java.security.jgss/windows/native/libw2k_lsa_auth/NativeCreds.c
diff --git a/jdk/src/windows/native/sun/security/krb5/WindowsDirectory.c b/jdk/src/java.security.jgss/windows/native/libw2k_lsa_auth/WindowsDirectory.c
similarity index 100%
rename from jdk/src/windows/native/sun/security/krb5/WindowsDirectory.c
rename to jdk/src/java.security.jgss/windows/native/libw2k_lsa_auth/WindowsDirectory.c
diff --git a/jdk/src/share/classes/com/sun/security/sasl/ClientFactoryImpl.java b/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/ClientFactoryImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/sasl/ClientFactoryImpl.java
rename to jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/ClientFactoryImpl.java
diff --git a/jdk/src/share/classes/com/sun/security/sasl/CramMD5Base.java b/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/CramMD5Base.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/sasl/CramMD5Base.java
rename to jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/CramMD5Base.java
diff --git a/jdk/src/share/classes/com/sun/security/sasl/CramMD5Client.java b/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/CramMD5Client.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/sasl/CramMD5Client.java
rename to jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/CramMD5Client.java
diff --git a/jdk/src/share/classes/com/sun/security/sasl/CramMD5Server.java b/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/CramMD5Server.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/sasl/CramMD5Server.java
rename to jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/CramMD5Server.java
diff --git a/jdk/src/share/classes/com/sun/security/sasl/ExternalClient.java b/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/ExternalClient.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/sasl/ExternalClient.java
rename to jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/ExternalClient.java
diff --git a/jdk/src/share/classes/com/sun/security/sasl/PlainClient.java b/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/PlainClient.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/sasl/PlainClient.java
rename to jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/PlainClient.java
diff --git a/jdk/src/share/classes/com/sun/security/sasl/Provider.java b/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/Provider.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/sasl/Provider.java
rename to jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/Provider.java
diff --git a/jdk/src/share/classes/com/sun/security/sasl/ServerFactoryImpl.java b/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/ServerFactoryImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/sasl/ServerFactoryImpl.java
rename to jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/ServerFactoryImpl.java
diff --git a/jdk/src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java b/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java
rename to jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java
diff --git a/jdk/src/share/classes/com/sun/security/sasl/digest/DigestMD5Client.java b/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/DigestMD5Client.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/sasl/digest/DigestMD5Client.java
rename to jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/DigestMD5Client.java
diff --git a/jdk/src/share/classes/com/sun/security/sasl/digest/DigestMD5Server.java b/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/DigestMD5Server.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/sasl/digest/DigestMD5Server.java
rename to jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/DigestMD5Server.java
diff --git a/jdk/src/share/classes/com/sun/security/sasl/digest/FactoryImpl.java b/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/FactoryImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/sasl/digest/FactoryImpl.java
rename to jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/FactoryImpl.java
diff --git a/jdk/src/share/classes/com/sun/security/sasl/digest/SecurityCtx.java b/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/SecurityCtx.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/sasl/digest/SecurityCtx.java
rename to jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/SecurityCtx.java
diff --git a/jdk/src/share/classes/com/sun/security/sasl/ntlm/FactoryImpl.java b/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/ntlm/FactoryImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/sasl/ntlm/FactoryImpl.java
rename to jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/ntlm/FactoryImpl.java
diff --git a/jdk/src/share/classes/com/sun/security/sasl/ntlm/NTLMClient.java b/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/ntlm/NTLMClient.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/sasl/ntlm/NTLMClient.java
rename to jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/ntlm/NTLMClient.java
diff --git a/jdk/src/share/classes/com/sun/security/sasl/ntlm/NTLMServer.java b/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/ntlm/NTLMServer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/sasl/ntlm/NTLMServer.java
rename to jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/ntlm/NTLMServer.java
diff --git a/jdk/src/share/classes/com/sun/security/sasl/util/AbstractSaslImpl.java b/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/util/AbstractSaslImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/sasl/util/AbstractSaslImpl.java
rename to jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/util/AbstractSaslImpl.java
diff --git a/jdk/src/share/classes/com/sun/security/sasl/util/PolicyUtils.java b/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/util/PolicyUtils.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/sasl/util/PolicyUtils.java
rename to jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/util/PolicyUtils.java
diff --git a/jdk/src/share/classes/javax/security/sasl/AuthenticationException.java b/jdk/src/java.security.sasl/share/classes/javax/security/sasl/AuthenticationException.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/sasl/AuthenticationException.java
rename to jdk/src/java.security.sasl/share/classes/javax/security/sasl/AuthenticationException.java
diff --git a/jdk/src/share/classes/javax/security/sasl/AuthorizeCallback.java b/jdk/src/java.security.sasl/share/classes/javax/security/sasl/AuthorizeCallback.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/sasl/AuthorizeCallback.java
rename to jdk/src/java.security.sasl/share/classes/javax/security/sasl/AuthorizeCallback.java
diff --git a/jdk/src/share/classes/javax/security/sasl/RealmCallback.java b/jdk/src/java.security.sasl/share/classes/javax/security/sasl/RealmCallback.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/sasl/RealmCallback.java
rename to jdk/src/java.security.sasl/share/classes/javax/security/sasl/RealmCallback.java
diff --git a/jdk/src/share/classes/javax/security/sasl/RealmChoiceCallback.java b/jdk/src/java.security.sasl/share/classes/javax/security/sasl/RealmChoiceCallback.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/sasl/RealmChoiceCallback.java
rename to jdk/src/java.security.sasl/share/classes/javax/security/sasl/RealmChoiceCallback.java
diff --git a/jdk/src/share/classes/javax/security/sasl/Sasl.java b/jdk/src/java.security.sasl/share/classes/javax/security/sasl/Sasl.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/sasl/Sasl.java
rename to jdk/src/java.security.sasl/share/classes/javax/security/sasl/Sasl.java
diff --git a/jdk/src/share/classes/javax/security/sasl/SaslClient.java b/jdk/src/java.security.sasl/share/classes/javax/security/sasl/SaslClient.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/sasl/SaslClient.java
rename to jdk/src/java.security.sasl/share/classes/javax/security/sasl/SaslClient.java
diff --git a/jdk/src/share/classes/javax/security/sasl/SaslClientFactory.java b/jdk/src/java.security.sasl/share/classes/javax/security/sasl/SaslClientFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/sasl/SaslClientFactory.java
rename to jdk/src/java.security.sasl/share/classes/javax/security/sasl/SaslClientFactory.java
diff --git a/jdk/src/share/classes/javax/security/sasl/SaslException.java b/jdk/src/java.security.sasl/share/classes/javax/security/sasl/SaslException.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/sasl/SaslException.java
rename to jdk/src/java.security.sasl/share/classes/javax/security/sasl/SaslException.java
diff --git a/jdk/src/share/classes/javax/security/sasl/SaslServer.java b/jdk/src/java.security.sasl/share/classes/javax/security/sasl/SaslServer.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/sasl/SaslServer.java
rename to jdk/src/java.security.sasl/share/classes/javax/security/sasl/SaslServer.java
diff --git a/jdk/src/share/classes/javax/security/sasl/SaslServerFactory.java b/jdk/src/java.security.sasl/share/classes/javax/security/sasl/SaslServerFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/sasl/SaslServerFactory.java
rename to jdk/src/java.security.sasl/share/classes/javax/security/sasl/SaslServerFactory.java
diff --git a/jdk/src/share/classes/javax/security/sasl/package-info.java b/jdk/src/java.security.sasl/share/classes/javax/security/sasl/package-info.java
similarity index 100%
rename from jdk/src/share/classes/javax/security/sasl/package-info.java
rename to jdk/src/java.security.sasl/share/classes/javax/security/sasl/package-info.java
diff --git a/jdk/src/share/classes/javax/smartcardio/ATR.java b/jdk/src/java.smartcardio/share/classes/javax/smartcardio/ATR.java
similarity index 100%
rename from jdk/src/share/classes/javax/smartcardio/ATR.java
rename to jdk/src/java.smartcardio/share/classes/javax/smartcardio/ATR.java
diff --git a/jdk/src/share/classes/javax/smartcardio/Card.java b/jdk/src/java.smartcardio/share/classes/javax/smartcardio/Card.java
similarity index 100%
rename from jdk/src/share/classes/javax/smartcardio/Card.java
rename to jdk/src/java.smartcardio/share/classes/javax/smartcardio/Card.java
diff --git a/jdk/src/share/classes/javax/smartcardio/CardChannel.java b/jdk/src/java.smartcardio/share/classes/javax/smartcardio/CardChannel.java
similarity index 100%
rename from jdk/src/share/classes/javax/smartcardio/CardChannel.java
rename to jdk/src/java.smartcardio/share/classes/javax/smartcardio/CardChannel.java
diff --git a/jdk/src/share/classes/javax/smartcardio/CardException.java b/jdk/src/java.smartcardio/share/classes/javax/smartcardio/CardException.java
similarity index 100%
rename from jdk/src/share/classes/javax/smartcardio/CardException.java
rename to jdk/src/java.smartcardio/share/classes/javax/smartcardio/CardException.java
diff --git a/jdk/src/share/classes/javax/smartcardio/CardNotPresentException.java b/jdk/src/java.smartcardio/share/classes/javax/smartcardio/CardNotPresentException.java
similarity index 100%
rename from jdk/src/share/classes/javax/smartcardio/CardNotPresentException.java
rename to jdk/src/java.smartcardio/share/classes/javax/smartcardio/CardNotPresentException.java
diff --git a/jdk/src/share/classes/javax/smartcardio/CardPermission.java b/jdk/src/java.smartcardio/share/classes/javax/smartcardio/CardPermission.java
similarity index 100%
rename from jdk/src/share/classes/javax/smartcardio/CardPermission.java
rename to jdk/src/java.smartcardio/share/classes/javax/smartcardio/CardPermission.java
diff --git a/jdk/src/share/classes/javax/smartcardio/CardTerminal.java b/jdk/src/java.smartcardio/share/classes/javax/smartcardio/CardTerminal.java
similarity index 100%
rename from jdk/src/share/classes/javax/smartcardio/CardTerminal.java
rename to jdk/src/java.smartcardio/share/classes/javax/smartcardio/CardTerminal.java
diff --git a/jdk/src/share/classes/javax/smartcardio/CardTerminals.java b/jdk/src/java.smartcardio/share/classes/javax/smartcardio/CardTerminals.java
similarity index 100%
rename from jdk/src/share/classes/javax/smartcardio/CardTerminals.java
rename to jdk/src/java.smartcardio/share/classes/javax/smartcardio/CardTerminals.java
diff --git a/jdk/src/share/classes/javax/smartcardio/CommandAPDU.java b/jdk/src/java.smartcardio/share/classes/javax/smartcardio/CommandAPDU.java
similarity index 100%
rename from jdk/src/share/classes/javax/smartcardio/CommandAPDU.java
rename to jdk/src/java.smartcardio/share/classes/javax/smartcardio/CommandAPDU.java
diff --git a/jdk/src/share/classes/javax/smartcardio/ResponseAPDU.java b/jdk/src/java.smartcardio/share/classes/javax/smartcardio/ResponseAPDU.java
similarity index 100%
rename from jdk/src/share/classes/javax/smartcardio/ResponseAPDU.java
rename to jdk/src/java.smartcardio/share/classes/javax/smartcardio/ResponseAPDU.java
diff --git a/jdk/src/share/classes/javax/smartcardio/TerminalFactory.java b/jdk/src/java.smartcardio/share/classes/javax/smartcardio/TerminalFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/smartcardio/TerminalFactory.java
rename to jdk/src/java.smartcardio/share/classes/javax/smartcardio/TerminalFactory.java
diff --git a/jdk/src/share/classes/javax/smartcardio/TerminalFactorySpi.java b/jdk/src/java.smartcardio/share/classes/javax/smartcardio/TerminalFactorySpi.java
similarity index 100%
rename from jdk/src/share/classes/javax/smartcardio/TerminalFactorySpi.java
rename to jdk/src/java.smartcardio/share/classes/javax/smartcardio/TerminalFactorySpi.java
diff --git a/jdk/src/share/classes/javax/smartcardio/package.html b/jdk/src/java.smartcardio/share/classes/javax/smartcardio/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/smartcardio/package.html
rename to jdk/src/java.smartcardio/share/classes/javax/smartcardio/package.html
diff --git a/jdk/src/share/classes/sun/security/smartcardio/CardImpl.java b/jdk/src/java.smartcardio/share/classes/sun/security/smartcardio/CardImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/smartcardio/CardImpl.java
rename to jdk/src/java.smartcardio/share/classes/sun/security/smartcardio/CardImpl.java
diff --git a/jdk/src/share/classes/sun/security/smartcardio/ChannelImpl.java b/jdk/src/java.smartcardio/share/classes/sun/security/smartcardio/ChannelImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/smartcardio/ChannelImpl.java
rename to jdk/src/java.smartcardio/share/classes/sun/security/smartcardio/ChannelImpl.java
diff --git a/jdk/src/share/classes/sun/security/smartcardio/PCSC.java b/jdk/src/java.smartcardio/share/classes/sun/security/smartcardio/PCSC.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/smartcardio/PCSC.java
rename to jdk/src/java.smartcardio/share/classes/sun/security/smartcardio/PCSC.java
diff --git a/jdk/src/share/classes/sun/security/smartcardio/PCSCException.java b/jdk/src/java.smartcardio/share/classes/sun/security/smartcardio/PCSCException.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/smartcardio/PCSCException.java
rename to jdk/src/java.smartcardio/share/classes/sun/security/smartcardio/PCSCException.java
diff --git a/jdk/src/share/classes/sun/security/smartcardio/PCSCTerminals.java b/jdk/src/java.smartcardio/share/classes/sun/security/smartcardio/PCSCTerminals.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/smartcardio/PCSCTerminals.java
rename to jdk/src/java.smartcardio/share/classes/sun/security/smartcardio/PCSCTerminals.java
diff --git a/jdk/src/share/classes/sun/security/smartcardio/SunPCSC.java b/jdk/src/java.smartcardio/share/classes/sun/security/smartcardio/SunPCSC.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/smartcardio/SunPCSC.java
rename to jdk/src/java.smartcardio/share/classes/sun/security/smartcardio/SunPCSC.java
diff --git a/jdk/src/share/classes/sun/security/smartcardio/TerminalImpl.java b/jdk/src/java.smartcardio/share/classes/sun/security/smartcardio/TerminalImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/smartcardio/TerminalImpl.java
rename to jdk/src/java.smartcardio/share/classes/sun/security/smartcardio/TerminalImpl.java
diff --git a/jdk/src/share/native/sun/security/smartcardio/pcsc.c b/jdk/src/java.smartcardio/share/native/libj2pcsc/pcsc.c
similarity index 100%
rename from jdk/src/share/native/sun/security/smartcardio/pcsc.c
rename to jdk/src/java.smartcardio/share/native/libj2pcsc/pcsc.c
diff --git a/jdk/src/solaris/classes/sun/security/smartcardio/PlatformPCSC.java b/jdk/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/security/smartcardio/PlatformPCSC.java
rename to jdk/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
diff --git a/jdk/src/solaris/native/sun/security/smartcardio/MUSCLE/COPYING b/jdk/src/java.smartcardio/unix/native/libj2pcsc/MUSCLE/COPYING
similarity index 100%
rename from jdk/src/solaris/native/sun/security/smartcardio/MUSCLE/COPYING
rename to jdk/src/java.smartcardio/unix/native/libj2pcsc/MUSCLE/COPYING
diff --git a/jdk/src/solaris/native/sun/security/smartcardio/MUSCLE/pcsclite.h b/jdk/src/java.smartcardio/unix/native/libj2pcsc/MUSCLE/pcsclite.h
similarity index 100%
rename from jdk/src/solaris/native/sun/security/smartcardio/MUSCLE/pcsclite.h
rename to jdk/src/java.smartcardio/unix/native/libj2pcsc/MUSCLE/pcsclite.h
diff --git a/jdk/src/solaris/native/sun/security/smartcardio/MUSCLE/winscard.h b/jdk/src/java.smartcardio/unix/native/libj2pcsc/MUSCLE/winscard.h
similarity index 100%
rename from jdk/src/solaris/native/sun/security/smartcardio/MUSCLE/winscard.h
rename to jdk/src/java.smartcardio/unix/native/libj2pcsc/MUSCLE/winscard.h
diff --git a/jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c b/jdk/src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.c
similarity index 100%
rename from jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c
rename to jdk/src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.c
diff --git a/jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.h b/jdk/src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.h
similarity index 100%
rename from jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.h
rename to jdk/src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.h
diff --git a/jdk/src/windows/classes/sun/security/smartcardio/PlatformPCSC.java b/jdk/src/java.smartcardio/windows/classes/sun/security/smartcardio/PlatformPCSC.java
similarity index 100%
rename from jdk/src/windows/classes/sun/security/smartcardio/PlatformPCSC.java
rename to jdk/src/java.smartcardio/windows/classes/sun/security/smartcardio/PlatformPCSC.java
diff --git a/jdk/src/windows/native/sun/security/smartcardio/pcsc_md.c b/jdk/src/java.smartcardio/windows/native/libj2pcsc/pcsc_md.c
similarity index 100%
rename from jdk/src/windows/native/sun/security/smartcardio/pcsc_md.c
rename to jdk/src/java.smartcardio/windows/native/libj2pcsc/pcsc_md.c
diff --git a/jdk/src/windows/native/sun/security/smartcardio/pcsc_md.h b/jdk/src/java.smartcardio/windows/native/libj2pcsc/pcsc_md.h
similarity index 100%
rename from jdk/src/windows/native/sun/security/smartcardio/pcsc_md.h
rename to jdk/src/java.smartcardio/windows/native/libj2pcsc/pcsc_md.h
diff --git a/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/CachedRowSetImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java
rename to jdk/src/java.sql.rowset/share/classes/com/sun/rowset/CachedRowSetImpl.java
diff --git a/jdk/src/share/classes/com/sun/rowset/FilteredRowSetImpl.java b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/FilteredRowSetImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/rowset/FilteredRowSetImpl.java
rename to jdk/src/java.sql.rowset/share/classes/com/sun/rowset/FilteredRowSetImpl.java
diff --git a/jdk/src/share/classes/com/sun/rowset/JdbcRowSetImpl.java b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/JdbcRowSetImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/rowset/JdbcRowSetImpl.java
rename to jdk/src/java.sql.rowset/share/classes/com/sun/rowset/JdbcRowSetImpl.java
diff --git a/jdk/src/share/classes/com/sun/rowset/JdbcRowSetResourceBundle.java b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/JdbcRowSetResourceBundle.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/rowset/JdbcRowSetResourceBundle.java
rename to jdk/src/java.sql.rowset/share/classes/com/sun/rowset/JdbcRowSetResourceBundle.java
diff --git a/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/JoinRowSetImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java
rename to jdk/src/java.sql.rowset/share/classes/com/sun/rowset/JoinRowSetImpl.java
diff --git a/jdk/src/share/classes/com/sun/rowset/RowSetFactoryImpl.java b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetFactoryImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/rowset/RowSetFactoryImpl.java
rename to jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetFactoryImpl.java
diff --git a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle.properties b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle.properties
rename to jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle.properties
diff --git a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties
rename to jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties
diff --git a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_es.properties b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_es.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_es.properties
rename to jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_es.properties
diff --git a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_fr.properties b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_fr.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_fr.properties
rename to jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_fr.properties
diff --git a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_it.properties b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_it.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_it.properties
rename to jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_it.properties
diff --git a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties
rename to jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties
diff --git a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties
rename to jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties
diff --git a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_pt_BR.properties b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_pt_BR.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_pt_BR.properties
rename to jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_pt_BR.properties
diff --git a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties
rename to jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties
diff --git a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties
rename to jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties
diff --git a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_zh_TW.properties b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_TW.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_zh_TW.properties
rename to jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_TW.properties
diff --git a/jdk/src/share/classes/com/sun/rowset/WebRowSetImpl.java b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/WebRowSetImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/rowset/WebRowSetImpl.java
rename to jdk/src/java.sql.rowset/share/classes/com/sun/rowset/WebRowSetImpl.java
diff --git a/jdk/src/share/classes/com/sun/rowset/internal/BaseRow.java b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/BaseRow.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/rowset/internal/BaseRow.java
rename to jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/BaseRow.java
diff --git a/jdk/src/share/classes/com/sun/rowset/internal/CachedRowSetReader.java b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetReader.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/rowset/internal/CachedRowSetReader.java
rename to jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetReader.java
diff --git a/jdk/src/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java
rename to jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java
diff --git a/jdk/src/share/classes/com/sun/rowset/internal/InsertRow.java b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/InsertRow.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/rowset/internal/InsertRow.java
rename to jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/InsertRow.java
diff --git a/jdk/src/share/classes/com/sun/rowset/internal/Row.java b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/Row.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/rowset/internal/Row.java
rename to jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/Row.java
diff --git a/jdk/src/share/classes/com/sun/rowset/internal/SyncResolverImpl.java b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/SyncResolverImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/rowset/internal/SyncResolverImpl.java
rename to jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/SyncResolverImpl.java
diff --git a/jdk/src/share/classes/com/sun/rowset/internal/WebRowSetXmlReader.java b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/WebRowSetXmlReader.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/rowset/internal/WebRowSetXmlReader.java
rename to jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/WebRowSetXmlReader.java
diff --git a/jdk/src/share/classes/com/sun/rowset/internal/WebRowSetXmlWriter.java b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/WebRowSetXmlWriter.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/rowset/internal/WebRowSetXmlWriter.java
rename to jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/WebRowSetXmlWriter.java
diff --git a/jdk/src/share/classes/com/sun/rowset/internal/XmlErrorHandler.java b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/XmlErrorHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/rowset/internal/XmlErrorHandler.java
rename to jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/XmlErrorHandler.java
diff --git a/jdk/src/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java
rename to jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java
diff --git a/jdk/src/share/classes/com/sun/rowset/internal/XmlResolver.java b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/XmlResolver.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/rowset/internal/XmlResolver.java
rename to jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/XmlResolver.java
diff --git a/jdk/src/share/classes/com/sun/rowset/package.html b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/rowset/package.html
rename to jdk/src/java.sql.rowset/share/classes/com/sun/rowset/package.html
diff --git a/jdk/src/share/classes/com/sun/rowset/providers/RIOptimisticProvider.java b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/providers/RIOptimisticProvider.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/rowset/providers/RIOptimisticProvider.java
rename to jdk/src/java.sql.rowset/share/classes/com/sun/rowset/providers/RIOptimisticProvider.java
diff --git a/jdk/src/share/classes/com/sun/rowset/providers/RIXMLProvider.java b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/providers/RIXMLProvider.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/rowset/providers/RIXMLProvider.java
rename to jdk/src/java.sql.rowset/share/classes/com/sun/rowset/providers/RIXMLProvider.java
diff --git a/jdk/src/share/classes/com/sun/rowset/providers/package.html b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/providers/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/rowset/providers/package.html
rename to jdk/src/java.sql.rowset/share/classes/com/sun/rowset/providers/package.html
diff --git a/jdk/src/share/classes/javax/sql/rowset/BaseRowSet.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/BaseRowSet.java
similarity index 91%
rename from jdk/src/share/classes/javax/sql/rowset/BaseRowSet.java
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/BaseRowSet.java
index a7fdf01932a..2998715e3c8 100644
--- a/jdk/src/share/classes/javax/sql/rowset/BaseRowSet.java
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/BaseRowSet.java
@@ -368,7 +368,7 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
      * DriverManager.getConnection when the
      * DriverManager is used to get a connection.
      * 

-     * The JDBC URL identifies the driver to be used to make the conndection.
+     * The JDBC URL identifies the driver to be used to make the connection.
      * This URL can be found in the documentation supplied by the driver
      * vendor.
      * @serial
@@ -562,7 +562,7 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
     * null, this method silently discards the null
     * value and does not add a null reference to the set of listeners.
     * 

-    * Note: if the listener is already set, and the new RowSetListerner
+    * Note: if the listener is already set, and the new RowSetListener
     * instance is added to the set of listeners already registered to receive
     * event notifications from this RowSet.
     *
@@ -767,7 +767,7 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
      * the connection is created using a JDBC technology-enabled driver
      * ("JDBC driver") and the DriverManager.
      * The correct JDBC URL for the specific driver to be used can be found
-     * in the driver documentation.  Although there are guidelines for for how
+     * in the driver documentation.  Although there are guidelines for how
      * a JDBC URL is formed,
      * a driver vendor can specify any String object except
      * one with a length of 0 (an empty string).
@@ -1093,7 +1093,7 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
                 "Connection.TRANSACTION_NONE or " +
                 "Connection.TRANSACTION_READ_UNCOMMITTED or " +
                 "Connection.TRANSACTION_READ_COMMITTED or " +
-                "Connection.RRANSACTION_REPEATABLE_READ or " +
+                "Connection.TRANSACTION_REPEATABLE_READ or " +
                 "Connection.TRANSACTION_SERIALIZABLE");
             }
         this.isolation = level;
@@ -3193,7 +3193,7 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
     } //end getParams
 
 
- /**
+   /**
     * Sets the designated parameter to SQL NULL.
     *
     * 
Note: You must specify the parameter's SQL type.
@@ -3210,8 +3210,7 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
         throw new SQLFeatureNotSupportedException("Feature not supported");
    }
 
-
- /**
+   /**
     * Sets the designated parameter to SQL NULL.
     * This version of the method setNull should
     * be used for user-defined types and REF type parameters.  Examples
@@ -3248,9 +3247,7 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
         throw new SQLFeatureNotSupportedException("Feature not supported");
    }
 
-
-
- /**
+   /**
     * Sets the designated parameter to the given Java boolean value.
     * The driver converts this
     * to an SQL BIT or BOOLEAN value when it sends it to the database.
@@ -3268,9 +3265,7 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
         throw new SQLFeatureNotSupportedException("Feature not supported");
    }
 
-
-
- /**
+   /**
     * Sets the designated parameter to the given Java byte value.
     * The driver converts this
     * to an SQL TINYINT value when it sends it to the database.
@@ -3288,9 +3283,7 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
         throw new SQLFeatureNotSupportedException("Feature not supported");
    }
 
-
-
- /**
+   /**
     * Sets the designated parameter to the given Java short value.
     * The driver converts this
     * to an SQL SMALLINT value when it sends it to the database.
@@ -3308,8 +3301,7 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
         throw new SQLFeatureNotSupportedException("Feature not supported");
    }
 
-
- /**
+   /**
     * Sets the designated parameter to the given Java int value.
     * The driver converts this
     * to an SQL INTEGER value when it sends it to the database.
@@ -3328,7 +3320,7 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
    }
 
 
- /**
+   /**
     * Sets the designated parameter to the given Java long value.
     * The driver converts this
     * to an SQL BIGINT value when it sends it to the database.
@@ -3346,8 +3338,7 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
         throw new SQLFeatureNotSupportedException("Feature not supported");
    }
 
-
- /**
+   /**
     * Sets the designated parameter to the given Java float value.
     * The driver converts this
     * to an SQL FLOAT value when it sends it to the database.
@@ -3365,8 +3356,7 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
         throw new SQLFeatureNotSupportedException("Feature not supported");
    }
 
-
- /**
+   /**
     * Sets the designated parameter to the given Java double value.
     * The driver converts this
     * to an SQL DOUBLE value when it sends it to the database.
@@ -3384,9 +3374,7 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
         throw new SQLFeatureNotSupportedException("Feature not supported");
    }
 
-
-
- /**
+   /**
     * Sets the designated parameter to the given
     * java.math.BigDecimal value.
     * The driver converts this to an SQL NUMERIC value when
@@ -3405,9 +3393,7 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
         throw new SQLFeatureNotSupportedException("Feature not supported");
    }
 
-
-
- /**
+   /**
     * Sets the designated parameter to the given Java String value.
     * The driver converts this
     * to an SQL VARCHAR or LONGVARCHAR value
@@ -3428,9 +3414,7 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
         throw new SQLFeatureNotSupportedException("Feature not supported");
    }
 
-
-
- /**
+   /**
     * Sets the designated parameter to the given Java array of bytes.
     * The driver converts this to an SQL VARBINARY or
     * LONGVARBINARY (depending on the argument's size relative
@@ -3450,9 +3434,7 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
         throw new SQLFeatureNotSupportedException("Feature not supported");
    }
 
-
-
- /**
+   /**
     * Sets the designated parameter to the given java.sql.Timestamp value.
     * The driver
     * converts this to an SQL TIMESTAMP value when it sends it to the
@@ -3472,9 +3454,7 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
         throw new SQLFeatureNotSupportedException("Feature not supported");
    }
 
-
-
- /**
+   /**
     * Sets the designated parameter to the given input stream, which will have
     * the specified number of bytes.
     * When a very large ASCII value is input to a LONGVARCHAR
@@ -3501,8 +3481,7 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
         throw new SQLFeatureNotSupportedException("Feature not supported");
    }
 
-
- /**
+   /**
     * Sets the designated parameter to the given input stream, which will have
     * the specified number of bytes.
     * When a very large binary value is input to a LONGVARBINARY
@@ -3528,8 +3507,7 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
         throw new SQLFeatureNotSupportedException("Feature not supported");
    }
 
-
-  /**
+   /**
     * Sets the designated parameter to the given Reader
     * object, which is the given number of characters long.
     * When a very large UNICODE value is input to a LONGVARCHAR
@@ -3558,7 +3536,6 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
         throw new SQLFeatureNotSupportedException("Feature not supported");
    }
 
-
   /**
    * Sets the designated parameter to the given input stream.
    * When a very large ASCII value is input to a LONGVARCHAR
@@ -3586,8 +3563,7 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
         throw new SQLFeatureNotSupportedException("Feature not supported");
    }
 
-
- /**
+   /**
     * Sets the designated parameter to the given input stream.
     * When a very large binary value is input to a LONGVARBINARY
     * parameter, it may be more practical to send it via a
@@ -3613,9 +3589,7 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
         throw new SQLFeatureNotSupportedException("Feature not supported");
    }
 
-
-
- /**
+   /**
     * Sets the designated parameter to the given Reader
     * object.
     * When a very large UNICODE value is input to a LONGVARCHAR
@@ -3644,7 +3618,6 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
         throw new SQLFeatureNotSupportedException("Feature not supported");
    }
 
-
  /**
   * Sets the designated parameter in this RowSet object's command
   * to a Reader object. The
@@ -3672,9 +3645,7 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
         throw new SQLFeatureNotSupportedException("Feature not supported");
    }
 
-
-
- /**
+   /**
     * Sets the value of the designated parameter with the given object. The second
     * argument must be an object type; for integral values, the
     * java.lang equivalent objects should be used.
@@ -3692,7 +3663,7 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
     * or Array, the driver should pass it to the database as a
     * value of the corresponding SQL type.
     * 

-    * Note that this method may be used to pass datatabase-
+    * Note that this method may be used to pass database-
     * specific abstract data types.
     *
     * @param parameterName the name of the parameter
@@ -3720,9 +3691,7 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
         throw new SQLFeatureNotSupportedException("Feature not supported");
    }
 
-
-
- /**
+   /**
     * Sets the value of the designated parameter with the given object.
     * This method is like the method setObject
     * above, except that it assumes a scale of zero.
@@ -3748,8 +3717,7 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
         throw new SQLFeatureNotSupportedException("Feature not supported");
    }
 
-
- /**
+  /**
    * Sets the value of the designated parameter with the given object.
    * The second parameter must be of type Object; therefore, the
    * java.lang equivalent objects should be used for built-in types.
@@ -3759,7 +3727,7 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
    * will be converted to the corresponding SQL type before being
    * sent to the database.
    *
-   * 
Note that this method may be used to pass datatabase-
+   * 
Note that this method may be used to pass database-
    * specific abstract data types, by using a driver-specific Java
    * type.
    *
@@ -3789,10 +3757,9 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
         throw new SQLFeatureNotSupportedException("Feature not supported");
    }
 
-
-
- /**
-    * Sets the designated parameter to a InputStream object.  The inputstream must contain  the number
+   /**
+    * Sets the designated parameter to a InputStream object.
+    * The InputStream must contain  the number
     * of characters specified by length otherwise a SQLException will be
     * generated when the PreparedStatement is executed.
     * This method differs from the setBinaryStream (int, InputStream, int)
@@ -3809,8 +3776,8 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
     * this method is called on a closed PreparedStatement,
     * if parameterIndex does not correspond
     * to a parameter marker in the SQL statement,  if the length specified
-    * is less than zero or if the number of bytes in the inputstream does not match
-    * the specified length.
+    * is less than zero or if the number of bytes in the
+    * InputStream does not match the specified length.
     * @throws SQLFeatureNotSupportedException  if the JDBC driver does not support this method
     *
     * @since 1.6
@@ -3820,8 +3787,7 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
         throw new SQLFeatureNotSupportedException("Feature not supported");
    }
 
-
- /**
+   /**
     * Sets the designated parameter to a InputStream object.
     * This method differs from the setBinaryStream (int, InputStream)
     * method because it informs the driver that the parameter value should be
@@ -3848,11 +3814,11 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
     public void setBlob(int parameterIndex, InputStream inputStream)
        throws SQLException{
         throw new SQLFeatureNotSupportedException("Feature not supported");
-   }
+    }
 
-
- /**
-    * Sets the designated parameter to a InputStream object.  The inputstream must contain  the number
+    /**
+     * Sets the designated parameter to a InputStream object.
+     * The Inputstream must contain  the number
      * of characters specified by length, otherwise a SQLException will be
      * generated when the CallableStatement is executed.
      * This method differs from the setBinaryStream (int, InputStream, int)
@@ -3869,7 +3835,7 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
      * @param length the number of bytes in the parameter data.
      * @throws SQLException  if parameterIndex does not correspond
      * to a parameter marker in the SQL statement,  or if the length specified
-     * is less than zero; if the number of bytes in the inputstream does not match
+     * is less than zero; if the number of bytes in the InputStream does not match
      * the specified length; if a database access error occurs or
      * this method is called on a closed CallableStatement
      * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
@@ -3882,8 +3848,7 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
         throw new SQLFeatureNotSupportedException("Feature not supported");
    }
 
-
- /**
+   /**
     * Sets the designated parameter to the given java.sql.Blob object.
     * The driver converts this to an SQL BLOB value when it
     * sends it to the database.
@@ -3900,8 +3865,7 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
         throw new SQLFeatureNotSupportedException("Feature not supported");
    }
 
-
- /**
+   /**
     * Sets the designated parameter to a InputStream object.
     * This method differs from the setBinaryStream (int, InputStream)
     * method because it informs the driver that the parameter value should be
@@ -3925,35 +3889,34 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
     public void setBlob(String parameterName, InputStream inputStream)
        throws SQLException{
         throw new SQLFeatureNotSupportedException("Feature not supported");
-   }
+    }
 
-
- /**
-   * Sets the designated parameter to a Reader object.  The reader must contain  the number
-   * of characters specified by length otherwise a SQLException will be
-   * generated when the PreparedStatement is executed.
-   *This method differs from the setCharacterStream (int, Reader, int) method
-   * because it informs the driver that the parameter value should be sent to
-   * the server as a CLOB.  When the setCharacterStream method is used, the
-   * driver may have to do extra work to determine whether the parameter
-   * data should be sent to the server as a LONGVARCHAR or a CLOB
-   * @param parameterIndex index of the first parameter is 1, the second is 2, ...
-   * @param reader An object that contains the data to set the parameter value to.
-   * @param length the number of characters in the parameter data.
-   * @throws SQLException if a database access error occurs, this method is called on
-   * a closed PreparedStatement, if parameterIndex does not correspond to a parameter
-   * marker in the SQL statement, or if the length specified is less than zero.
-   *
-   * @throws SQLFeatureNotSupportedException  if the JDBC driver does not support this method
-   * @since 1.6
-   */
+   /**
+    * Sets the designated parameter to a Reader object.
+    * The reader must contain  the number
+    * of characters specified by length otherwise a SQLException will be
+    * generated when the PreparedStatement is executed.
+    * This method differs from the setCharacterStream (int, Reader, int) method
+    * because it informs the driver that the parameter value should be sent to
+    * the server as a CLOB.  When the setCharacterStream method is used, the
+    * driver may have to do extra work to determine whether the parameter
+    * data should be sent to the server as a LONGVARCHAR or a CLOB
+    * @param parameterIndex index of the first parameter is 1, the second is 2, ...
+    * @param reader An object that contains the data to set the parameter value to.
+    * @param length the number of characters in the parameter data.
+    * @throws SQLException if a database access error occurs, this method is called on
+    * a closed PreparedStatement, if parameterIndex does not correspond to a parameter
+    * marker in the SQL statement, or if the length specified is less than zero.
+    *
+    * @throws SQLFeatureNotSupportedException  if the JDBC driver does not support this method
+    * @since 1.6
+    */
    public void setClob(int parameterIndex, Reader reader, long length)
      throws SQLException{
         throw new SQLFeatureNotSupportedException("Feature not supported");
    }
 
-
-/**
+  /**
    * Sets the designated parameter to a Reader object.
    * This method differs from the setCharacterStream (int, Reader) method
    * because it informs the driver that the parameter value should be sent to
@@ -3979,35 +3942,34 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
         throw new SQLFeatureNotSupportedException("Feature not supported");
    }
 
-
- /**
-    * Sets the designated parameter to a Reader object.  The reader must contain  the number
-               * of characters specified by length otherwise a SQLException will be
-               * generated when the CallableStatement is executed.
-              * This method differs from the setCharacterStream (int, Reader, int) method
-              * because it informs the driver that the parameter value should be sent to
-              * the server as a CLOB.  When the setCharacterStream method is used, the
-              * driver may have to do extra work to determine whether the parameter
-              * data should be send to the server as a LONGVARCHAR or a CLOB
-              * @param parameterName the name of the parameter to be set
-              * @param reader An object that contains the data to set the parameter value to.
-              * @param length the number of characters in the parameter data.
-              * @throws SQLException if parameterIndex does not correspond to a parameter
-              * marker in the SQL statement; if the length specified is less than zero;
-              * a database access error occurs or
-              * this method is called on a closed CallableStatement
-              * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
-              * this method
-              *
-              * @since 1.6
-              */
-              public void setClob(String parameterName, Reader reader, long length)
-      throws SQLException{
-        throw new SQLFeatureNotSupportedException("Feature not supported");
+   /**
+    * Sets the designated parameter to a Reader object.
+    * The reader must contain  the number
+    * of characters specified by length otherwise a SQLException will be
+    * generated when the CallableStatement is executed.
+    * This method differs from the setCharacterStream (int, Reader, int) method
+    * because it informs the driver that the parameter value should be sent to
+    * the server as a CLOB.  When the setCharacterStream method is used, the
+    * driver may have to do extra work to determine whether the parameter
+    * data should be send to the server as a LONGVARCHAR or a CLOB
+    * @param parameterName the name of the parameter to be set
+    * @param reader An object that contains the data to set the parameter value to.
+    * @param length the number of characters in the parameter data.
+    * @throws SQLException if parameterIndex does not correspond to a parameter
+    * marker in the SQL statement; if the length specified is less than zero;
+    * a database access error occurs or
+    * this method is called on a closed CallableStatement
+    * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
+    * this method
+    *
+    * @since 1.6
+    */
+   public void setClob(String parameterName, Reader reader, long length)
+      throws SQLException {
+       throw new SQLFeatureNotSupportedException("Feature not supported");
    }
 
-
-  /**
+   /**
     * Sets the designated parameter to the given java.sql.Clob object.
     * The driver converts this to an SQL CLOB value when it
     * sends it to the database.
@@ -4020,12 +3982,11 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
     * this method
     * @since 1.6
     */
-   public void setClob (String parameterName, Clob x) throws SQLException{
-        throw new SQLFeatureNotSupportedException("Feature not supported");
+   public void setClob (String parameterName, Clob x) throws SQLException {
+       throw new SQLFeatureNotSupportedException("Feature not supported");
    }
 
-
- /**
+   /**
     * Sets the designated parameter to a Reader object.
     * This method differs from the setCharacterStream (int, Reader) method
     * because it informs the driver that the parameter value should be sent to
@@ -4045,13 +4006,11 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
     * @throws SQLFeatureNotSupportedException  if the JDBC driver does not support this method
     * @since 1.6
     */
-    public void setClob(String parameterName, Reader reader)
-      throws SQLException{
+    public void setClob(String parameterName, Reader reader) throws SQLException {
         throw new SQLFeatureNotSupportedException("Feature not supported");
-   }
+    }
 
-
- /**
+   /**
     * Sets the designated parameter to the given java.sql.Date value
     * using the default time zone of the virtual machine that is running
     * the application.
@@ -4068,12 +4027,11 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
     * @since 1.4
     */
    public void setDate(String parameterName, java.sql.Date x)
-       throws SQLException{
-        throw new SQLFeatureNotSupportedException("Feature not supported");
+           throws SQLException {
+       throw new SQLFeatureNotSupportedException("Feature not supported");
    }
 
-
- /**
+   /**
     * Sets the designated parameter to the given java.sql.Date value,
     * using the given Calendar object.  The driver uses
     * the Calendar object to construct an SQL DATE value,
@@ -4095,12 +4053,11 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
     * @since 1.4
     */
    public void setDate(String parameterName, java.sql.Date x, Calendar cal)
-       throws SQLException{
+           throws SQLException {
         throw new SQLFeatureNotSupportedException("Feature not supported");
    }
 
-
- /**
+   /**
     * Sets the designated parameter to the given java.sql.Time value.
     * The driver converts this
     * to an SQL TIME value when it sends it to the database.
@@ -4115,12 +4072,11 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
     * @since 1.4
     */
    public void setTime(String parameterName, java.sql.Time x)
-       throws SQLException{
+           throws SQLException {
         throw new SQLFeatureNotSupportedException("Feature not supported");
    }
 
-
- /**
+   /**
     * Sets the designated parameter to the given java.sql.Time value,
     * using the given Calendar object.  The driver uses
     * the Calendar object to construct an SQL TIME value,
@@ -4142,12 +4098,11 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
     * @since 1.4
     */
    public void setTime(String parameterName, java.sql.Time x, Calendar cal)
-       throws SQLException{
+           throws SQLException {
         throw new SQLFeatureNotSupportedException("Feature not supported");
    }
 
-
- /**
+   /**
     * Sets the designated parameter to the given java.sql.Timestamp value,
     * using the given Calendar object.  The driver uses
     * the Calendar object to construct an SQL TIMESTAMP value,
@@ -4169,366 +4124,347 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
     * @since 1.4
     */
    public void setTimestamp(String parameterName, java.sql.Timestamp x, Calendar cal)
-       throws SQLException{
+           throws SQLException {
         throw new SQLFeatureNotSupportedException("Feature not supported");
    }
 
-
- /**
-  * Sets the designated parameter to the given java.sql.SQLXML object. The driver converts this to an
-  * SQL XML value when it sends it to the database.
-  * @param parameterIndex index of the first parameter is 1, the second is 2, ...
-  * @param xmlObject a SQLXML object that maps an SQL XML value
-  * @throws SQLException if a database access error occurs, this method
-  *  is called on a closed result set,
-  * the java.xml.transform.Result,
-  *  Writer or OutputStream has not been closed
-  * for the SQLXML object  or
-  *  if there is an error processing the XML value.  The getCause method
-  *  of the exception may provide a more detailed exception, for example, if the
-  *  stream does not contain valid XML.
-  * @throws SQLFeatureNotSupportedException if the JDBC driver does not
-  * support this method
-  * @since 1.6
-  */
- public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException{
-     throw new SQLFeatureNotSupportedException("Feature not supported");
- }
-
-
- /**
-  * Sets the designated parameter to the given java.sql.SQLXML object. The driver converts this to an
-  * SQL XML value when it sends it to the database.
-  * @param parameterName the name of the parameter
-  * @param xmlObject a SQLXML object that maps an SQL XML value
-  * @throws SQLException if a database access error occurs, this method
-  *  is called on a closed result set,
-  * the java.xml.transform.Result,
-  *  Writer or OutputStream has not been closed
-  * for the SQLXML object  or
-  *  if there is an error processing the XML value.  The getCause method
-  *  of the exception may provide a more detailed exception, for example, if the
-  *  stream does not contain valid XML.
-  * @throws SQLFeatureNotSupportedException if the JDBC driver does not
-  * support this method
-  * @since 1.6
-  */
- public void setSQLXML(String parameterName, SQLXML xmlObject) throws SQLException{
-     throw new SQLFeatureNotSupportedException("Feature not supported");
- }
-
-
- /**
-  * Sets the designated parameter to the given java.sql.RowId object. The
-  * driver converts this to a SQL ROWID value when it sends it
-  * to the database
-  *
-  * @param parameterIndex the first parameter is 1, the second is 2, ...
-  * @param x the parameter value
-  * @throws SQLException if a database access error occurs
-  * @throws SQLFeatureNotSupportedException if the JDBC driver does not
-  * support this method
-  *
-  * @since 1.6
-  */
- public void setRowId(int parameterIndex, RowId x) throws SQLException{
-     throw new SQLFeatureNotSupportedException("Feature not supported");
- }
-
-
- /**
-  * Sets the designated parameter to the given java.sql.RowId object. The
-  * driver converts this to a SQL ROWID when it sends it to the
-  * database.
-  *
-  * @param parameterName the name of the parameter
-  * @param x the parameter value
-  * @throws SQLException if a database access error occurs
-  * @throws SQLFeatureNotSupportedException if the JDBC driver does not
-  * support this method
-  * @since 1.6
-  */
- public void setRowId(String parameterName, RowId x) throws SQLException{
-     throw new SQLFeatureNotSupportedException("Feature not supported");
- }
-
- /**
-  * Sets the designated parameter to the given String object.
-  * The driver converts this to a SQL NCHAR or
-  * NVARCHAR or LONGNVARCHAR value
-  * (depending on the argument's
-  * size relative to the driver's limits on NVARCHAR values)
-  * when it sends it to the database.
-  *
-  * @param parameterIndex of the first parameter is 1, the second is 2, ...
-  * @param value the parameter value
-  * @throws SQLException if the driver does not support national
-  *         character sets;  if the driver can detect that a data conversion
-  *  error could occur ; or if a database access error occurs
-  * @throws SQLFeatureNotSupportedException if the JDBC driver does not
-  * support this method
-  * @since 1.6
-  */
- public void setNString(int parameterIndex, String value) throws SQLException{
-     throw new SQLFeatureNotSupportedException("Feature not supported");
- }
-
-
- /**
-  * Sets the designated parameter to the given String object.
-  * The driver converts this to a SQL NCHAR or
-  * NVARCHAR or LONGNVARCHAR
-  * @param parameterName the name of the column to be set
-  * @param value the parameter value
-  * @throws SQLException if the driver does not support national
-  *         character sets;  if the driver can detect that a data conversion
-  *  error could occur; or if a database access error occurs
-  * @throws SQLFeatureNotSupportedException if the JDBC driver does not
-  * support this method
-  * @since 1.6
-  */
- public void setNString(String parameterName, String value)
-         throws SQLException{
-     throw new SQLFeatureNotSupportedException("Feature not supported");
- }
-
-
- /**
-  * Sets the designated parameter to a Reader object. The
-  * Reader reads the data till end-of-file is reached. The
-  * driver does the necessary conversion from Java character format to
-  * the national character set in the database.
-  * @param parameterIndex of the first parameter is 1, the second is 2, ...
-  * @param value the parameter value
-  * @param length the number of characters in the parameter data.
-  * @throws SQLException if the driver does not support national
-  *         character sets;  if the driver can detect that a data conversion
-  *  error could occur ; or if a database access error occurs
-  * @throws SQLFeatureNotSupportedException if the JDBC driver does not
-  * support this method
-  * @since 1.6
-  */
- public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException{
-     throw new SQLFeatureNotSupportedException("Feature not supported");
- }
-
-
- /**
-  * Sets the designated parameter to a Reader object. The
-  * Reader reads the data till end-of-file is reached. The
-  * driver does the necessary conversion from Java character format to
-  * the national character set in the database.
-  * @param parameterName the name of the column to be set
-  * @param value the parameter value
-  * @param length the number of characters in the parameter data.
-  * @throws SQLException if the driver does not support national
-  *         character sets;  if the driver can detect that a data conversion
-  *  error could occur; or if a database access error occurs
-  * @throws SQLFeatureNotSupportedException  if the JDBC driver does not
-  * support this method
-  * @since 1.6
-  */
- public void setNCharacterStream(String parameterName, Reader value, long length)
-         throws SQLException{
-     throw new SQLFeatureNotSupportedException("Feature not supported");
- }
-
-
- /**
-  * Sets the designated parameter to a Reader object. The
-  * Reader reads the data till end-of-file is reached. The
-  * driver does the necessary conversion from Java character format to
-  * the national character set in the database.
-
-  * 
Note: This stream object can either be a standard
-  * Java stream object or your own subclass that implements the
-  * standard interface.
-  * 
Note: Consult your JDBC driver documentation to determine if
-  * it might be more efficient to use a version of
-  * setNCharacterStream which takes a length parameter.
-  *
-  * @param parameterName the name of the parameter
-  * @param value the parameter value
-  * @throws SQLException if the driver does not support national
-  *         character sets;  if the driver can detect that a data conversion
-  *  error could occur ; if a database access error occurs; or
-  * this method is called on a closed CallableStatement
-  * @throws SQLFeatureNotSupportedException  if the JDBC driver does not support this method
-  * @since 1.6
-  */
-  public void setNCharacterStream(String parameterName, Reader value) throws SQLException{
-        throw new SQLFeatureNotSupportedException("Feature not supported");
+   /**
+    * Sets the designated parameter to the given java.sql.SQLXML object. The driver converts this to an
+    * SQL XML value when it sends it to the database.
+    * @param parameterIndex index of the first parameter is 1, the second is 2, ...
+    * @param xmlObject a SQLXML object that maps an SQL XML value
+    * @throws SQLException if a database access error occurs, this method
+    *  is called on a closed result set,
+    * the java.xml.transform.Result,
+    *  Writer or OutputStream has not been closed
+    * for the SQLXML object  or
+    *  if there is an error processing the XML value.  The getCause method
+    *  of the exception may provide a more detailed exception, for example, if the
+    *  stream does not contain valid XML.
+    * @throws SQLFeatureNotSupportedException if the JDBC driver does not
+    * support this method
+    * @since 1.6
+    */
+   public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException {
+       throw new SQLFeatureNotSupportedException("Feature not supported");
    }
 
+   /**
+    * Sets the designated parameter to the given java.sql.SQLXML object. The driver converts this to an
+    * SQL XML value when it sends it to the database.
+    * @param parameterName the name of the parameter
+    * @param xmlObject a SQLXML object that maps an SQL XML value
+    * @throws SQLException if a database access error occurs, this method
+    *  is called on a closed result set,
+    * the java.xml.transform.Result,
+    *  Writer or OutputStream has not been closed
+    * for the SQLXML object  or
+    *  if there is an error processing the XML value.  The getCause method
+    *  of the exception may provide a more detailed exception, for example, if the
+    *  stream does not contain valid XML.
+    * @throws SQLFeatureNotSupportedException if the JDBC driver does not
+    * support this method
+    * @since 1.6
+    */
+   public void setSQLXML(String parameterName, SQLXML xmlObject) throws SQLException {
+       throw new SQLFeatureNotSupportedException("Feature not supported");
+   }
+
+   /**
+   * Sets the designated parameter to the given java.sql.RowId object. The
+   * driver converts this to a SQL ROWID value when it sends it
+   * to the database
+   *
+   * @param parameterIndex the first parameter is 1, the second is 2, ...
+   * @param x the parameter value
+   * @throws SQLException if a database access error occurs
+   * @throws SQLFeatureNotSupportedException if the JDBC driver does not
+   * support this method
+   *
+   * @since 1.6
+   */
+  public void setRowId(int parameterIndex, RowId x) throws SQLException {
+      throw new SQLFeatureNotSupportedException("Feature not supported");
+  }
 
   /**
-   * Sets the designated parameter to a java.sql.NClob object. The object
-   * implements the java.sql.NClob interface. This NClob
-   * object maps to a SQL NCLOB.
+   * Sets the designated parameter to the given java.sql.RowId object. The
+   * driver converts this to a SQL ROWID when it sends it to the
+   * database.
+   *
+   * @param parameterName the name of the parameter
+   * @param x the parameter value
+   * @throws SQLException if a database access error occurs
+   * @throws SQLFeatureNotSupportedException if the JDBC driver does not
+   * support this method
+   * @since 1.6
+   */
+  public void setRowId(String parameterName, RowId x) throws SQLException {
+      throw new SQLFeatureNotSupportedException("Feature not supported");
+  }
+
+  /**
+   * Sets the designated parameter to the given String object.
+   * The driver converts this to a SQL NCHAR or
+   * NVARCHAR or LONGNVARCHAR value
+   * (depending on the argument's
+   * size relative to the driver's limits on NVARCHAR values)
+   * when it sends it to the database.
+   *
+   * @param parameterIndex of the first parameter is 1, the second is 2, ...
+   * @param value the parameter value
+   * @throws SQLException if the driver does not support national
+   * character sets;  if the driver can detect that a data conversion
+   * error could occur ; or if a database access error occurs
+   * @throws SQLFeatureNotSupportedException if the JDBC driver does not
+   * support this method
+   * @since 1.6
+   */
+  public void setNString(int parameterIndex, String value) throws SQLException {
+      throw new SQLFeatureNotSupportedException("Feature not supported");
+  }
+
+  /**
+   * Sets the designated parameter to the given String object.
+   * The driver converts this to a SQL NCHAR or
+   * NVARCHAR or LONGNVARCHAR
    * @param parameterName the name of the column to be set
    * @param value the parameter value
    * @throws SQLException if the driver does not support national
+   * character sets;  if the driver can detect that a data conversion
+   * error could occur; or if a database access error occurs
+   * @throws SQLFeatureNotSupportedException if the JDBC driver does not
+   * support this method
+   * @since 1.6
+   */
+  public void setNString(String parameterName, String value) throws SQLException {
+     throw new SQLFeatureNotSupportedException("Feature not supported");
+  }
+
+  /**
+   * Sets the designated parameter to a Reader object. The
+   * Reader reads the data till end-of-file is reached. The
+   * driver does the necessary conversion from Java character format to
+   * the national character set in the database.
+   * @param parameterIndex of the first parameter is 1, the second is 2, ...
+   * @param value the parameter value
+   * @param length the number of characters in the parameter data.
+   * @throws SQLException if the driver does not support national
+   *         character sets;  if the driver can detect that a data conversion
+   *  error could occur ; or if a database access error occurs
+   * @throws SQLFeatureNotSupportedException if the JDBC driver does not
+   * support this method
+   * @since 1.6
+   */
+  public void setNCharacterStream(int parameterIndex, Reader value, long length)
+          throws SQLException {
+      throw new SQLFeatureNotSupportedException("Feature not supported");
+  }
+
+  /**
+   * Sets the designated parameter to a Reader object. The
+   * Reader reads the data till end-of-file is reached. The
+   * driver does the necessary conversion from Java character format to
+   * the national character set in the database.
+   * @param parameterName the name of the column to be set
+   * @param value the parameter value
+   * @param length the number of characters in the parameter data.
+   * @throws SQLException if the driver does not support national
    *         character sets;  if the driver can detect that a data conversion
    *  error could occur; or if a database access error occurs
    * @throws SQLFeatureNotSupportedException  if the JDBC driver does not
    * support this method
    * @since 1.6
    */
-  public void setNClob(String parameterName, NClob value) throws SQLException{
-        throw new SQLFeatureNotSupportedException("Feature not supported");
+  public void setNCharacterStream(String parameterName, Reader value, long length)
+          throws SQLException {
+      throw new SQLFeatureNotSupportedException("Feature not supported");
   }
 
-
   /**
-   * Sets the designated parameter to a Reader object.  The reader must contain
-   * the number
-   * of characters specified by length otherwise a SQLException will be
-   * generated when the CallableStatement is executed.
-   * This method differs from the setCharacterStream (int, Reader, int) method
-   * because it informs the driver that the parameter value should be sent to
-   * the server as a NCLOB.  When the setCharacterStream method is used, the
-   * driver may have to do extra work to determine whether the parameter
-   * data should be send to the server as a LONGNVARCHAR or a NCLOB
-   *
-   * @param parameterName the name of the parameter to be set
-   * @param reader An object that contains the data to set the parameter value to.
-   * @param length the number of characters in the parameter data.
-   * @throws SQLException if parameterIndex does not correspond to a parameter
-   * marker in the SQL statement; if the length specified is less than zero;
-   * if the driver does not support national
-   *         character sets;  if the driver can detect that a data conversion
-   *  error could occur; if a database access error occurs or
-   * this method is called on a closed CallableStatement
-   * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
-   * this method
-   * @since 1.6
-   */
-  public void setNClob(String parameterName, Reader reader, long length)
-           throws SQLException{
-       throw new SQLFeatureNotSupportedException("Feature not supported");
-  }
-
-
-  /**
-   * Sets the designated parameter to a Reader object.
-   * This method differs from the setCharacterStream (int, Reader) method
-   * because it informs the driver that the parameter value should be sent to
-   * the server as a NCLOB.  When the setCharacterStream method is used, the
-   * driver may have to do extra work to determine whether the parameter
-   * data should be send to the server as a LONGNVARCHAR or a NCLOB
+   * Sets the designated parameter to a Reader object. The
+   * Reader reads the data till end-of-file is reached. The
+   * driver does the necessary conversion from Java character format to
+   * the national character set in the database.
+   * 
Note: This stream object can either be a standard
+   * Java stream object or your own subclass that implements the
+   * standard interface.
    * 
Note: Consult your JDBC driver documentation to determine if
    * it might be more efficient to use a version of
-   * setNClob which takes a length parameter.
+   * setNCharacterStream which takes a length parameter.
    *
    * @param parameterName the name of the parameter
-   * @param reader An object that contains the data to set the parameter value to.
-   * @throws SQLException if the driver does not support national character sets;
-   * if the driver can detect that a data conversion
-   *  error could occur;  if a database access error occurs or
-   * this method is called on a closed CallableStatement
-   * @throws SQLFeatureNotSupportedException  if the JDBC driver does not support this method
-   *
-   * @since 1.6
-   */
-  public void setNClob(String parameterName, Reader reader)
-    throws SQLException{
-        throw new SQLFeatureNotSupportedException("Feature not supported");
-  }
-
-
-  /**
-   * Sets the designated parameter to a Reader object.  The reader must contain  the number
-   * of characters specified by length otherwise a SQLException will be
-   * generated when the PreparedStatement is executed.
-   * This method differs from the setCharacterStream (int, Reader, int) method
-   * because it informs the driver that the parameter value should be sent to
-   * the server as a NCLOB.  When the setCharacterStream method is used, the
-   * driver may have to do extra work to determine whether the parameter
-   * data should be sent to the server as a LONGNVARCHAR or a NCLOB
-   * @param parameterIndex index of the first parameter is 1, the second is 2, ...
-   * @param reader An object that contains the data to set the parameter value to.
-   * @param length the number of characters in the parameter data.
-   * @throws SQLException if parameterIndex does not correspond to a parameter
-   * marker in the SQL statement; if the length specified is less than zero;
-   * if the driver does not support national character sets;
-   * if the driver can detect that a data conversion
-   *  error could occur;  if a database access error occurs or
-   * this method is called on a closed PreparedStatement
-   * @throws SQLFeatureNotSupportedException  if the JDBC driver does not
-   * support this method
-   *
-   * @since 1.6
-   */
-  public void setNClob(int parameterIndex, Reader reader, long length)
-       throws SQLException{
-        throw new SQLFeatureNotSupportedException("Feature not supported");
-  }
-
-
-  /**
-   * Sets the designated parameter to a java.sql.NClob object. The driver converts this oa
-   * SQL NCLOB value when it sends it to the database.
-   * @param parameterIndex of the first parameter is 1, the second is 2, ...
    * @param value the parameter value
    * @throws SQLException if the driver does not support national
    *         character sets;  if the driver can detect that a data conversion
-   *  error could occur ; or if a database access error occurs
-   * @throws SQLFeatureNotSupportedException  if the JDBC driver does not
-   * support this method
+   *  error could occur ; if a database access error occurs; or
+   * this method is called on a closed CallableStatement
+   * @throws SQLFeatureNotSupportedException  if the JDBC driver does not support this method
    * @since 1.6
    */
- public void setNClob(int parameterIndex, NClob value) throws SQLException{
+  public void setNCharacterStream(String parameterName, Reader value)
+          throws SQLException {
+      throw new SQLFeatureNotSupportedException("Feature not supported");
+   }
+
+   /**
+    * Sets the designated parameter to a java.sql.NClob object. The object
+    * implements the java.sql.NClob interface. This NClob
+    * object maps to a SQL NCLOB.
+    * @param parameterName the name of the column to be set
+    * @param value the parameter value
+    * @throws SQLException if the driver does not support national
+    *         character sets;  if the driver can detect that a data conversion
+    *  error could occur; or if a database access error occurs
+    * @throws SQLFeatureNotSupportedException  if the JDBC driver does not
+    * support this method
+    * @since 1.6
+    */
+   public void setNClob(String parameterName, NClob value) throws SQLException {
+       throw new SQLFeatureNotSupportedException("Feature not supported");
+   }
+
+   /**
+    * Sets the designated parameter to a Reader object.  The reader must contain
+    * the number
+    * of characters specified by length otherwise a SQLException will be
+    * generated when the CallableStatement is executed.
+    * This method differs from the setCharacterStream (int, Reader, int) method
+    * because it informs the driver that the parameter value should be sent to
+    * the server as a NCLOB.  When the setCharacterStream method is used, the
+    * driver may have to do extra work to determine whether the parameter
+    * data should be send to the server as a LONGNVARCHAR or a NCLOB
+    *
+    * @param parameterName the name of the parameter to be set
+    * @param reader An object that contains the data to set the parameter value to.
+    * @param length the number of characters in the parameter data.
+    * @throws SQLException if parameterIndex does not correspond to a parameter
+    * marker in the SQL statement; if the length specified is less than zero;
+    * if the driver does not support national
+    *         character sets;  if the driver can detect that a data conversion
+    *  error could occur; if a database access error occurs or
+    * this method is called on a closed CallableStatement
+    * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
+    * this method
+    * @since 1.6
+    */
+   public void setNClob(String parameterName, Reader reader, long length)
+           throws SQLException {
+       throw new SQLFeatureNotSupportedException("Feature not supported");
+   }
+
+   /**
+    * Sets the designated parameter to a Reader object.
+    * This method differs from the setCharacterStream (int, Reader) method
+    * because it informs the driver that the parameter value should be sent to
+    * the server as a NCLOB.  When the setCharacterStream method is used, the
+    * driver may have to do extra work to determine whether the parameter
+    * data should be send to the server as a LONGNVARCHAR or a NCLOB
+    * 
Note: Consult your JDBC driver documentation to determine if
+    * it might be more efficient to use a version of
+    * setNClob which takes a length parameter.
+    *
+    * @param parameterName the name of the parameter
+    * @param reader An object that contains the data to set the parameter value to.
+    * @throws SQLException if the driver does not support national character sets;
+    * if the driver can detect that a data conversion
+    *  error could occur;  if a database access error occurs or
+    * this method is called on a closed CallableStatement
+    * @throws SQLFeatureNotSupportedException  if the JDBC driver does not support this method
+    *
+    * @since 1.6
+    */
+   public void setNClob(String parameterName, Reader reader) throws SQLException {
+       throw new SQLFeatureNotSupportedException("Feature not supported");
+   }
+
+   /**
+    * Sets the designated parameter to a Reader object.  The reader must contain  the number
+    * of characters specified by length otherwise a SQLException will be
+    * generated when the PreparedStatement is executed.
+    * This method differs from the setCharacterStream (int, Reader, int) method
+    * because it informs the driver that the parameter value should be sent to
+    * the server as a NCLOB.  When the setCharacterStream method is used, the
+    * driver may have to do extra work to determine whether the parameter
+    * data should be sent to the server as a LONGNVARCHAR or a NCLOB
+    * @param parameterIndex index of the first parameter is 1, the second is 2, ...
+    * @param reader An object that contains the data to set the parameter value to.
+    * @param length the number of characters in the parameter data.
+    * @throws SQLException if parameterIndex does not correspond to a parameter
+    * marker in the SQL statement; if the length specified is less than zero;
+    * if the driver does not support national character sets;
+    * if the driver can detect that a data conversion
+    *  error could occur;  if a database access error occurs or
+    * this method is called on a closed PreparedStatement
+    * @throws SQLFeatureNotSupportedException  if the JDBC driver does not
+    * support this method
+    *
+    * @since 1.6
+    */
+   public void setNClob(int parameterIndex, Reader reader, long length)
+           throws SQLException {
+       throw new SQLFeatureNotSupportedException("Feature not supported");
+   }
+
+   /**
+    * Sets the designated parameter to a java.sql.NClob object. The driver converts this oa
+    * SQL NCLOB value when it sends it to the database.
+    * @param parameterIndex of the first parameter is 1, the second is 2, ...
+    * @param value the parameter value
+    * @throws SQLException if the driver does not support national
+    *         character sets;  if the driver can detect that a data conversion
+    *  error could occur ; or if a database access error occurs
+    * @throws SQLFeatureNotSupportedException  if the JDBC driver does not
+    * support this method
+    * @since 1.6
+    */
+   public void setNClob(int parameterIndex, NClob value) throws SQLException {
         throw new SQLFeatureNotSupportedException("Feature not supported");
- }
+   }
 
+   /**
+    * Sets the designated parameter to a Reader object.
+    * This method differs from the setCharacterStream (int, Reader) method
+    * because it informs the driver that the parameter value should be sent to
+    * the server as a NCLOB.  When the setCharacterStream method is used, the
+    * driver may have to do extra work to determine whether the parameter
+    * data should be sent to the server as a LONGNVARCHAR or a NCLOB
+    * 
Note: Consult your JDBC driver documentation to determine if
+    * it might be more efficient to use a version of
+    * setNClob which takes a length parameter.
+    *
+    * @param parameterIndex index of the first parameter is 1, the second is 2, ...
+    * @param reader An object that contains the data to set the parameter value to.
+    * @throws SQLException if parameterIndex does not correspond to a parameter
+    * marker in the SQL statement;
+    * if the driver does not support national character sets;
+    * if the driver can detect that a data conversion
+    *  error could occur;  if a database access error occurs or
+    * this method is called on a closed PreparedStatement
+    * @throws SQLFeatureNotSupportedException  if the JDBC driver does not support this method
+    *
+    * @since 1.6
+    */
+   public void setNClob(int parameterIndex, Reader reader)throws SQLException {
+       throw new SQLFeatureNotSupportedException("Feature not supported");
+   }
 
- /**
-  * Sets the designated parameter to a Reader object.
-  * This method differs from the setCharacterStream (int, Reader) method
-  * because it informs the driver that the parameter value should be sent to
-  * the server as a NCLOB.  When the setCharacterStream method is used, the
-  * driver may have to do extra work to determine whether the parameter
-  * data should be sent to the server as a LONGNVARCHAR or a NCLOB
-  * 
Note: Consult your JDBC driver documentation to determine if
-  * it might be more efficient to use a version of
-  * setNClob which takes a length parameter.
-  *
-  * @param parameterIndex index of the first parameter is 1, the second is 2, ...
-  * @param reader An object that contains the data to set the parameter value to.
-  * @throws SQLException if parameterIndex does not correspond to a parameter
-  * marker in the SQL statement;
-  * if the driver does not support national character sets;
-  * if the driver can detect that a data conversion
-  *  error could occur;  if a database access error occurs or
-  * this method is called on a closed PreparedStatement
-  * @throws SQLFeatureNotSupportedException  if the JDBC driver does not support this method
-  *
-  * @since 1.6
-  */
-  public void setNClob(int parameterIndex, Reader reader)
-    throws SQLException{
-        throw new SQLFeatureNotSupportedException("Feature not supported");
-  }
+   /**
+    * Sets the designated parameter to the given java.net.URL value.
+    * The driver converts this to an SQL DATALINK value
+    * when it sends it to the database.
+    *
+    * @param parameterIndex the first parameter is 1, the second is 2, ...
+    * @param x the java.net.URL object to be set
+    * @exception SQLException if a database access error occurs or
+    * this method is called on a closed PreparedStatement
+    * @throws SQLFeatureNotSupportedException  if the JDBC driver does not support this method
+    * @since 1.4
+    */
+   public void setURL(int parameterIndex, java.net.URL x) throws SQLException {
+       throw new SQLFeatureNotSupportedException("Feature not supported");
+   }
 
+   static final long serialVersionUID = 4886719666485113312L;
 
-  /**
-   * Sets the designated parameter to the given java.net.URL value.
-   * The driver converts this to an SQL DATALINK value
-   * when it sends it to the database.
-   *
-   * @param parameterIndex the first parameter is 1, the second is 2, ...
-   * @param x the java.net.URL object to be set
-   * @exception SQLException if a database access error occurs or
-   * this method is called on a closed PreparedStatement
-   * @throws SQLFeatureNotSupportedException  if the JDBC driver does not support this method
-   * @since 1.4
-   */
-  public void setURL(int parameterIndex, java.net.URL x) throws SQLException{
-        throw new SQLFeatureNotSupportedException("Feature not supported");
-  }
-
-
-
-  static final long serialVersionUID = 4886719666485113312L;
-
-} //end class
+} //end class
\ No newline at end of file
diff --git a/jdk/src/share/classes/javax/sql/rowset/CachedRowSet.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/CachedRowSet.java
similarity index 99%
rename from jdk/src/share/classes/javax/sql/rowset/CachedRowSet.java
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/CachedRowSet.java
index adb1b02771b..4ffcb904e81 100644
--- a/jdk/src/share/classes/javax/sql/rowset/CachedRowSet.java
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/CachedRowSet.java
@@ -286,7 +286,7 @@ import javax.sql.rowset.spi.*;
  * setSyncProvider.
  * 

  * In order to use the optimistic concurrency control routine, the
- * RIOptismisticProvider maintains both its current
+ * RIOptimisticProvider maintains both its current
  * value and its original value (the value it had immediately preceding the
  * current value). Note that if no changes have been made to the data in a
  * RowSet object, its current values and its original values are the same,
@@ -351,7 +351,7 @@ import javax.sql.rowset.spi.*;
  * CachedRowSet object can be used to augment the
  * capabilities of a JDBC technology-enabled driver (hereafter called a
  * "JDBC driver") when the DBMS does not provide full support for scrolling and
- * updating. To achieve the effect of making a non-scrollble and read-only
+ * updating. To achieve the effect of making a non-scrollable and read-only
  * ResultSet object scrollable and updatable, a programmer
  * simply needs to create a CachedRowSet object populated
  * with that ResultSet object's data.  This is demonstrated
@@ -732,7 +732,7 @@ public interface CachedRowSet extends RowSet, Joinable {
     * Note: The acceptChanges() method will determine if the
     * COMMIT_ON_ACCEPT_CHANGES is set to true or not. If it is set
     * to true, all updates in the synchronization are committed to the data
-    * source. Otherwise, the application must explicity call the
+    * source. Otherwise, the application must explicitly call the
     * commit() or rollback() methods as appropriate.
     *
     * @throws SyncProviderException if the underlying
@@ -801,7 +801,7 @@ public interface CachedRowSet extends RowSet, Joinable {
     * Note: The acceptChanges() method will determine if the
     * COMMIT_ON_ACCEPT_CHANGES is set to true or not. If it is set
     * to true, all updates in the synchronization are committed to the data
-    * source. Otherwise, the application must explicity call the
+    * source. Otherwise, the application must explicitly call the
     * commit or rollback methods as appropriate.
     *
     * @param con a standard JDBC Connection object
@@ -850,7 +850,7 @@ public interface CachedRowSet extends RowSet, Joinable {
     * associated updates are fully cleared, thus preventing 'dirty' reads by
     * other components that hold a reference to this RowSet object.
     * In addition, the contents cannot be released
-    * until all all components reading this CachedRowSet object
+    * until all components reading this CachedRowSet object
     * have completed their reads. This CachedRowSet object
     * should be returned to normal behavior after firing the
     * rowSetChanged event.
@@ -934,7 +934,7 @@ public interface CachedRowSet extends RowSet, Joinable {
     * effect until further modification to the rowset data has occurred.
     *
     * @throws SQLException if the cursor is before the first row or after the last
-    *     row in in this CachedRowSet object
+    *     row in this CachedRowSet object
     * @see #undoDelete
     * @see #undoInsert
     * @see java.sql.ResultSet#cancelRowUpdates
@@ -1071,7 +1071,7 @@ public interface CachedRowSet extends RowSet, Joinable {
     * CachedRowSet object. Internally, this method is used by a rowset
     * to trigger read or write actions between the rowset
     * and the data source. For example, a rowset may need to get a handle
-    * on the the rowset reader (RowSetReader object) from the
+    * on the rowset reader (RowSetReader object) from the
     * SyncProvider to allow the rowset to be populated.
     * 
     *     RowSetReader rowsetReader = null;
@@ -1096,7 +1096,7 @@ public interface CachedRowSet extends RowSet, Joinable {
     * it currently has set.
     *
     * @return the SyncProvider object that was set when the rowset
-    *      was instantiated, or if none was was set, the default provider
+    *      was instantiated, or if none was set, the default provider
     * @throws SQLException if an error occurs while returning the
     * SyncProvider object
     * @see #setSyncProvider
diff --git a/jdk/src/share/classes/javax/sql/rowset/FilteredRowSet.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/FilteredRowSet.java
similarity index 99%
rename from jdk/src/share/classes/javax/sql/rowset/FilteredRowSet.java
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/FilteredRowSet.java
index d03d6c68461..42d5a0ffd78 100644
--- a/jdk/src/share/classes/javax/sql/rowset/FilteredRowSet.java
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/FilteredRowSet.java
@@ -108,7 +108,7 @@ import java.math.*;
  * The FilteredRowSet range criterion can be modified by applying
  * a new Predicate object to the FilteredRowSet
  * instance at any time. This is  possible if no additional references to the
- * FilteredRowSet object are detected. A new filter has has an
+ * FilteredRowSet object are detected. A new filter has an
  * immediate effect on criterion enforcement within the
  * FilteredRowSet object, and all subsequent views and updates will be
  * subject to similar enforcement.
diff --git a/jdk/src/share/classes/javax/sql/rowset/JdbcRowSet.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/JdbcRowSet.java
similarity index 100%
rename from jdk/src/share/classes/javax/sql/rowset/JdbcRowSet.java
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/JdbcRowSet.java
diff --git a/jdk/src/share/classes/javax/sql/rowset/JoinRowSet.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/JoinRowSet.java
similarity index 99%
rename from jdk/src/share/classes/javax/sql/rowset/JoinRowSet.java
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/JoinRowSet.java
index 774ac31158b..06f8e1c06e7 100644
--- a/jdk/src/share/classes/javax/sql/rowset/JoinRowSet.java
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/JoinRowSet.java
@@ -111,7 +111,7 @@ import javax.sql.rowset.*;
  * and they do not have to store the exact same data type as long as the data types
  * can be compared.
  * 

- * A match column can be be set in two ways:
+ * A match column can be set in two ways:
  * 
    
  *  
  • By calling the Joinable method setMatchColumn
    
  *  This is the only method that can set the match column before a RowSet
@@ -527,7 +527,7 @@ public interface JoinRowSet extends WebRowSet {
     public static int RIGHT_OUTER_JOIN = 3;
 
     /**
-     * An ANSI-style JOIN providing a a full JOIN. Specifies that all
+     * An ANSI-style JOIN providing a full JOIN. Specifies that all
      * rows from either table be returned regardless of matching
      * records on the other table.
      */
diff --git a/jdk/src/share/classes/javax/sql/rowset/Joinable.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/Joinable.java
similarity index 100%
rename from jdk/src/share/classes/javax/sql/rowset/Joinable.java
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/Joinable.java
diff --git a/jdk/src/share/classes/javax/sql/rowset/Predicate.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/Predicate.java
similarity index 98%
rename from jdk/src/share/classes/javax/sql/rowset/Predicate.java
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/Predicate.java
index a3f674d454d..20a401978ca 100644
--- a/jdk/src/share/classes/javax/sql/rowset/Predicate.java
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/Predicate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -102,7 +102,7 @@ import java.sql.*;
  */
 
  // 
    3.0 FilteredRowSet Internals
    
- // internalNext, Frist, Last. Discuss guidelines on how to approach this
+ // internalNext, First, Last. Discuss guidelines on how to approach this
  // and cite examples in reference implementations.
 public interface Predicate {
     /**
diff --git a/jdk/src/share/classes/javax/sql/rowset/RowSetFactory.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/sql/rowset/RowSetFactory.java
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetFactory.java
diff --git a/jdk/src/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java
similarity index 99%
rename from jdk/src/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java
index b15a4df9dac..832b6512987 100644
--- a/jdk/src/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -607,7 +607,7 @@ public class RowSetMetaDataImpl implements RowSetMetaData,  Serializable {
     }
 
     /**
-     * Retrieves the the suggested column title for the designated
+     * Retrieves the suggested column title for the designated
      * column for use in printouts and displays.
      *
      * @param columnIndex the first column is 1, the second is 2, and so on;
@@ -1073,7 +1073,7 @@ public class RowSetMetaDataImpl implements RowSetMetaData,  Serializable {
         public int colType;
 
         /**
-         * The field that holds the the type name used by this particular data source
+         * The field that holds the type name used by this particular data source
          * for the value stored in this column.
          *
          * @serial
@@ -1081,7 +1081,7 @@ public class RowSetMetaDataImpl implements RowSetMetaData,  Serializable {
         public String colTypeName;
 
         /**
-         * The field that holds the updatablity boolean per column of a RowSet
+         * The field that holds the updatability boolean per column of a RowSet
          *
          * @serial
          */
diff --git a/jdk/src/share/classes/javax/sql/rowset/RowSetProvider.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetProvider.java
similarity index 99%
rename from jdk/src/share/classes/javax/sql/rowset/RowSetProvider.java
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetProvider.java
index e8c10c0a1a2..20aacfdb70f 100644
--- a/jdk/src/share/classes/javax/sql/rowset/RowSetProvider.java
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetProvider.java
@@ -97,7 +97,7 @@ public class RowSetProvider {
      * The {@link ServiceLoader} API. The {@code ServiceLoader} API will look
      * for a class name in the file
      * {@code META-INF/services/javax.sql.rowset.RowSetFactory}
-     * in jars available to the runtime. For example, to have the the RowSetFactory
+     * in jars available to the runtime. For example, to have the RowSetFactory
      * implementation {@code com.sun.rowset.RowSetFactoryImpl } loaded, the
      * entry in {@code META-INF/services/javax.sql.rowset.RowSetFactory} would be:
      *  
      
diff --git a/jdk/src/share/classes/javax/sql/rowset/RowSetWarning.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetWarning.java
similarity index 97%
rename from jdk/src/share/classes/javax/sql/rowset/RowSetWarning.java
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetWarning.java
index ecdc9ad1b3a..b8f1c4b0a14 100644
--- a/jdk/src/share/classes/javax/sql/rowset/RowSetWarning.java
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetWarning.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -111,7 +111,7 @@ public class RowSetWarning extends SQLException {
      * @param reason a String giving a description of the
      *        warning;
      * @param SQLState an XOPEN code identifying the warning; if a non standard
-     *        XPOEN SQLState is supplied, no exception is thrown.
+     *        XOPEN SQLState is supplied, no exception is thrown.
      * @param vendorCode a database vendor-specific warning code
      */
     public RowSetWarning(java.lang.String reason, java.lang.String SQLState, int vendorCode) {
diff --git a/jdk/src/share/classes/javax/sql/rowset/WebRowSet.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/WebRowSet.java
similarity index 98%
rename from jdk/src/share/classes/javax/sql/rowset/WebRowSet.java
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/WebRowSet.java
index f588f007955..85dee9ce73a 100644
--- a/jdk/src/share/classes/javax/sql/rowset/WebRowSet.java
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/WebRowSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,7 +52,7 @@ import org.xml.sax.*;
  * of the {@code WebRowSet} interface to ensure interoperability. In addition,
  * the {@code WebRowSet} schema uses specific SQL/XML Schema annotations,
  * thus ensuring greater cross
- * platform inter-operability. This is an effort currently under way at the ISO
+ * platform interoperability. This is an effort currently under way at the ISO
  * organization. The SQL/XML definition is available at the following URI:
  * 
        
  * 
      • 
@@ -109,7 +109,7 @@ import org.xml.sax.*;
  *      0
  *      0
  *      false
- *      TRANSACTION_READ_UNCOMMITED
+ *      TRANSACTION_READ_UNCOMMITTED
  *      false
  *      
  *      jdbc:thin:oracle
diff --git a/jdk/src/share/classes/javax/sql/rowset/package.html b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/package.html
similarity index 99%
rename from jdk/src/share/classes/javax/sql/rowset/package.html
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/package.html
index b25e8a29236..b84eb293aad 100644
--- a/jdk/src/share/classes/javax/sql/rowset/package.html
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/package.html
@@ -156,7 +156,7 @@ no-argument constructor.
 
      • 3.2 Role of the BaseRowSet Class
 
        
 A compliant JDBC RowSet implementation must implement one or more 
-standard interfaces specified in this package and and may extend the 
+standard interfaces specified in this package and may extend the 
 BaseRowSet abstract class. For example, a 
 CachedRowSet implementation must implement the CachedRowSet
 interface and extend the BaseRowSet abstract class. The
diff --git a/jdk/src/share/classes/javax/sql/rowset/rowset.properties b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/rowset.properties
similarity index 100%
rename from jdk/src/share/classes/javax/sql/rowset/rowset.properties
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/rowset.properties
diff --git a/jdk/src/share/classes/javax/sql/rowset/serial/SQLInputImpl.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SQLInputImpl.java
similarity index 100%
rename from jdk/src/share/classes/javax/sql/rowset/serial/SQLInputImpl.java
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SQLInputImpl.java
diff --git a/jdk/src/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java
similarity index 100%
rename from jdk/src/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java
diff --git a/jdk/src/share/classes/javax/sql/rowset/serial/SerialArray.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialArray.java
similarity index 99%
rename from jdk/src/share/classes/javax/sql/rowset/serial/SerialArray.java
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialArray.java
index 5715ea0463f..3bbaebbea2c 100644
--- a/jdk/src/share/classes/javax/sql/rowset/serial/SerialArray.java
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialArray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -202,7 +202,7 @@ public class SerialArray implements Array, Serializable, Cloneable {
   }
 
     /**
-     * This method frees the {@code SeriableArray} object and releases the
+     * This method frees the {@code SerialArray} object and releases the
      * resources that it holds. The object is invalid once the {@code free}
      * method is called. 
         If {@code free} is called multiple times, the
      * subsequent calls to {@code free} are treated as a no-op. 
        
@@ -313,7 +313,6 @@ public class SerialArray implements Array, Serializable, Cloneable {
         return dst;
     }
 
- //[if an error occurstype map used??]
     /**
      * Returns a new array that is a copy of this SerialArray
      * object, using the given type map for the custom
diff --git a/jdk/src/share/classes/javax/sql/rowset/serial/SerialBlob.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialBlob.java
similarity index 99%
rename from jdk/src/share/classes/javax/sql/rowset/serial/SerialBlob.java
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialBlob.java
index 66652d2df85..abdfc58d880 100644
--- a/jdk/src/share/classes/javax/sql/rowset/serial/SerialBlob.java
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialBlob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -475,7 +475,7 @@ public class SerialBlob implements Blob, Serializable, Cloneable {
 
 
     /**
-     * This method frees the {@code SeriableBlob} object and releases the
+     * This method frees the {@code SerialBlob} object and releases the
      * resources that it holds. The object is invalid once the {@code free}
      * method is called. 
         If {@code free} is called multiple times, the
      * subsequent calls to {@code free} are treated as a no-op. 
        
@@ -578,7 +578,7 @@ public class SerialBlob implements Blob, Serializable, Cloneable {
         fields.put("len", len);
         fields.put("origLen", origLen);
         // Note: this check to see if it is an instance of Serializable
-        // is for backwards compatibiity
+        // is for backwards compatibility
         fields.put("blob", blob instanceof Serializable ? blob : null);
         s.writeFields();
     }
diff --git a/jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialClob.java
similarity index 99%
rename from jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialClob.java
index 7f994f5c41e..fe8a65af19d 100644
--- a/jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialClob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -565,7 +565,7 @@ public class SerialClob implements Clob, Serializable, Cloneable {
     }
 
     /**
-     * This method frees the {@code SeriableClob} object and releases the
+     * This method frees the {@code SerialClob} object and releases the
      * resources that it holds.
      * The object is invalid once the {@code free} method is called.
      * 
        
@@ -670,7 +670,7 @@ public class SerialClob implements Clob, Serializable, Cloneable {
         fields.put("len", len);
         fields.put("origLen", origLen);
         // Note: this check to see if it is an instance of Serializable
-        // is for backwards compatibiity
+        // is for backwards compatibility
         fields.put("clob", clob instanceof Serializable ? clob : null);
         s.writeFields();
     }
diff --git a/jdk/src/share/classes/javax/sql/rowset/serial/SerialDatalink.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialDatalink.java
similarity index 98%
rename from jdk/src/share/classes/javax/sql/rowset/serial/SerialDatalink.java
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialDatalink.java
index 422fd25cba8..a0336589a68 100644
--- a/jdk/src/share/classes/javax/sql/rowset/serial/SerialDatalink.java
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialDatalink.java
@@ -61,7 +61,7 @@ public class SerialDatalink implements Serializable, Cloneable {
 
     /**
      * The SQL type of the elements in this SerialDatalink
-     * object.  The type is expressed as one of the contants from the
+     * object.  The type is expressed as one of the constants from the
      * class java.sql.Types.
      * @serial
      */
diff --git a/jdk/src/share/classes/javax/sql/rowset/serial/SerialException.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialException.java
similarity index 100%
rename from jdk/src/share/classes/javax/sql/rowset/serial/SerialException.java
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialException.java
diff --git a/jdk/src/share/classes/javax/sql/rowset/serial/SerialJavaObject.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialJavaObject.java
similarity index 100%
rename from jdk/src/share/classes/javax/sql/rowset/serial/SerialJavaObject.java
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialJavaObject.java
diff --git a/jdk/src/share/classes/javax/sql/rowset/serial/SerialRef.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialRef.java
similarity index 98%
rename from jdk/src/share/classes/javax/sql/rowset/serial/SerialRef.java
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialRef.java
index 91d3dcd57a2..47a86c28f90 100644
--- a/jdk/src/share/classes/javax/sql/rowset/serial/SerialRef.java
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialRef.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -243,7 +243,7 @@ public class SerialRef implements Ref, Serializable, Cloneable {
         fields.put("baseTypeName", baseTypeName);
         fields.put("object", object);
         // Note: this check to see if it is an instance of Serializable
-        // is for backwards compatibiity
+        // is for backwards compatibility
         fields.put("reference", reference instanceof Serializable ? reference : null);
         s.writeFields();
     }
diff --git a/jdk/src/share/classes/javax/sql/rowset/serial/SerialStruct.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialStruct.java
similarity index 100%
rename from jdk/src/share/classes/javax/sql/rowset/serial/SerialStruct.java
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialStruct.java
diff --git a/jdk/src/share/classes/javax/sql/rowset/serial/package.html b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/package.html
similarity index 98%
rename from jdk/src/share/classes/javax/sql/rowset/serial/package.html
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/package.html
index 67f87148673..5e44c8f8faa 100644
--- a/jdk/src/share/classes/javax/sql/rowset/serial/package.html
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/package.html
@@ -87,7 +87,7 @@ materialized on the client as a stream of Unicode characters. 
        
 
        5.0 SerialDatalink
        
 A serializable mapping in the Java programming language of an SQL DATALINK
 value. A DATALINK value references a file outside of the underlying data source
-that the the originating data source manages. 
        
+that the originating data source manages. 
        
 
        
 RowSet implementations can use the method RowSet.getURL() to retrieve
 a java.net.URL object, which can be used to manipulate the external data.
@@ -141,7 +141,7 @@ type that has a custom mapping; a programmer never invokes SQLInputImpl
   The SQLInputImpl class provides a set of reader methods
  analogous to the ResultSet getter methods. These methods make it
  possible to read the values in an SQLInputImpl object. The method
-wasNull is used to determine whether the the last value read was SQL NULL.
+wasNull is used to determine whether the last value read was SQL NULL.
  
        
   
        
   When a constructor or getter method that takes a Map object is called, 
diff --git a/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncFactory.java
similarity index 99%
rename from jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncFactory.java
index 586e19fb8c3..686479fcdee 100644
--- a/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncFactory.java
@@ -259,7 +259,7 @@ public class SyncFactory {
     private static Hashtable implementations;
 
     /**
-     * Adds the the given synchronization provider to the factory register. Guidelines
+     * Adds the given synchronization provider to the factory register. Guidelines
      * are provided in the SyncProvider specification for the
      * required naming conventions for SyncProvider
      * implementations.
@@ -462,7 +462,7 @@ public class SyncFactory {
 
     /**
      * Internal handler for all standard property parsing. Parses standard
-     * ROWSET properties and stores lazy references into the the internal registry.
+     * ROWSET properties and stores lazy references into the internal registry.
      */
     private static void parseProperties(Properties p) {
 
diff --git a/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactoryException.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncFactoryException.java
similarity index 100%
rename from jdk/src/share/classes/javax/sql/rowset/spi/SyncFactoryException.java
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncFactoryException.java
diff --git a/jdk/src/share/classes/javax/sql/rowset/spi/SyncProvider.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncProvider.java
similarity index 99%
rename from jdk/src/share/classes/javax/sql/rowset/spi/SyncProvider.java
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncProvider.java
index 14c605634bf..72439ab4408 100644
--- a/jdk/src/share/classes/javax/sql/rowset/spi/SyncProvider.java
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncProvider.java
@@ -173,7 +173,7 @@ import javax.sql.*;
  * are used as return values or parameters for SyncProvider methods.
  * SyncProvider objects may be implemented to perform synchronization
  * between a RowSet object and its underlying data source with varying
- * degrees of of care. The first group of constants indicate how synchronization
+ * degrees of care. The first group of constants indicate how synchronization
  * is handled. For example, GRADE_NONE indicates that a
  * SyncProvider object will not take any care to see what data is
  * valid and will simply write the RowSet data to the data source.
diff --git a/jdk/src/share/classes/javax/sql/rowset/spi/SyncProviderException.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncProviderException.java
similarity index 100%
rename from jdk/src/share/classes/javax/sql/rowset/spi/SyncProviderException.java
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncProviderException.java
diff --git a/jdk/src/share/classes/javax/sql/rowset/spi/SyncResolver.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncResolver.java
similarity index 100%
rename from jdk/src/share/classes/javax/sql/rowset/spi/SyncResolver.java
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncResolver.java
diff --git a/jdk/src/share/classes/javax/sql/rowset/spi/TransactionalWriter.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/TransactionalWriter.java
similarity index 100%
rename from jdk/src/share/classes/javax/sql/rowset/spi/TransactionalWriter.java
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/TransactionalWriter.java
diff --git a/jdk/src/share/classes/javax/sql/rowset/spi/XmlReader.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/XmlReader.java
similarity index 100%
rename from jdk/src/share/classes/javax/sql/rowset/spi/XmlReader.java
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/XmlReader.java
diff --git a/jdk/src/share/classes/javax/sql/rowset/spi/XmlWriter.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/XmlWriter.java
similarity index 100%
rename from jdk/src/share/classes/javax/sql/rowset/spi/XmlWriter.java
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/XmlWriter.java
diff --git a/jdk/src/share/classes/javax/sql/rowset/spi/package.html b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/package.html
similarity index 99%
rename from jdk/src/share/classes/javax/sql/rowset/spi/package.html
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/package.html
index 1b4c8ee28e3..c54def4e151 100644
--- a/jdk/src/share/classes/javax/sql/rowset/spi/package.html
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/package.html
@@ -122,7 +122,7 @@ groups have considered offering XML-based synchronization.  For details, see
      http://www.syncml.org
 

 

-For the the next level up, the
+For the next level up, the
 writer checks to see if there are any conflicts, and if there are, 
 it does not write anything to the data source.  The problem with this concurrency
 level is that if another party has modified the corresponding data in the data source 
diff --git a/jdk/src/share/classes/javax/sql/rowset/sqlxml.xsd b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/sqlxml.xsd
similarity index 100%
rename from jdk/src/share/classes/javax/sql/rowset/sqlxml.xsd
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/sqlxml.xsd
diff --git a/jdk/src/share/classes/javax/sql/rowset/webrowset.xsd b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/webrowset.xsd
similarity index 100%
rename from jdk/src/share/classes/javax/sql/rowset/webrowset.xsd
rename to jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/webrowset.xsd
diff --git a/jdk/src/share/classes/java/sql/Array.java b/jdk/src/java.sql/share/classes/java/sql/Array.java
similarity index 99%
rename from jdk/src/share/classes/java/sql/Array.java
rename to jdk/src/java.sql/share/classes/java/sql/Array.java
index fdc243663ce..e2067312b1d 100644
--- a/jdk/src/share/classes/java/sql/Array.java
+++ b/jdk/src/java.sql/share/classes/java/sql/Array.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -181,7 +181,7 @@ public interface Array {
   Object getArray(long index, int count) throws SQLException;
 
   /**
-   * Retreives a slice of the SQL ARRAY value
+   * Retrieves a slice of the SQL ARRAY value
    * designated by this Array object, beginning with the specified
    * index and containing up to count
    * successive elements of the SQL array.
diff --git a/jdk/src/share/classes/java/sql/BatchUpdateException.java b/jdk/src/java.sql/share/classes/java/sql/BatchUpdateException.java
similarity index 99%
rename from jdk/src/share/classes/java/sql/BatchUpdateException.java
rename to jdk/src/java.sql/share/classes/java/sql/BatchUpdateException.java
index fd5fb2242a9..66036718c93 100644
--- a/jdk/src/share/classes/java/sql/BatchUpdateException.java
+++ b/jdk/src/java.sql/share/classes/java/sql/BatchUpdateException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -479,14 +479,14 @@ public class BatchUpdateException extends SQLException {
    * to BatchUpdateException:
    * 
    
    * 
  • Add field longUpdateCounts
    • 
-   * 
  • Add Constructorr which takes long[] for update counts
    • 
+   * 
  • Add Constructor which takes long[] for update counts
    • 
    * 
  • Add getLargeUpdateCounts method
    • 
    * 

    * When any of the constructors are called, the int[] and long[] updateCount
    * fields are populated by copying the one array to each other.
    *
    * As the JDBC driver passes in the updateCounts, there has always been the
-   * possiblity for overflow and BatchUpdateException does not need to account
+   * possibility for overflow and BatchUpdateException does not need to account
    * for that, it simply copies the arrays.
    *
    * JDBC drivers should always use the constructor that specifies long[] and
diff --git a/jdk/src/share/classes/java/sql/Blob.java b/jdk/src/java.sql/share/classes/java/sql/Blob.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/Blob.java
rename to jdk/src/java.sql/share/classes/java/sql/Blob.java
diff --git a/jdk/src/share/classes/java/sql/CallableStatement.java b/jdk/src/java.sql/share/classes/java/sql/CallableStatement.java
similarity index 99%
rename from jdk/src/share/classes/java/sql/CallableStatement.java
rename to jdk/src/java.sql/share/classes/java/sql/CallableStatement.java
index 20da9aae6a9..5446c6d615f 100644
--- a/jdk/src/share/classes/java/sql/CallableStatement.java
+++ b/jdk/src/java.sql/share/classes/java/sql/CallableStatement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1145,7 +1145,7 @@ public interface CallableStatement extends PreparedStatement {
      * Java Object types to SQL types.  The given argument
      * will be converted to the corresponding SQL type before being
      * sent to the database.
-     * 
Note that this method may be used to pass datatabase-
+     * 
Note that this method may be used to pass database-
      * specific abstract data types, by using a driver-specific Java
      * type.
      *
@@ -1882,7 +1882,8 @@ public interface CallableStatement extends PreparedStatement {
        throws SQLException;
 
     /**
-     * Sets the designated parameter to a InputStream object.  The inputstream must contain  the number
+     * Sets the designated parameter to a {@code InputStream} object.
+     * The Inputstream must contain the number
      * of characters specified by length, otherwise a SQLException will be
      * generated when the CallableStatement is executed.
      * This method differs from the setBinaryStream (int, InputStream, int)
@@ -1899,8 +1900,8 @@ public interface CallableStatement extends PreparedStatement {
      * @param length the number of bytes in the parameter data.
      * @throws SQLException  if parameterName does not correspond to a named
      * parameter; if the length specified
-     * is less than zero; if the number of bytes in the inputstream does not match
-     * the specified length; if a database access error occurs or
+     * is less than zero; if the number of bytes in the {@code InputStream}
+     * does not match the specified length; if a database access error occurs or
      * this method is called on a closed CallableStatement
      * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
      * this method
@@ -2378,7 +2379,7 @@ public interface CallableStatement extends PreparedStatement {
        throws SQLException;
 
     /**
-     * Sets the designated parameter to a InputStream object.
+     * Sets the designated parameter to a {@code InputStream} object.
      * This method differs from the setBinaryStream (int, InputStream)
      * method because it informs the driver that the parameter value should be
      * sent to the server as a BLOB.  When the setBinaryStream method is used,
@@ -2430,7 +2431,7 @@ public interface CallableStatement extends PreparedStatement {
 
 
     /**
-     *
Returns an object representing the value of OUT parameter
+     * Returns an object representing the value of OUT parameter
      * {@code parameterIndex} and will convert from the
      * SQL type of the parameter to the requested Java data type, if the
      * conversion is supported. If the conversion is not
@@ -2459,7 +2460,7 @@ public interface CallableStatement extends PreparedStatement {
 
 
     /**
-     *
Returns an object representing the value of OUT parameter
+     * Returns an object representing the value of OUT parameter
      * {@code parameterName} and will convert from the
      * SQL type of the parameter to the requested Java data type, if the
      * conversion is supported. If the conversion is not
@@ -2490,7 +2491,7 @@ public interface CallableStatement extends PreparedStatement {
      //------------------------- JDBC 4.2 -----------------------------------
 
      /**
-     * 
Sets the value of the designated parameter with the given object.
+     * Sets the value of the designated parameter with the given object.
      *
      * If the second argument is an {@code InputStream} then the stream
      * must contain the number of bytes specified by scaleOrLength.
diff --git a/jdk/src/share/classes/java/sql/ClientInfoStatus.java b/jdk/src/java.sql/share/classes/java/sql/ClientInfoStatus.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/ClientInfoStatus.java
rename to jdk/src/java.sql/share/classes/java/sql/ClientInfoStatus.java
diff --git a/jdk/src/share/classes/java/sql/Clob.java b/jdk/src/java.sql/share/classes/java/sql/Clob.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/Clob.java
rename to jdk/src/java.sql/share/classes/java/sql/Clob.java
diff --git a/jdk/src/share/classes/java/sql/Connection.java b/jdk/src/java.sql/share/classes/java/sql/Connection.java
similarity index 99%
rename from jdk/src/share/classes/java/sql/Connection.java
rename to jdk/src/java.sql/share/classes/java/sql/Connection.java
index ea191cd2dba..ac73fde29dd 100644
--- a/jdk/src/share/classes/java/sql/Connection.java
+++ b/jdk/src/java.sql/share/classes/java/sql/Connection.java
@@ -274,7 +274,7 @@ public interface Connection  extends Wrapper, AutoCloseable {
      * close method.  If the close method is called
      * and there is an active transaction, the results are implementation-defined.
      *
-     * @exception SQLException SQLException if a database access error occurs
+     * @exception SQLException if a database access error occurs
      */
     void close() throws SQLException;
 
@@ -335,7 +335,7 @@ public interface Connection  extends Wrapper, AutoCloseable {
      *
      * @return true if this Connection object
      *         is read-only; false otherwise
-     * @exception SQLException SQLException if a database access error occurs
+     * @exception SQLException if a database access error occurs
      * or this method is called on a closed connection
      */
     boolean isReadOnly() throws SQLException;
@@ -492,7 +492,7 @@ public interface Connection  extends Wrapper, AutoCloseable {
      * returns null until a new warning is
      * reported for this Connection object.
      *
-     * @exception SQLException SQLException if a database access error occurs
+     * @exception SQLException if a database access error occurs
      * or this method is called on a closed connection
      */
     void clearWarnings() throws SQLException;
@@ -632,7 +632,7 @@ public interface Connection  extends Wrapper, AutoCloseable {
      * this Connection object.  The type map will be used for the
      * custom mapping of SQL structured types and distinct types.
      * 

-     * You must set the the values for the TypeMap prior to
+     * You must set the values for the TypeMap prior to
      * callng setMap as a JDBC driver may create an internal copy
      * of the TypeMap:
      *
@@ -662,7 +662,7 @@ public interface Connection  extends Wrapper, AutoCloseable {
      * Changes the default holdability of ResultSet objects
      * created using this Connection object to the given
      * holdability.  The default holdability of ResultSet objects
-     * can be be determined by invoking
+     * can be determined by invoking
      * {@link DatabaseMetaData#getResultSetHoldability}.
      *
      * @param holdability a ResultSet holdability constant; one of
diff --git a/jdk/src/share/classes/java/sql/DataTruncation.java b/jdk/src/java.sql/share/classes/java/sql/DataTruncation.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/DataTruncation.java
rename to jdk/src/java.sql/share/classes/java/sql/DataTruncation.java
diff --git a/jdk/src/share/classes/java/sql/DatabaseMetaData.java b/jdk/src/java.sql/share/classes/java/sql/DatabaseMetaData.java
similarity index 99%
rename from jdk/src/share/classes/java/sql/DatabaseMetaData.java
rename to jdk/src/java.sql/share/classes/java/sql/DatabaseMetaData.java
index 07b7475c4b3..937e58eb6c7 100644
--- a/jdk/src/share/classes/java/sql/DatabaseMetaData.java
+++ b/jdk/src/java.sql/share/classes/java/sql/DatabaseMetaData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1216,7 +1216,7 @@ public interface DatabaseMetaData extends Wrapper {
      * PROCEDURE_CAT, PROCEDURE_SCHEM,
      * PROCEDURE_NAME and SPECIFIC_ NAME.
      *
-     * 
Each procedure description has the the following columns:
+     * 
Each procedure description has the following columns:
      *  
    
      *  
  1. PROCEDURE_CAT String {@code =>} procedure catalog (may be null)
      *  
  2. PROCEDURE_SCHEM String {@code =>} procedure schema (may be null)
@@ -1487,7 +1487,7 @@ public interface DatabaseMetaData extends Wrapper {
      *  
  3. TABLE_TYPE String {@code =>} table type.  Typical types are "TABLE",
      *                  "VIEW", "SYSTEM TABLE", "GLOBAL TEMPORARY",
      *                  "LOCAL TEMPORARY", "ALIAS", "SYNONYM".
-     *  
  4. REMARKS String {@code =>} explanatory comment on the table
+     *  
  5. REMARKS String {@code =>} explanatory comment on the table (may be {@code null})
      *  
  6. TYPE_CAT String {@code =>} the types catalog (may be null)
      *  
  7. TYPE_SCHEM String {@code =>} the types schema (may be null)
      *  
  8. TYPE_NAME String {@code =>} type name (may be null)
@@ -1710,7 +1710,7 @@ public interface DatabaseMetaData extends Wrapper {
      *  
  9. GRANTOR String {@code =>} grantor of access (may be null)
      *  
  10. GRANTEE String {@code =>} grantee of access
      *  
  11. PRIVILEGE String {@code =>} name of access (SELECT,
-     *      INSERT, UPDATE, REFRENCES, ...)
+     *      INSERT, UPDATE, REFERENCES, ...)
      *  
  12. IS_GRANTABLE String {@code =>} "YES" if grantee is permitted
      *      to grant to others; "NO" if not; null if unknown
      *  

@@ -1755,7 +1755,7 @@ public interface DatabaseMetaData extends Wrapper {
      *  
  • GRANTOR String {@code =>} grantor of access (may be null)
      *  
  • GRANTEE String {@code =>} grantee of access
      *  
  • PRIVILEGE String {@code =>} name of access (SELECT,
-     *      INSERT, UPDATE, REFRENCES, ...)
+     *      INSERT, UPDATE, REFERENCES, ...)
      *  
  • IS_GRANTABLE String {@code =>} "YES" if grantee is permitted
      *      to grant to others; "NO" if not; null if unknown
      *  
@@ -2509,7 +2509,7 @@ public interface DatabaseMetaData extends Wrapper {
      *  
  • TYPE short {@code =>} index type:
      *      
      
      *      
    •  tableIndexStatistic - this identifies table statistics that are
-     *           returned in conjuction with a table's index descriptions
+     *           returned in conjunction with a table's index descriptions
      *      
    •  tableIndexClustered - this is a clustered index
      *      
    •  tableIndexHashed - this is a hashed index
      *      
    •  tableIndexOther - this is some other style of index
@@ -2524,7 +2524,7 @@ public interface DatabaseMetaData extends Wrapper {
      *  
    • CARDINALITY long {@code =>} When TYPE is tableIndexStatistic, then
      *      this is the number of rows in the table; otherwise, it is the
      *      number of unique values in the index.
-     *  
    • PAGES long {@code =>} When TYPE is  tableIndexStatisic then
+     *  
    • PAGES long {@code =>} When TYPE is  tableIndexStatistic then
      *      this is the number of pages used for the table, otherwise it
      *      is the number of pages used for the current index.
      *  
    • FILTER_CONDITION String {@code =>} Filter condition, if any.
@@ -2858,7 +2858,7 @@ public interface DatabaseMetaData extends Wrapper {
      * @return true if a CallableStatement object
      *         can return multiple ResultSet objects
      *         simultaneously; false otherwise
-     * @exception SQLException if a datanase access error occurs
+     * @exception SQLException if a database access error occurs
      * @since 1.4
      */
     boolean supportsMultipleOpenResults() throws SQLException;
@@ -3302,7 +3302,7 @@ public interface DatabaseMetaData extends Wrapper {
      * FUNCTION_NAME and
      * SPECIFIC_ NAME.
      *
-     * 
      Each function description has the the following columns:
+     * 
      Each function description has the following columns:
      *  
        
      *  
      1. FUNCTION_CAT String {@code =>} function catalog (may be null)
      *  
      2. FUNCTION_SCHEM String {@code =>} function schema (may be null)
diff --git a/jdk/src/share/classes/java/sql/Date.java b/jdk/src/java.sql/share/classes/java/sql/Date.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/Date.java
rename to jdk/src/java.sql/share/classes/java/sql/Date.java
diff --git a/jdk/src/share/classes/java/sql/Driver.java b/jdk/src/java.sql/share/classes/java/sql/Driver.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/Driver.java
rename to jdk/src/java.sql/share/classes/java/sql/Driver.java
diff --git a/jdk/src/share/classes/java/sql/DriverAction.java b/jdk/src/java.sql/share/classes/java/sql/DriverAction.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/DriverAction.java
rename to jdk/src/java.sql/share/classes/java/sql/DriverAction.java
diff --git a/jdk/src/share/classes/java/sql/DriverManager.java b/jdk/src/java.sql/share/classes/java/sql/DriverManager.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/DriverManager.java
rename to jdk/src/java.sql/share/classes/java/sql/DriverManager.java
diff --git a/jdk/src/share/classes/java/sql/DriverPropertyInfo.java b/jdk/src/java.sql/share/classes/java/sql/DriverPropertyInfo.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/DriverPropertyInfo.java
rename to jdk/src/java.sql/share/classes/java/sql/DriverPropertyInfo.java
diff --git a/jdk/src/share/classes/java/sql/JDBCType.java b/jdk/src/java.sql/share/classes/java/sql/JDBCType.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/JDBCType.java
rename to jdk/src/java.sql/share/classes/java/sql/JDBCType.java
diff --git a/jdk/src/share/classes/java/sql/NClob.java b/jdk/src/java.sql/share/classes/java/sql/NClob.java
similarity index 97%
rename from jdk/src/share/classes/java/sql/NClob.java
rename to jdk/src/java.sql/share/classes/java/sql/NClob.java
index f3d535c0afd..b7ecd3dbbf5 100644
--- a/jdk/src/share/classes/java/sql/NClob.java
+++ b/jdk/src/java.sql/share/classes/java/sql/NClob.java
@@ -25,8 +25,6 @@
 
 package java.sql;
 
-import java.sql.Clob;
-
 /**
  * The mapping in the Java™ programming language
  * for the SQL NCLOB type.
@@ -34,7 +32,7 @@ import java.sql.Clob;
  * that stores a Character Large Object using the National Character Set
  *  as a column value in a row of  a database table.
  * 
        The NClob interface extends the Clob interface
- * which provides provides methods for getting the
+ * which provides methods for getting the
  * length of an SQL NCLOB value,
  * for materializing a NCLOB value on the client, and for
  * searching for a substring or NCLOB object within a
diff --git a/jdk/src/share/classes/java/sql/ParameterMetaData.java b/jdk/src/java.sql/share/classes/java/sql/ParameterMetaData.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/ParameterMetaData.java
rename to jdk/src/java.sql/share/classes/java/sql/ParameterMetaData.java
diff --git a/jdk/src/share/classes/java/sql/PreparedStatement.java b/jdk/src/java.sql/share/classes/java/sql/PreparedStatement.java
similarity index 99%
rename from jdk/src/share/classes/java/sql/PreparedStatement.java
rename to jdk/src/java.sql/share/classes/java/sql/PreparedStatement.java
index f33fd10aae9..10da0267563 100644
--- a/jdk/src/share/classes/java/sql/PreparedStatement.java
+++ b/jdk/src/java.sql/share/classes/java/sql/PreparedStatement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -415,7 +415,7 @@ public interface PreparedStatement extends Statement {
      * will be converted to the corresponding SQL type before being
      * sent to the database.
      *
-     * 
        Note that this method may be used to pass datatabase-
+     * 
        Note that this method may be used to pass database-
      * specific abstract data types, by using a driver-specific Java
      * type.
      *
@@ -838,7 +838,8 @@ public interface PreparedStatement extends Statement {
        throws SQLException;
 
     /**
-     * Sets the designated parameter to a InputStream object.  The inputstream must contain  the number
+     * Sets the designated parameter to a InputStream object.
+     * The {@code Inputstream} must contain  the number
      * of characters specified by length otherwise a SQLException will be
      * generated when the PreparedStatement is executed.
      * This method differs from the setBinaryStream (int, InputStream, int)
@@ -854,8 +855,8 @@ public interface PreparedStatement extends Statement {
      * @throws SQLException if parameterIndex does not correspond to a parameter
      * marker in the SQL statement; if a database access error occurs;
      * this method is called on a closed PreparedStatement;
-     *  if the length specified
-     * is less than zero or if the number of bytes in the inputstream does not match
+     * if the length specified
+     * is less than zero or if the number of bytes in the {@code InputStream} does not match
      * the specified length.
      * @throws SQLFeatureNotSupportedException  if the JDBC driver does not support this method
      *
diff --git a/jdk/src/share/classes/java/sql/PseudoColumnUsage.java b/jdk/src/java.sql/share/classes/java/sql/PseudoColumnUsage.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/PseudoColumnUsage.java
rename to jdk/src/java.sql/share/classes/java/sql/PseudoColumnUsage.java
diff --git a/jdk/src/share/classes/java/sql/Ref.java b/jdk/src/java.sql/share/classes/java/sql/Ref.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/Ref.java
rename to jdk/src/java.sql/share/classes/java/sql/Ref.java
diff --git a/jdk/src/share/classes/java/sql/ResultSet.java b/jdk/src/java.sql/share/classes/java/sql/ResultSet.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/ResultSet.java
rename to jdk/src/java.sql/share/classes/java/sql/ResultSet.java
diff --git a/jdk/src/share/classes/java/sql/ResultSetMetaData.java b/jdk/src/java.sql/share/classes/java/sql/ResultSetMetaData.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/ResultSetMetaData.java
rename to jdk/src/java.sql/share/classes/java/sql/ResultSetMetaData.java
diff --git a/jdk/src/share/classes/java/sql/RowId.java b/jdk/src/java.sql/share/classes/java/sql/RowId.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/RowId.java
rename to jdk/src/java.sql/share/classes/java/sql/RowId.java
diff --git a/jdk/src/share/classes/java/sql/RowIdLifetime.java b/jdk/src/java.sql/share/classes/java/sql/RowIdLifetime.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/RowIdLifetime.java
rename to jdk/src/java.sql/share/classes/java/sql/RowIdLifetime.java
diff --git a/jdk/src/share/classes/java/sql/SQLClientInfoException.java b/jdk/src/java.sql/share/classes/java/sql/SQLClientInfoException.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/SQLClientInfoException.java
rename to jdk/src/java.sql/share/classes/java/sql/SQLClientInfoException.java
diff --git a/jdk/src/share/classes/java/sql/SQLData.java b/jdk/src/java.sql/share/classes/java/sql/SQLData.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/SQLData.java
rename to jdk/src/java.sql/share/classes/java/sql/SQLData.java
diff --git a/jdk/src/share/classes/java/sql/SQLDataException.java b/jdk/src/java.sql/share/classes/java/sql/SQLDataException.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/SQLDataException.java
rename to jdk/src/java.sql/share/classes/java/sql/SQLDataException.java
diff --git a/jdk/src/share/classes/java/sql/SQLException.java b/jdk/src/java.sql/share/classes/java/sql/SQLException.java
similarity index 99%
rename from jdk/src/share/classes/java/sql/SQLException.java
rename to jdk/src/java.sql/share/classes/java/sql/SQLException.java
index 0076679fdb1..95276a0d091 100644
--- a/jdk/src/share/classes/java/sql/SQLException.java
+++ b/jdk/src/java.sql/share/classes/java/sql/SQLException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,7 @@ import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
  * 
        Each SQLException provides several kinds of information:
  * 
          
  *   
        •  a string describing the error.  This is used as the Java Exception
- *       message, available via the method getMesasge.
+ *       message, available via the method getMessage.
  *   
        •  a "SQLstate" string, which follows either the XOPEN SQLstate conventions
  *        or the SQL:2003 conventions.
  *       The values of the SQLState string are described in the appropriate spec.
diff --git a/jdk/src/share/classes/java/sql/SQLFeatureNotSupportedException.java b/jdk/src/java.sql/share/classes/java/sql/SQLFeatureNotSupportedException.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/SQLFeatureNotSupportedException.java
rename to jdk/src/java.sql/share/classes/java/sql/SQLFeatureNotSupportedException.java
diff --git a/jdk/src/share/classes/java/sql/SQLInput.java b/jdk/src/java.sql/share/classes/java/sql/SQLInput.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/SQLInput.java
rename to jdk/src/java.sql/share/classes/java/sql/SQLInput.java
diff --git a/jdk/src/share/classes/java/sql/SQLIntegrityConstraintViolationException.java b/jdk/src/java.sql/share/classes/java/sql/SQLIntegrityConstraintViolationException.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/SQLIntegrityConstraintViolationException.java
rename to jdk/src/java.sql/share/classes/java/sql/SQLIntegrityConstraintViolationException.java
diff --git a/jdk/src/share/classes/java/sql/SQLInvalidAuthorizationSpecException.java b/jdk/src/java.sql/share/classes/java/sql/SQLInvalidAuthorizationSpecException.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/SQLInvalidAuthorizationSpecException.java
rename to jdk/src/java.sql/share/classes/java/sql/SQLInvalidAuthorizationSpecException.java
diff --git a/jdk/src/share/classes/java/sql/SQLNonTransientConnectionException.java b/jdk/src/java.sql/share/classes/java/sql/SQLNonTransientConnectionException.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/SQLNonTransientConnectionException.java
rename to jdk/src/java.sql/share/classes/java/sql/SQLNonTransientConnectionException.java
diff --git a/jdk/src/share/classes/java/sql/SQLNonTransientException.java b/jdk/src/java.sql/share/classes/java/sql/SQLNonTransientException.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/SQLNonTransientException.java
rename to jdk/src/java.sql/share/classes/java/sql/SQLNonTransientException.java
diff --git a/jdk/src/share/classes/java/sql/SQLOutput.java b/jdk/src/java.sql/share/classes/java/sql/SQLOutput.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/SQLOutput.java
rename to jdk/src/java.sql/share/classes/java/sql/SQLOutput.java
diff --git a/jdk/src/share/classes/java/sql/SQLPermission.java b/jdk/src/java.sql/share/classes/java/sql/SQLPermission.java
similarity index 98%
rename from jdk/src/share/classes/java/sql/SQLPermission.java
rename to jdk/src/java.sql/share/classes/java/sql/SQLPermission.java
index 1224738a887..a6fb269d6f2 100644
--- a/jdk/src/share/classes/java/sql/SQLPermission.java
+++ b/jdk/src/java.sql/share/classes/java/sql/SQLPermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,7 @@ import java.security.*;
  * DriverManager.setLogStream (deprecated) method,
  * {@code SyncFactory.setJNDIContext} method,
  * {@code SyncFactory.setLogger} method,
- * {@code Connection.setNetworktimeout} method,
+ * {@code Connection.setNetworkTimeout} method,
  * or the Connection.abort method.
  * If there is no SQLPermission object, these methods
  * throw a java.lang.SecurityException as a runtime exception.
diff --git a/jdk/src/share/classes/java/sql/SQLRecoverableException.java b/jdk/src/java.sql/share/classes/java/sql/SQLRecoverableException.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/SQLRecoverableException.java
rename to jdk/src/java.sql/share/classes/java/sql/SQLRecoverableException.java
diff --git a/jdk/src/share/classes/java/sql/SQLSyntaxErrorException.java b/jdk/src/java.sql/share/classes/java/sql/SQLSyntaxErrorException.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/SQLSyntaxErrorException.java
rename to jdk/src/java.sql/share/classes/java/sql/SQLSyntaxErrorException.java
diff --git a/jdk/src/share/classes/java/sql/SQLTimeoutException.java b/jdk/src/java.sql/share/classes/java/sql/SQLTimeoutException.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/SQLTimeoutException.java
rename to jdk/src/java.sql/share/classes/java/sql/SQLTimeoutException.java
diff --git a/jdk/src/share/classes/java/sql/SQLTransactionRollbackException.java b/jdk/src/java.sql/share/classes/java/sql/SQLTransactionRollbackException.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/SQLTransactionRollbackException.java
rename to jdk/src/java.sql/share/classes/java/sql/SQLTransactionRollbackException.java
diff --git a/jdk/src/share/classes/java/sql/SQLTransientConnectionException.java b/jdk/src/java.sql/share/classes/java/sql/SQLTransientConnectionException.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/SQLTransientConnectionException.java
rename to jdk/src/java.sql/share/classes/java/sql/SQLTransientConnectionException.java
diff --git a/jdk/src/share/classes/java/sql/SQLTransientException.java b/jdk/src/java.sql/share/classes/java/sql/SQLTransientException.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/SQLTransientException.java
rename to jdk/src/java.sql/share/classes/java/sql/SQLTransientException.java
diff --git a/jdk/src/share/classes/java/sql/SQLType.java b/jdk/src/java.sql/share/classes/java/sql/SQLType.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/SQLType.java
rename to jdk/src/java.sql/share/classes/java/sql/SQLType.java
diff --git a/jdk/src/share/classes/java/sql/SQLWarning.java b/jdk/src/java.sql/share/classes/java/sql/SQLWarning.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/SQLWarning.java
rename to jdk/src/java.sql/share/classes/java/sql/SQLWarning.java
diff --git a/jdk/src/share/classes/java/sql/SQLXML.java b/jdk/src/java.sql/share/classes/java/sql/SQLXML.java
similarity index 97%
rename from jdk/src/share/classes/java/sql/SQLXML.java
rename to jdk/src/java.sql/share/classes/java/sql/SQLXML.java
index b7e55220271..680ab7df5a5 100644
--- a/jdk/src/share/classes/java/sql/SQLXML.java
+++ b/jdk/src/java.sql/share/classes/java/sql/SQLXML.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -174,7 +174,7 @@ import javax.xml.transform.Source;
  * reading APIs are called: getBinaryStream(), getCharacterStream(), getSource(), and getString().
  * Implementations may also change the state to not writable when this occurs.
  * 
          
- * The state moves from writable to not writeable once free() or any of the
+ * The state moves from writable to not writable once free() or any of the
  * writing APIs are called: setBinaryStream(), setCharacterStream(), setResult(), and setString().
  * Implementations may also change the state to not readable when this occurs.
  *
@@ -192,7 +192,7 @@ public interface SQLXML
 {
   /**
    * This method closes this object and releases the resources that it held.
-   * The SQL XML object becomes invalid and neither readable or writeable
+   * The SQL XML object becomes invalid and neither readable or writable
    * when this method is called.
    *
    * After free has been called, any attempt to invoke a
@@ -231,7 +231,7 @@ public interface SQLXML
    * The behavior of this method is the same as ResultSet.updateBinaryStream()
    * when the designated column of the ResultSet has a type java.sql.Types of SQLXML.
    * 
          
-   * The SQL XML object becomes not writeable when this method is called and
+   * The SQL XML object becomes not writable when this method is called and
    * may also become not readable depending on implementation.
    *
    * @return a stream to which data can be written.
@@ -277,7 +277,7 @@ public interface SQLXML
    * The behavior of this method is the same as ResultSet.updateCharacterStream()
    * when the designated column of the ResultSet has a type java.sql.Types of SQLXML.
    * 
          
-   * The SQL XML object becomes not writeable when this method is called and
+   * The SQL XML object becomes not writable when this method is called and
    * may also become not readable depending on implementation.
    *
    * @return a stream to which data can be written.
@@ -325,7 +325,7 @@ public interface SQLXML
    * The behavior of this method is the same as ResultSet.updateString()
    * when the designated column of the ResultSet has a type java.sql.Types of SQLXML.
    * 
          
-   * The SQL XML object becomes not writeable when this method is called and
+   * The SQL XML object becomes not writable when this method is called and
    * may also become not readable depending on implementation.
    *
    * @param value the XML value
@@ -387,7 +387,7 @@ public interface SQLXML
    * 
          
    * The systemID of the Result is implementation dependent.
    * 
          
-   * The SQL XML object becomes not writeable when this method is called and
+   * The SQL XML object becomes not writable when this method is called and
    * may also become not readable depending on implementation.
    * 
          
    * Note that SAX is a callback architecture and the returned
diff --git a/jdk/src/share/classes/java/sql/Savepoint.java b/jdk/src/java.sql/share/classes/java/sql/Savepoint.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/Savepoint.java
rename to jdk/src/java.sql/share/classes/java/sql/Savepoint.java
diff --git a/jdk/src/share/classes/java/sql/Statement.java b/jdk/src/java.sql/share/classes/java/sql/Statement.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/Statement.java
rename to jdk/src/java.sql/share/classes/java/sql/Statement.java
diff --git a/jdk/src/share/classes/java/sql/Struct.java b/jdk/src/java.sql/share/classes/java/sql/Struct.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/Struct.java
rename to jdk/src/java.sql/share/classes/java/sql/Struct.java
diff --git a/jdk/src/share/classes/java/sql/Time.java b/jdk/src/java.sql/share/classes/java/sql/Time.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/Time.java
rename to jdk/src/java.sql/share/classes/java/sql/Time.java
diff --git a/jdk/src/share/classes/java/sql/Timestamp.java b/jdk/src/java.sql/share/classes/java/sql/Timestamp.java
similarity index 99%
rename from jdk/src/share/classes/java/sql/Timestamp.java
rename to jdk/src/java.sql/share/classes/java/sql/Timestamp.java
index 71c5a3e80a5..06ca2648814 100644
--- a/jdk/src/share/classes/java/sql/Timestamp.java
+++ b/jdk/src/java.sql/share/classes/java/sql/Timestamp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -590,7 +590,7 @@ public class Timestamp extends java.util.Date {
      *  the provided instant
      * @exception NullPointerException if {@code instant} is null.
      * @exception IllegalArgumentException if the instant is too large to
-     *  represent as a {@code Timesamp}
+     *  represent as a {@code Timestamp}
      * @since 1.8
      */
     public static Timestamp from(Instant instant) {
diff --git a/jdk/src/share/classes/java/sql/Types.java b/jdk/src/java.sql/share/classes/java/sql/Types.java
similarity index 98%
rename from jdk/src/share/classes/java/sql/Types.java
rename to jdk/src/java.sql/share/classes/java/sql/Types.java
index f12ff0dc1da..9f613ead14c 100644
--- a/jdk/src/share/classes/java/sql/Types.java
+++ b/jdk/src/java.sql/share/classes/java/sql/Types.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -243,7 +243,7 @@ public class Types {
         public final static int REF                 = 2006;
 
     /**
-     * The constant in the Java programming language, somtimes referred to
+     * The constant in the Java programming language, sometimes referred to
      * as a type code, that identifies the generic SQL type DATALINK.
      *
      * @since 1.4
@@ -251,7 +251,7 @@ public class Types {
     public final static int DATALINK = 70;
 
     /**
-     * The constant in the Java programming language, somtimes referred to
+     * The constant in the Java programming language, sometimes referred to
      * as a type code, that identifies the generic SQL type BOOLEAN.
      *
      * @since 1.4
diff --git a/jdk/src/share/classes/java/sql/Wrapper.java b/jdk/src/java.sql/share/classes/java/sql/Wrapper.java
similarity index 100%
rename from jdk/src/share/classes/java/sql/Wrapper.java
rename to jdk/src/java.sql/share/classes/java/sql/Wrapper.java
diff --git a/jdk/src/share/classes/java/sql/package.html b/jdk/src/java.sql/share/classes/java/sql/package.html
similarity index 100%
rename from jdk/src/share/classes/java/sql/package.html
rename to jdk/src/java.sql/share/classes/java/sql/package.html
diff --git a/jdk/src/share/classes/javax/sql/CommonDataSource.java b/jdk/src/java.sql/share/classes/javax/sql/CommonDataSource.java
similarity index 100%
rename from jdk/src/share/classes/javax/sql/CommonDataSource.java
rename to jdk/src/java.sql/share/classes/javax/sql/CommonDataSource.java
diff --git a/jdk/src/share/classes/javax/sql/ConnectionEvent.java b/jdk/src/java.sql/share/classes/javax/sql/ConnectionEvent.java
similarity index 100%
rename from jdk/src/share/classes/javax/sql/ConnectionEvent.java
rename to jdk/src/java.sql/share/classes/javax/sql/ConnectionEvent.java
diff --git a/jdk/src/share/classes/javax/sql/ConnectionEventListener.java b/jdk/src/java.sql/share/classes/javax/sql/ConnectionEventListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/sql/ConnectionEventListener.java
rename to jdk/src/java.sql/share/classes/javax/sql/ConnectionEventListener.java
diff --git a/jdk/src/share/classes/javax/sql/ConnectionPoolDataSource.java b/jdk/src/java.sql/share/classes/javax/sql/ConnectionPoolDataSource.java
similarity index 100%
rename from jdk/src/share/classes/javax/sql/ConnectionPoolDataSource.java
rename to jdk/src/java.sql/share/classes/javax/sql/ConnectionPoolDataSource.java
diff --git a/jdk/src/share/classes/javax/sql/DataSource.java b/jdk/src/java.sql/share/classes/javax/sql/DataSource.java
similarity index 100%
rename from jdk/src/share/classes/javax/sql/DataSource.java
rename to jdk/src/java.sql/share/classes/javax/sql/DataSource.java
diff --git a/jdk/src/share/classes/javax/sql/PooledConnection.java b/jdk/src/java.sql/share/classes/javax/sql/PooledConnection.java
similarity index 100%
rename from jdk/src/share/classes/javax/sql/PooledConnection.java
rename to jdk/src/java.sql/share/classes/javax/sql/PooledConnection.java
diff --git a/jdk/src/share/classes/javax/sql/RowSet.java b/jdk/src/java.sql/share/classes/javax/sql/RowSet.java
similarity index 97%
rename from jdk/src/share/classes/javax/sql/RowSet.java
rename to jdk/src/java.sql/share/classes/javax/sql/RowSet.java
index 2f7b0abc2e6..264e6e3bff1 100644
--- a/jdk/src/share/classes/javax/sql/RowSet.java
+++ b/jdk/src/java.sql/share/classes/javax/sql/RowSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -66,9 +66,9 @@ import java.util.*;
  * changes to its data while it is disconnected and then send the changes back
  * to the original source of the data, but it must reestablish a connection to do so.
  * 
          
- * A disconnected rowset may have a reader (a RowSetReader object)
+ * A disconnected rowset may have a {@code Reader} (a RowSetReader object)
  * and a writer (a RowSetWriter object) associated with it.
- * The reader may be implemented in many different ways to populate a rowset
+ * The {@code Reader} may be implemented in many different ways to populate a rowset
  * with data, including getting data from a non-relational data source. The
  * writer can also be implemented in many different ways to propagate changes
  * made to the rowset's data back to the underlying data source.
@@ -727,7 +727,7 @@ public interface RowSet extends ResultSet {
 
   /**
    * Sets the designated parameter in this RowSet object's command
-   * to the given java.math.BigDeciaml value.
+   * to the given {@code java.math.BigDecimal} value.
    * The driver converts this to
    * an SQL NUMERIC value before sending it to the database.
    *
@@ -974,7 +974,7 @@ public interface RowSet extends ResultSet {
    * standard interface.
    *
    * @param parameterIndex the first parameter is 1, the second is 2, ...
-   * @param reader the Reader object that contains the UNICODE data
+   * @param reader the {@code Reader} object that contains the UNICODE data
    *        to be set
    * @param length the number of characters in the stream
    * @exception SQLException if a database access error occurs
@@ -984,7 +984,7 @@ public interface RowSet extends ResultSet {
                           int length) throws SQLException;
 
   /**
-     * Sets the designated parameter to the given Reader
+     * Sets the designated parameter to the given {@code Reader}
      * object, which is the given number of characters long.
      * When a very large UNICODE value is input to a LONGVARCHAR
      * parameter, it may be more practical to send it via a
@@ -1112,7 +1112,7 @@ public interface RowSet extends ResultSet {
 
   /**
    * Sets the designated parameter in this RowSet object's command
-   * to the given Reader
+   * to the given {@code Reader}
    * object.
    * When a very large UNICODE value is input to a LONGVARCHAR
    * parameter, it may be more practical to send it via a
@@ -1139,7 +1139,7 @@ public interface RowSet extends ResultSet {
                           java.io.Reader reader) throws SQLException;
 
   /**
-     * Sets the designated parameter to the given Reader
+     * Sets the designated parameter to the given {@code Reader}
      * object.
      * When a very large UNICODE value is input to a LONGVARCHAR
      * parameter, it may be more practical to send it via a
@@ -1167,8 +1167,8 @@ public interface RowSet extends ResultSet {
 
   /**
    * Sets the designated parameter in this RowSet object's command
-   * to a Reader object. The
-   * Reader reads the data till end-of-file is reached. The
+   * to a {@code Reader} object. The
+   * {@code Reader} reads the data till end-of-file is reached. The
    * driver does the necessary conversion from Java character format to
    * the national character set in the database.
 
@@ -1200,7 +1200,8 @@ public interface RowSet extends ResultSet {
    *
    * If the second argument is an InputStream then the stream must contain
    * the number of bytes specified by scaleOrLength.  If the second argument is a
-   * Reader then the reader must contain the number of characters specified    * by scaleOrLength. If these conditions are not true the driver will generate a
+   * {@code Reader} then the {@code Reader} must contain the number of characters specified
+   * by scaleOrLength. If these conditions are not true the driver will generate a
    * SQLException when the prepared statement is executed.
    *
    * 
          The given Java object will be converted to the targetSqlType
@@ -1216,7 +1217,7 @@ public interface RowSet extends ResultSet {
    * value of the corresponding SQL type.
    *
    *
-   * 
          Note that this method may be used to pass datatabase-specific
+   * 
          Note that this method may be used to pass database-specific
    * abstract data types.
    *
    * @param parameterIndex the first parameter is 1, the second is 2, ...
@@ -1227,9 +1228,9 @@ public interface RowSet extends ResultSet {
    * @param scaleOrLength for java.sql.Types.DECIMAL
    *          or java.sql.Types.NUMERIC types,
    *          this is the number of digits after the decimal point. For
-   *          Java Object types InputStream and Reader,
+   *          Java Object types InputStream and {@code Reader},
    *          this is the length
-   *          of the data in the stream or reader.  For all other types,
+   *          of the data in the stream or {@code Reader}.  For all other types,
    *          this value will be ignored.
    * @exception SQLException if a database access error occurs
    * @see java.sql.Types
@@ -1255,7 +1256,7 @@ public interface RowSet extends ResultSet {
      * or Array, the driver should pass it to the database as a
      * value of the corresponding SQL type.
      * 
          
-     * Note that this method may be used to pass datatabase-
+     * Note that this method may be used to pass database-
      * specific abstract data types.
      *
      * @param parameterName the name of the parameter
@@ -1335,7 +1336,7 @@ public interface RowSet extends ResultSet {
      * will be converted to the corresponding SQL type before being
      * sent to the database.
      *
-     * 
          Note that this method may be used to pass datatabase-
+     * 
          Note that this method may be used to pass database-
      * specific abstract data types, by using a driver-specific Java
      * type.
      *
@@ -1373,7 +1374,7 @@ public interface RowSet extends ResultSet {
    * given Java object to its standard SQL mapping before sending it
    * to the database.
    *
-   * 
          Note that this method may be used to pass datatabase-specific
+   * 
          Note that this method may be used to pass database-specific
    * abstract data types by using a driver-specific Java type.
    *
    * If the object is of a class implementing SQLData,
@@ -1420,7 +1421,8 @@ public interface RowSet extends ResultSet {
   void setBlob (int i, Blob x) throws SQLException;
 
   /**
-     * Sets the designated parameter to a InputStream object.  The inputstream must contain  the number
+     * Sets the designated parameter to a InputStream object.
+     * The InputStream must contain  the number
      * of characters specified by length otherwise a SQLException will be
      * generated when the PreparedStatement is executed.
      * This method differs from the setBinaryStream (int, InputStream, int)
@@ -1437,7 +1439,7 @@ public interface RowSet extends ResultSet {
      * this method is called on a closed PreparedStatement,
      * if parameterIndex does not correspond
      * to a parameter marker in the SQL statement,  if the length specified
-     * is less than zero or if the number of bytes in the inputstream does not match
+     * is less than zero or if the number of bytes in the InputStream does not match
      * the specified length.
      * @throws SQLFeatureNotSupportedException  if the JDBC driver does not support this method
      *
@@ -1474,7 +1476,8 @@ public interface RowSet extends ResultSet {
         throws SQLException;
 
   /**
-     * Sets the designated parameter to a InputStream object.  The inputstream must contain  the number
+     * Sets the designated parameter to a InputStream object.
+     * The "{@code InputStream} must contain  the number
      * of characters specified by length, otherwise a SQLException will be
      * generated when the CallableStatement is executed.
      * This method differs from the setBinaryStream (int, InputStream, int)
@@ -1491,7 +1494,7 @@ public interface RowSet extends ResultSet {
      * @param length the number of bytes in the parameter data.
      * @throws SQLException  if parameterIndex does not correspond
      * to a parameter marker in the SQL statement,  or if the length specified
-     * is less than zero; if the number of bytes in the inputstream does not match
+     * is less than zero; if the number of bytes in the InputStream does not match
      * the specified length; if a database access error occurs or
      * this method is called on a closed CallableStatement
      * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
@@ -1554,7 +1557,8 @@ public interface RowSet extends ResultSet {
   void setClob (int i, Clob x) throws SQLException;
 
   /**
-     * Sets the designated parameter to a Reader object.  The reader must contain  the number
+     * Sets the designated parameter to a {@code Reader} object.
+     * The {@code Reader} must contain  the number
      * of characters specified by length otherwise a SQLException will be
      * generated when the PreparedStatement is executed.
      *This method differs from the setCharacterStream (int, Reader, int) method
@@ -1576,7 +1580,7 @@ public interface RowSet extends ResultSet {
        throws SQLException;
 
   /**
-     * Sets the designated parameter to a Reader object.
+     * Sets the designated parameter to a {@code Reader} object.
      * This method differs from the setCharacterStream (int, Reader) method
      * because it informs the driver that the parameter value should be sent to
      * the server as a CLOB.  When the setCharacterStream method is used, the
@@ -1600,7 +1604,8 @@ public interface RowSet extends ResultSet {
        throws SQLException;
 
   /**
-     * Sets the designated parameter to a Reader object.  The reader must contain  the number
+     * Sets the designated parameter to a {@code Reader} object.  The
+     * {@code Reader} must contain  the number
      * of characters specified by length otherwise a SQLException will be
      * generated when the CallableStatement is executed.
      * This method differs from the setCharacterStream (int, Reader, int) method
@@ -1639,7 +1644,7 @@ public interface RowSet extends ResultSet {
     void setClob (String parameterName, Clob x) throws SQLException;
 
   /**
-     * Sets the designated parameter to a Reader object.
+     * Sets the designated parameter to a {@code Reader} object.
      * This method differs from the setCharacterStream (int, Reader) method
      * because it informs the driver that the parameter value should be sent to
      * the server as a CLOB.  When the setCharacterStream method is used, the
@@ -1859,10 +1864,10 @@ public interface RowSet extends ResultSet {
    * outstanding updates, they are ignored.
    * 
          
    * If this RowSet object does not maintain a continuous connection
-   * with its source of data, it may use a reader (a RowSetReader
-   * object) to fill itself with data.  In this case, a reader will have been
+   * with its source of data, it may use a {@code Reader} (a RowSetReader
+   * object) to fill itself with data.  In this case, a {@code Reader} will have been
    * registered with this RowSet object, and the method
-   * execute will call on the reader's readData
+   * execute will call on the {@code Reader}'s readData
    * method as part of its implementation.
    *
    * @exception SQLException if a database access error occurs or any of the
@@ -1987,8 +1992,8 @@ public interface RowSet extends ResultSet {
             throws SQLException;
 
     /**
-     * Sets the designated parameter to a Reader object. The
-     * Reader reads the data till end-of-file is reached. The
+     * Sets the designated parameter to a {@code Reader} object. The
+     * {@code Reader} reads the data till end-of-file is reached. The
      * driver does the necessary conversion from Java character format to
      * the national character set in the database.
      * @param parameterIndex of the first parameter is 1, the second is 2, ...
@@ -2002,8 +2007,8 @@ public interface RowSet extends ResultSet {
      void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException;
 
     /**
-     * Sets the designated parameter to a Reader object. The
-     * Reader reads the data till end-of-file is reached. The
+     * Sets the designated parameter to a {@code Reader} object. The
+     * {@code Reader} reads the data till end-of-file is reached. The
      * driver does the necessary conversion from Java character format to
      * the national character set in the database.
      * @param parameterName the name of the column to be set
@@ -2018,8 +2023,8 @@ public interface RowSet extends ResultSet {
             throws SQLException;
 
     /**
-     * Sets the designated parameter to a Reader object. The
-     * Reader reads the data till end-of-file is reached. The
+     * Sets the designated parameter to a {@code Reader} object. The
+     * {@code Reader} reads the data till end-of-file is reached. The
      * driver does the necessary conversion from Java character format to
      * the national character set in the database.
 
@@ -2055,7 +2060,8 @@ public interface RowSet extends ResultSet {
     void setNClob(String parameterName, NClob value) throws SQLException;
 
     /**
-     * Sets the designated parameter to a Reader object.  The reader must contain  the number
+     * Sets the designated parameter to a {@code Reader} object.
+     * The {@code Reader} must contain  the number
      * of characters specified by length otherwise a SQLException will be
      * generated when the CallableStatement is executed.
      * This method differs from the setCharacterStream (int, Reader, int) method
@@ -2081,7 +2087,7 @@ public interface RowSet extends ResultSet {
        throws SQLException;
 
     /**
-     * Sets the designated parameter to a Reader object.
+     * Sets the designated parameter to a {@code Reader} object.
      * This method differs from the setCharacterStream (int, Reader) method
      * because it informs the driver that the parameter value should be sent to
      * the server as a NCLOB.  When the setCharacterStream method is used, the
@@ -2105,7 +2111,8 @@ public interface RowSet extends ResultSet {
        throws SQLException;
 
     /**
-     * Sets the designated parameter to a Reader object.  The reader must contain  the number
+     * Sets the designated parameter to a {@code Reader} object.
+     * The {@code Reader} must contain  the number
      * of characters specified by length otherwise a SQLException will be
      * generated when the PreparedStatement is executed.
      * This method differs from the setCharacterStream (int, Reader, int) method
@@ -2142,7 +2149,7 @@ public interface RowSet extends ResultSet {
      void setNClob(int parameterIndex, NClob value) throws SQLException;
 
     /**
-     * Sets the designated parameter to a Reader object.
+     * Sets the designated parameter to a {@code Reader} object.
      * This method differs from the setCharacterStream (int, Reader) method
      * because it informs the driver that the parameter value should be sent to
      * the server as a NCLOB.  When the setCharacterStream method is used, the
diff --git a/jdk/src/share/classes/javax/sql/RowSetEvent.java b/jdk/src/java.sql/share/classes/javax/sql/RowSetEvent.java
similarity index 100%
rename from jdk/src/share/classes/javax/sql/RowSetEvent.java
rename to jdk/src/java.sql/share/classes/javax/sql/RowSetEvent.java
diff --git a/jdk/src/share/classes/javax/sql/RowSetInternal.java b/jdk/src/java.sql/share/classes/javax/sql/RowSetInternal.java
similarity index 100%
rename from jdk/src/share/classes/javax/sql/RowSetInternal.java
rename to jdk/src/java.sql/share/classes/javax/sql/RowSetInternal.java
diff --git a/jdk/src/share/classes/javax/sql/RowSetListener.java b/jdk/src/java.sql/share/classes/javax/sql/RowSetListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/sql/RowSetListener.java
rename to jdk/src/java.sql/share/classes/javax/sql/RowSetListener.java
diff --git a/jdk/src/share/classes/javax/sql/RowSetMetaData.java b/jdk/src/java.sql/share/classes/javax/sql/RowSetMetaData.java
similarity index 100%
rename from jdk/src/share/classes/javax/sql/RowSetMetaData.java
rename to jdk/src/java.sql/share/classes/javax/sql/RowSetMetaData.java
diff --git a/jdk/src/share/classes/javax/sql/RowSetReader.java b/jdk/src/java.sql/share/classes/javax/sql/RowSetReader.java
similarity index 100%
rename from jdk/src/share/classes/javax/sql/RowSetReader.java
rename to jdk/src/java.sql/share/classes/javax/sql/RowSetReader.java
diff --git a/jdk/src/share/classes/javax/sql/RowSetWriter.java b/jdk/src/java.sql/share/classes/javax/sql/RowSetWriter.java
similarity index 100%
rename from jdk/src/share/classes/javax/sql/RowSetWriter.java
rename to jdk/src/java.sql/share/classes/javax/sql/RowSetWriter.java
diff --git a/jdk/src/share/classes/javax/sql/StatementEvent.java b/jdk/src/java.sql/share/classes/javax/sql/StatementEvent.java
similarity index 100%
rename from jdk/src/share/classes/javax/sql/StatementEvent.java
rename to jdk/src/java.sql/share/classes/javax/sql/StatementEvent.java
diff --git a/jdk/src/share/classes/javax/sql/StatementEventListener.java b/jdk/src/java.sql/share/classes/javax/sql/StatementEventListener.java
similarity index 100%
rename from jdk/src/share/classes/javax/sql/StatementEventListener.java
rename to jdk/src/java.sql/share/classes/javax/sql/StatementEventListener.java
diff --git a/jdk/src/share/classes/javax/sql/XAConnection.java b/jdk/src/java.sql/share/classes/javax/sql/XAConnection.java
similarity index 100%
rename from jdk/src/share/classes/javax/sql/XAConnection.java
rename to jdk/src/java.sql/share/classes/javax/sql/XAConnection.java
diff --git a/jdk/src/share/classes/javax/sql/XADataSource.java b/jdk/src/java.sql/share/classes/javax/sql/XADataSource.java
similarity index 100%
rename from jdk/src/share/classes/javax/sql/XADataSource.java
rename to jdk/src/java.sql/share/classes/javax/sql/XADataSource.java
diff --git a/jdk/src/share/classes/javax/sql/package.html b/jdk/src/java.sql/share/classes/javax/sql/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/sql/package.html
rename to jdk/src/java.sql/share/classes/javax/sql/package.html
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/Init.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/Init.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/Init.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/Init.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/Algorithm.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/Algorithm.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/Algorithm.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/Algorithm.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/ClassLoaderUtils.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/ClassLoaderUtils.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/ClassLoaderUtils.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/ClassLoaderUtils.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/MessageDigestAlgorithm.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/MessageDigestAlgorithm.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/MessageDigestAlgorithm.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/MessageDigestAlgorithm.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithm.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithm.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithm.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithm.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithmSpi.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithmSpi.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithmSpi.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithmSpi.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/IntegrityHmac.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/IntegrityHmac.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/IntegrityHmac.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/IntegrityHmac.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureBaseRSA.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureBaseRSA.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureBaseRSA.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureBaseRSA.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureDSA.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureDSA.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureDSA.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureDSA.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureECDSA.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureECDSA.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureECDSA.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureECDSA.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/package.html b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/package.html
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/package.html
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/package.html b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/package.html
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/package.html
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizationException.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizationException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizationException.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizationException.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/Canonicalizer.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/Canonicalizer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/Canonicalizer.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/Canonicalizer.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizerSpi.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizerSpi.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizerSpi.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizerSpi.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/InvalidCanonicalizerException.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/InvalidCanonicalizerException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/InvalidCanonicalizerException.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/InvalidCanonicalizerException.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/AttrCompare.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/AttrCompare.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/AttrCompare.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/AttrCompare.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/C14nHelper.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/C14nHelper.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/C14nHelper.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/C14nHelper.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/package.html b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/package.html
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/package.html
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11_OmitComments.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11_OmitComments.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11_OmitComments.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11_OmitComments.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11_WithComments.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11_WithComments.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11_WithComments.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11_WithComments.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315Excl.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315Excl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315Excl.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315Excl.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315ExclOmitComments.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315ExclOmitComments.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315ExclOmitComments.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315ExclOmitComments.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315ExclWithComments.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315ExclWithComments.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315ExclWithComments.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315ExclWithComments.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315OmitComments.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315OmitComments.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315OmitComments.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315OmitComments.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315WithComments.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315WithComments.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315WithComments.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315WithComments.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerPhysical.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerPhysical.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerPhysical.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerPhysical.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/NameSpaceSymbTable.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/NameSpaceSymbTable.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/NameSpaceSymbTable.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/NameSpaceSymbTable.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/UtfHelpper.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/UtfHelpper.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/UtfHelpper.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/UtfHelpper.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/package.html b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/package.html
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/package.html
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/package.html b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/package.html
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/package.html
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/AbstractSerializer.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/AbstractSerializer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/AbstractSerializer.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/AbstractSerializer.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/AgreementMethod.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/AgreementMethod.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/AgreementMethod.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/AgreementMethod.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherData.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherData.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherData.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherData.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherReference.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherReference.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherReference.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherReference.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherValue.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherValue.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherValue.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherValue.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/DocumentSerializer.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/DocumentSerializer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/DocumentSerializer.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/DocumentSerializer.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedData.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedData.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedData.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedData.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedKey.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedKey.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedKey.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedKey.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedType.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedType.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedType.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedType.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionMethod.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionMethod.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionMethod.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionMethod.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperties.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperties.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperties.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperties.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperty.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperty.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperty.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperty.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/Reference.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/Reference.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/Reference.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/Reference.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/ReferenceList.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/ReferenceList.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/ReferenceList.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/ReferenceList.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/Serializer.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/Serializer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/Serializer.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/Serializer.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/Transforms.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/Transforms.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/Transforms.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/Transforms.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipher.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipher.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipher.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipher.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipherInput.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipherInput.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipherInput.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipherInput.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipherParameters.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipherParameters.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipherParameters.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipherParameters.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLEncryptionException.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLEncryptionException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLEncryptionException.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLEncryptionException.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/package.html b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/package.html
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/package.html
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/exceptions/AlgorithmAlreadyRegisteredException.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/exceptions/AlgorithmAlreadyRegisteredException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/exceptions/AlgorithmAlreadyRegisteredException.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/exceptions/AlgorithmAlreadyRegisteredException.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/exceptions/Base64DecodingException.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/exceptions/Base64DecodingException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/exceptions/Base64DecodingException.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/exceptions/Base64DecodingException.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/exceptions/XMLSecurityException.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/exceptions/XMLSecurityException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/exceptions/XMLSecurityException.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/exceptions/XMLSecurityException.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/exceptions/XMLSecurityRuntimeException.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/exceptions/XMLSecurityRuntimeException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/exceptions/XMLSecurityRuntimeException.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/exceptions/XMLSecurityRuntimeException.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/exceptions/package.html b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/exceptions/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/exceptions/package.html
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/exceptions/package.html
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/ContentHandlerAlreadyRegisteredException.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/ContentHandlerAlreadyRegisteredException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/ContentHandlerAlreadyRegisteredException.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/ContentHandlerAlreadyRegisteredException.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyInfo.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyInfo.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyInfo.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyInfo.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyUtils.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyUtils.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyUtils.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyUtils.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/DEREncodedKeyValue.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/DEREncodedKeyValue.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/DEREncodedKeyValue.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/DEREncodedKeyValue.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyInfoContent.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyInfoContent.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyInfoContent.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyInfoContent.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyInfoReference.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyInfoReference.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyInfoReference.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyInfoReference.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyName.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyName.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyName.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyName.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyValue.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyValue.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyValue.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyValue.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/MgmtData.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/MgmtData.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/MgmtData.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/MgmtData.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/PGPData.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/PGPData.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/PGPData.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/PGPData.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/RetrievalMethod.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/RetrievalMethod.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/RetrievalMethod.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/RetrievalMethod.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/SPKIData.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/SPKIData.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/SPKIData.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/SPKIData.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/X509Data.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/X509Data.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/X509Data.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/X509Data.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/DSAKeyValue.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/DSAKeyValue.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/DSAKeyValue.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/DSAKeyValue.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/KeyValueContent.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/KeyValueContent.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/KeyValueContent.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/KeyValueContent.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/RSAKeyValue.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/RSAKeyValue.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/RSAKeyValue.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/RSAKeyValue.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/package.html b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/package.html
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/package.html
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/package.html b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/package.html
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/package.html
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509CRL.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509CRL.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509CRL.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509CRL.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509Certificate.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509Certificate.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509Certificate.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509Certificate.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509DataContent.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509DataContent.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509DataContent.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509DataContent.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509Digest.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509Digest.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509Digest.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509Digest.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509IssuerSerial.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509IssuerSerial.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509IssuerSerial.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509IssuerSerial.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509SKI.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509SKI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509SKI.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509SKI.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509SubjectName.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509SubjectName.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509SubjectName.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509SubjectName.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/package.html b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/package.html
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/package.html
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/InvalidKeyResolverException.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/InvalidKeyResolverException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/InvalidKeyResolverException.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/InvalidKeyResolverException.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolver.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolver.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolver.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolver.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolverException.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolverException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolverException.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolverException.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolverSpi.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolverSpi.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolverSpi.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolverSpi.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/DEREncodedKeyValueResolver.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/DEREncodedKeyValueResolver.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/DEREncodedKeyValueResolver.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/DEREncodedKeyValueResolver.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/DSAKeyValueResolver.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/DSAKeyValueResolver.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/DSAKeyValueResolver.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/DSAKeyValueResolver.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/EncryptedKeyResolver.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/EncryptedKeyResolver.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/EncryptedKeyResolver.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/EncryptedKeyResolver.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/PrivateKeyResolver.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/PrivateKeyResolver.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/PrivateKeyResolver.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/PrivateKeyResolver.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RSAKeyValueResolver.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RSAKeyValueResolver.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RSAKeyValueResolver.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RSAKeyValueResolver.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RetrievalMethodResolver.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/SecretKeyResolver.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/SecretKeyResolver.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/SecretKeyResolver.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/SecretKeyResolver.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/SingleKeyResolver.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/SingleKeyResolver.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/SingleKeyResolver.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/SingleKeyResolver.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509CertificateResolver.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509CertificateResolver.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509CertificateResolver.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509CertificateResolver.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509DigestResolver.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509DigestResolver.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509DigestResolver.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509DigestResolver.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509SKIResolver.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509SKIResolver.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509SKIResolver.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509SKIResolver.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509SubjectNameResolver.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509SubjectNameResolver.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509SubjectNameResolver.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509SubjectNameResolver.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/package.html b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/package.html
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/package.html
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/package.html b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/package.html
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/package.html
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/package.html b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/package.html
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/package.html
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolver.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolver.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolver.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolver.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverException.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverException.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverException.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverSpi.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverSpi.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverSpi.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverSpi.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/KeyStoreResolver.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/KeyStoreResolver.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/KeyStoreResolver.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/KeyStoreResolver.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/SingleCertificateResolver.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/SingleCertificateResolver.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/SingleCertificateResolver.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/SingleCertificateResolver.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/package.html b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/package.html
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/package.html
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/package.html b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/package.html
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/package.html
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/package.html b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/package.html
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/package.html
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/config.dtd b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/config.dtd
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/config.dtd
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/config.dtd
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/config.xml b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/config.xml
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/config.xml
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/config.xml
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/package.html b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/package.html
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/package.html
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_de.properties b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_de.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_de.properties
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_de.properties
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/InvalidDigestValueException.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/InvalidDigestValueException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/InvalidDigestValueException.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/InvalidDigestValueException.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/InvalidSignatureValueException.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/InvalidSignatureValueException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/InvalidSignatureValueException.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/InvalidSignatureValueException.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Manifest.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/Manifest.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Manifest.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/Manifest.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/MissingResourceFailureException.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/MissingResourceFailureException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/MissingResourceFailureException.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/MissingResourceFailureException.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/NodeFilter.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/NodeFilter.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/NodeFilter.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/NodeFilter.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/ObjectContainer.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/ObjectContainer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/ObjectContainer.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/ObjectContainer.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Reference.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/Reference.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Reference.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/Reference.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/ReferenceNotInitializedException.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/ReferenceNotInitializedException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/ReferenceNotInitializedException.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/ReferenceNotInitializedException.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperties.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperties.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperties.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperties.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperty.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperty.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperty.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperty.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignedInfo.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/SignedInfo.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignedInfo.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/SignedInfo.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignature.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignature.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignature.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignature.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureException.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureException.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureException.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInput.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInput.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInput.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInput.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInputDebugger.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInputDebugger.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInputDebugger.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInputDebugger.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/package.html b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/package.html
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/package.html
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceData.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceData.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceData.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceData.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceNodeSetData.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceNodeSetData.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceNodeSetData.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceNodeSetData.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceOctetStreamData.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceOctetStreamData.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceOctetStreamData.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceOctetStreamData.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceSubTreeData.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceSubTreeData.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceSubTreeData.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceSubTreeData.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderUtils.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderUtils.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderUtils.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderUtils.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/InvalidTransformException.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/InvalidTransformException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/InvalidTransformException.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/InvalidTransformException.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transform.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transform.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transform.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transform.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformParam.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformParam.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformParam.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformParam.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformSpi.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformSpi.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformSpi.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformSpi.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformationException.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformationException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformationException.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformationException.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transforms.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transforms.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transforms.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transforms.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/FuncHere.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/FuncHere.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/FuncHere.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/FuncHere.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformBase64Decode.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformBase64Decode.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformBase64Decode.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformBase64Decode.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N11.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N11.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N11.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N11.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N11_WithComments.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N11_WithComments.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N11_WithComments.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N11_WithComments.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NExclusive.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NExclusive.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NExclusive.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NExclusive.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NExclusiveWithComments.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NExclusiveWithComments.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NExclusiveWithComments.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NExclusiveWithComments.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NWithComments.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NWithComments.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NWithComments.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NWithComments.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformEnvelopedSignature.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformEnvelopedSignature.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformEnvelopedSignature.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformEnvelopedSignature.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath2Filter.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath2Filter.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath2Filter.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath2Filter.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPointer.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPointer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPointer.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPointer.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXSLT.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXSLT.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXSLT.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXSLT.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/package.html b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/package.html
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/package.html
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/package.html b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/package.html
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/package.html
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPath2FilterContainer.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPath2FilterContainer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPath2FilterContainer.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPath2FilterContainer.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPath2FilterContainer04.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPath2FilterContainer04.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPath2FilterContainer04.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPath2FilterContainer04.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPathContainer.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPathContainer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPathContainer.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPathContainer.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPathFilterCHGPContainer.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPathFilterCHGPContainer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPathFilterCHGPContainer.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPathFilterCHGPContainer.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/Base64.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/Base64.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/Base64.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/Base64.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ClassLoaderUtils.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/ClassLoaderUtils.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ClassLoaderUtils.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/ClassLoaderUtils.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/Constants.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/Constants.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/Constants.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/Constants.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/DOMNamespaceContext.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/DOMNamespaceContext.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/DOMNamespaceContext.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/DOMNamespaceContext.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/DigesterOutputStream.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/DigesterOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/DigesterOutputStream.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/DigesterOutputStream.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementChecker.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementChecker.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementChecker.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementChecker.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementCheckerImpl.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementCheckerImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementCheckerImpl.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementCheckerImpl.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementProxy.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementProxy.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementProxy.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementProxy.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/EncryptionConstants.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/EncryptionConstants.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/EncryptionConstants.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/EncryptionConstants.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/EncryptionElementProxy.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/EncryptionElementProxy.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/EncryptionElementProxy.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/EncryptionElementProxy.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/HelperNodeList.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/HelperNodeList.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/HelperNodeList.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/HelperNodeList.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/I18n.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/I18n.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/I18n.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/I18n.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/IgnoreAllErrorHandler.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/IgnoreAllErrorHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/IgnoreAllErrorHandler.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/IgnoreAllErrorHandler.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/JDKXPathAPI.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/JDKXPathAPI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/JDKXPathAPI.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/JDKXPathAPI.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/JDKXPathFactory.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/JDKXPathFactory.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/JDKXPathFactory.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/JDKXPathFactory.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/JavaUtils.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/JavaUtils.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/JavaUtils.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/JavaUtils.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/Signature11ElementProxy.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/Signature11ElementProxy.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/Signature11ElementProxy.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/Signature11ElementProxy.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/SignatureElementProxy.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/SignatureElementProxy.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/SignatureElementProxy.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/SignatureElementProxy.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/SignerOutputStream.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/SignerOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/SignerOutputStream.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/SignerOutputStream.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncBufferedOutputStream.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncBufferedOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncBufferedOutputStream.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncBufferedOutputStream.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/XMLUtils.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/XMLUtils.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/XMLUtils.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/XMLUtils.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/XPathAPI.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/XPathAPI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/XPathAPI.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/XPathAPI.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/XPathFactory.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/XPathFactory.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/XPathFactory.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/XPathFactory.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/XalanXPathAPI.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/XalanXPathAPI.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/XalanXPathAPI.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/XalanXPathAPI.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/XalanXPathFactory.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/XalanXPathFactory.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/XalanXPathFactory.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/XalanXPathFactory.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/package.html b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/package.html
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/package.html
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolver.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolver.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolver.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolver.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverContext.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverContext.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverContext.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverContext.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverException.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverException.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverException.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverSpi.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverSpi.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverSpi.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverSpi.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverAnonymous.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverAnonymous.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverAnonymous.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverAnonymous.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverDirectHTTP.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverDirectHTTP.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverDirectHTTP.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverDirectHTTP.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverFragment.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverFragment.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverFragment.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverFragment.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverLocalFilesystem.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverLocalFilesystem.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverLocalFilesystem.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverLocalFilesystem.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverXPointer.java b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverXPointer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverXPointer.java
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverXPointer.java
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/package.html b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/package.html
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/package.html
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/package.html b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/package.html
rename to jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/package.html
diff --git a/jdk/src/share/classes/javax/xml/crypto/AlgorithmMethod.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/AlgorithmMethod.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/AlgorithmMethod.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/AlgorithmMethod.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/Data.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/Data.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/Data.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/Data.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/KeySelector.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/KeySelector.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/KeySelector.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/KeySelector.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/KeySelectorException.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/KeySelectorException.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/KeySelectorException.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/KeySelectorException.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/KeySelectorResult.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/KeySelectorResult.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/KeySelectorResult.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/KeySelectorResult.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/MarshalException.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/MarshalException.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/MarshalException.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/MarshalException.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/NoSuchMechanismException.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/NoSuchMechanismException.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/NoSuchMechanismException.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/NoSuchMechanismException.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/NodeSetData.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/NodeSetData.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/NodeSetData.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/NodeSetData.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/OctetStreamData.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/OctetStreamData.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/OctetStreamData.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/OctetStreamData.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/URIDereferencer.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/URIDereferencer.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/URIDereferencer.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/URIDereferencer.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/URIReference.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/URIReference.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/URIReference.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/URIReference.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/URIReferenceException.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/URIReferenceException.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/URIReferenceException.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/URIReferenceException.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/XMLCryptoContext.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/XMLCryptoContext.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/XMLCryptoContext.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/XMLCryptoContext.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/XMLStructure.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/XMLStructure.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/XMLStructure.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/XMLStructure.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dom/DOMCryptoContext.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dom/DOMCryptoContext.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dom/DOMCryptoContext.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dom/DOMCryptoContext.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dom/DOMStructure.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dom/DOMStructure.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dom/DOMStructure.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dom/DOMStructure.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dom/DOMURIReference.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dom/DOMURIReference.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dom/DOMURIReference.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dom/DOMURIReference.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dom/package.html b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dom/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dom/package.html
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dom/package.html
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/CanonicalizationMethod.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/CanonicalizationMethod.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/CanonicalizationMethod.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/CanonicalizationMethod.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/DigestMethod.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/DigestMethod.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/DigestMethod.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/DigestMethod.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/Manifest.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/Manifest.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/Manifest.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/Manifest.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/Reference.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/Reference.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/Reference.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/Reference.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/SignatureMethod.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/SignatureMethod.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/SignatureMethod.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/SignatureMethod.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/SignatureProperties.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/SignatureProperties.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/SignatureProperties.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/SignatureProperties.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/SignatureProperty.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/SignatureProperty.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/SignatureProperty.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/SignatureProperty.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/SignedInfo.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/SignedInfo.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/SignedInfo.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/SignedInfo.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/Transform.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/Transform.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/Transform.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/Transform.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/TransformException.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/TransformException.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/TransformException.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/TransformException.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/TransformService.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/TransformService.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/TransformService.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/TransformService.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/XMLObject.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLObject.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/XMLObject.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLObject.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/XMLSignContext.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLSignContext.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/XMLSignContext.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLSignContext.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/XMLSignature.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLSignature.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/XMLSignature.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLSignature.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/XMLSignatureException.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLSignatureException.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/XMLSignatureException.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLSignatureException.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/XMLSignatureFactory.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLSignatureFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/XMLSignatureFactory.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLSignatureFactory.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/XMLValidateContext.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLValidateContext.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/XMLValidateContext.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLValidateContext.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/dom/DOMSignContext.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/dom/DOMSignContext.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/dom/DOMSignContext.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/dom/DOMSignContext.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/dom/DOMValidateContext.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/dom/DOMValidateContext.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/dom/DOMValidateContext.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/dom/DOMValidateContext.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/dom/package.html b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/dom/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/dom/package.html
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/dom/package.html
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/keyinfo/KeyInfo.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/KeyInfo.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/keyinfo/KeyInfo.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/KeyInfo.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/keyinfo/KeyInfoFactory.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/KeyInfoFactory.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/keyinfo/KeyInfoFactory.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/KeyInfoFactory.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/keyinfo/KeyName.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/KeyName.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/keyinfo/KeyName.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/KeyName.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/keyinfo/KeyValue.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/KeyValue.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/keyinfo/KeyValue.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/KeyValue.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/keyinfo/PGPData.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/PGPData.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/keyinfo/PGPData.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/PGPData.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/keyinfo/RetrievalMethod.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/RetrievalMethod.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/keyinfo/RetrievalMethod.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/RetrievalMethod.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/keyinfo/X509Data.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/X509Data.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/keyinfo/X509Data.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/X509Data.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/keyinfo/X509IssuerSerial.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/X509IssuerSerial.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/keyinfo/X509IssuerSerial.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/X509IssuerSerial.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/keyinfo/package.html b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/keyinfo/package.html
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/package.html
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/package.html b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/package.html
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/package.html
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/spec/C14NMethodParameterSpec.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/C14NMethodParameterSpec.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/spec/C14NMethodParameterSpec.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/C14NMethodParameterSpec.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/spec/DigestMethodParameterSpec.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/DigestMethodParameterSpec.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/spec/DigestMethodParameterSpec.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/DigestMethodParameterSpec.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/spec/ExcC14NParameterSpec.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/ExcC14NParameterSpec.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/spec/ExcC14NParameterSpec.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/ExcC14NParameterSpec.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/spec/HMACParameterSpec.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/HMACParameterSpec.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/spec/HMACParameterSpec.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/HMACParameterSpec.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/spec/SignatureMethodParameterSpec.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/SignatureMethodParameterSpec.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/spec/SignatureMethodParameterSpec.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/SignatureMethodParameterSpec.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/spec/TransformParameterSpec.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/TransformParameterSpec.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/spec/TransformParameterSpec.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/TransformParameterSpec.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/spec/XPathFilter2ParameterSpec.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/XPathFilter2ParameterSpec.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/spec/XPathFilter2ParameterSpec.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/XPathFilter2ParameterSpec.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/spec/XPathFilterParameterSpec.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/XPathFilterParameterSpec.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/spec/XPathFilterParameterSpec.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/XPathFilterParameterSpec.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/spec/XPathType.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/XPathType.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/spec/XPathType.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/XPathType.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/spec/XSLTTransformParameterSpec.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/XSLTTransformParameterSpec.java
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/spec/XSLTTransformParameterSpec.java
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/XSLTTransformParameterSpec.java
diff --git a/jdk/src/share/classes/javax/xml/crypto/dsig/spec/package.html b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/dsig/spec/package.html
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/package.html
diff --git a/jdk/src/share/classes/javax/xml/crypto/package.html b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/package.html
similarity index 100%
rename from jdk/src/share/classes/javax/xml/crypto/package.html
rename to jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/package.html
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/DigesterOutputStream.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/DigesterOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/DigesterOutputStream.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/DigesterOutputStream.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/MacOutputStream.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/MacOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/MacOutputStream.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/MacOutputStream.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/SignerOutputStream.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/SignerOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/SignerOutputStream.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/SignerOutputStream.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/AbstractDOMSignatureMethod.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/AbstractDOMSignatureMethod.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/AbstractDOMSignatureMethod.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/AbstractDOMSignatureMethod.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheData.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheData.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheData.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheData.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheNodeSetData.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheNodeSetData.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheNodeSetData.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheNodeSetData.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheOctetStreamData.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheOctetStreamData.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheOctetStreamData.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheOctetStreamData.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheTransform.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheTransform.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheTransform.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheTransform.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMBase64Transform.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMBase64Transform.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMBase64Transform.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMBase64Transform.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14N11Method.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14N11Method.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14N11Method.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14N11Method.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14NMethod.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14NMethod.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14NMethod.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14NMethod.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCryptoBinary.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMCryptoBinary.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCryptoBinary.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMCryptoBinary.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMDigestMethod.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMDigestMethod.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMDigestMethod.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMDigestMethod.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMEnvelopedTransform.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMEnvelopedTransform.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMEnvelopedTransform.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMEnvelopedTransform.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfo.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfo.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfo.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfo.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyName.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyName.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyName.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyName.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyValue.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyValue.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyValue.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyValue.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMManifest.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMManifest.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMManifest.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMManifest.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMPGPData.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMPGPData.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMPGPData.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMPGPData.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignedInfo.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignedInfo.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignedInfo.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignedInfo.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMStructure.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMStructure.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMStructure.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMStructure.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSubTreeData.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSubTreeData.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSubTreeData.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSubTreeData.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMTransform.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMTransform.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMTransform.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMTransform.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMUtils.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMUtils.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMUtils.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMUtils.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509Data.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509Data.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509Data.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509Data.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLObject.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLObject.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLObject.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLObject.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathTransform.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathTransform.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathTransform.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathTransform.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/Utils.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/Utils.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/Utils.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/Utils.java
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java
similarity index 100%
rename from jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java
rename to jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java
diff --git a/jdk/src/aix/classes/sun/tools/attach/AixAttachProvider.java b/jdk/src/jdk.attach/aix/classes/sun/tools/attach/AixAttachProvider.java
similarity index 100%
rename from jdk/src/aix/classes/sun/tools/attach/AixAttachProvider.java
rename to jdk/src/jdk.attach/aix/classes/sun/tools/attach/AixAttachProvider.java
diff --git a/jdk/src/aix/classes/sun/tools/attach/AixVirtualMachine.java b/jdk/src/jdk.attach/aix/classes/sun/tools/attach/AixVirtualMachine.java
similarity index 100%
rename from jdk/src/aix/classes/sun/tools/attach/AixVirtualMachine.java
rename to jdk/src/jdk.attach/aix/classes/sun/tools/attach/AixVirtualMachine.java
diff --git a/jdk/src/aix/native/sun/tools/attach/AixVirtualMachine.c b/jdk/src/jdk.attach/aix/native/libattach/AixVirtualMachine.c
similarity index 100%
rename from jdk/src/aix/native/sun/tools/attach/AixVirtualMachine.c
rename to jdk/src/jdk.attach/aix/native/libattach/AixVirtualMachine.c
diff --git a/jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider b/jdk/src/jdk.attach/share/classes/META-INF/services/com.sun.tools.attach.spi.AttachProvider
similarity index 100%
rename from jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider
rename to jdk/src/jdk.attach/share/classes/META-INF/services/com.sun.tools.attach.spi.AttachProvider
diff --git a/jdk/src/share/classes/com/sun/tools/attach/AgentInitializationException.java b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AgentInitializationException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/attach/AgentInitializationException.java
rename to jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AgentInitializationException.java
diff --git a/jdk/src/share/classes/com/sun/tools/attach/AgentLoadException.java b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AgentLoadException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/attach/AgentLoadException.java
rename to jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AgentLoadException.java
diff --git a/jdk/src/share/classes/com/sun/tools/attach/AttachNotSupportedException.java b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AttachNotSupportedException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/attach/AttachNotSupportedException.java
rename to jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AttachNotSupportedException.java
diff --git a/jdk/src/share/classes/com/sun/tools/attach/AttachOperationFailedException.java b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AttachOperationFailedException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/attach/AttachOperationFailedException.java
rename to jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AttachOperationFailedException.java
diff --git a/jdk/src/share/classes/com/sun/tools/attach/AttachPermission.java b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AttachPermission.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/attach/AttachPermission.java
rename to jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AttachPermission.java
diff --git a/jdk/src/share/classes/com/sun/tools/attach/VirtualMachine.java b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachine.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/attach/VirtualMachine.java
rename to jdk/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachine.java
diff --git a/jdk/src/share/classes/com/sun/tools/attach/VirtualMachineDescriptor.java b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachineDescriptor.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/attach/VirtualMachineDescriptor.java
rename to jdk/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachineDescriptor.java
diff --git a/jdk/src/share/classes/com/sun/tools/attach/package-info.java b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/package-info.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/attach/package-info.java
rename to jdk/src/jdk.attach/share/classes/com/sun/tools/attach/package-info.java
diff --git a/jdk/src/share/classes/com/sun/tools/attach/spi/AttachProvider.java b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/spi/AttachProvider.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/attach/spi/AttachProvider.java
rename to jdk/src/jdk.attach/share/classes/com/sun/tools/attach/spi/AttachProvider.java
diff --git a/jdk/src/share/classes/com/sun/tools/attach/spi/package-info.java b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/spi/package-info.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/attach/spi/package-info.java
rename to jdk/src/jdk.attach/share/classes/com/sun/tools/attach/spi/package-info.java
diff --git a/jdk/src/share/classes/sun/tools/attach/HotSpotAttachProvider.java b/jdk/src/jdk.attach/share/classes/sun/tools/attach/HotSpotAttachProvider.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/attach/HotSpotAttachProvider.java
rename to jdk/src/jdk.attach/share/classes/sun/tools/attach/HotSpotAttachProvider.java
diff --git a/jdk/src/share/classes/sun/tools/attach/HotSpotVirtualMachine.java b/jdk/src/jdk.attach/share/classes/sun/tools/attach/HotSpotVirtualMachine.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/attach/HotSpotVirtualMachine.java
rename to jdk/src/jdk.attach/share/classes/sun/tools/attach/HotSpotVirtualMachine.java
diff --git a/jdk/src/solaris/classes/sun/tools/attach/BsdAttachProvider.java b/jdk/src/jdk.attach/unix/classes/sun/tools/attach/BsdAttachProvider.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/tools/attach/BsdAttachProvider.java
rename to jdk/src/jdk.attach/unix/classes/sun/tools/attach/BsdAttachProvider.java
diff --git a/jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java b/jdk/src/jdk.attach/unix/classes/sun/tools/attach/BsdVirtualMachine.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java
rename to jdk/src/jdk.attach/unix/classes/sun/tools/attach/BsdVirtualMachine.java
diff --git a/jdk/src/solaris/classes/sun/tools/attach/LinuxAttachProvider.java b/jdk/src/jdk.attach/unix/classes/sun/tools/attach/LinuxAttachProvider.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/tools/attach/LinuxAttachProvider.java
rename to jdk/src/jdk.attach/unix/classes/sun/tools/attach/LinuxAttachProvider.java
diff --git a/jdk/src/solaris/classes/sun/tools/attach/LinuxVirtualMachine.java b/jdk/src/jdk.attach/unix/classes/sun/tools/attach/LinuxVirtualMachine.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/tools/attach/LinuxVirtualMachine.java
rename to jdk/src/jdk.attach/unix/classes/sun/tools/attach/LinuxVirtualMachine.java
diff --git a/jdk/src/solaris/classes/sun/tools/attach/SolarisAttachProvider.java b/jdk/src/jdk.attach/unix/classes/sun/tools/attach/SolarisAttachProvider.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/tools/attach/SolarisAttachProvider.java
rename to jdk/src/jdk.attach/unix/classes/sun/tools/attach/SolarisAttachProvider.java
diff --git a/jdk/src/solaris/classes/sun/tools/attach/SolarisVirtualMachine.java b/jdk/src/jdk.attach/unix/classes/sun/tools/attach/SolarisVirtualMachine.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/tools/attach/SolarisVirtualMachine.java
rename to jdk/src/jdk.attach/unix/classes/sun/tools/attach/SolarisVirtualMachine.java
diff --git a/jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c b/jdk/src/jdk.attach/unix/native/libattach/BsdVirtualMachine.c
similarity index 100%
rename from jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c
rename to jdk/src/jdk.attach/unix/native/libattach/BsdVirtualMachine.c
diff --git a/jdk/src/solaris/native/sun/tools/attach/LinuxVirtualMachine.c b/jdk/src/jdk.attach/unix/native/libattach/LinuxVirtualMachine.c
similarity index 100%
rename from jdk/src/solaris/native/sun/tools/attach/LinuxVirtualMachine.c
rename to jdk/src/jdk.attach/unix/native/libattach/LinuxVirtualMachine.c
diff --git a/jdk/src/solaris/native/sun/tools/attach/SolarisVirtualMachine.c b/jdk/src/jdk.attach/unix/native/libattach/SolarisVirtualMachine.c
similarity index 100%
rename from jdk/src/solaris/native/sun/tools/attach/SolarisVirtualMachine.c
rename to jdk/src/jdk.attach/unix/native/libattach/SolarisVirtualMachine.c
diff --git a/jdk/src/windows/classes/sun/tools/attach/WindowsAttachProvider.java b/jdk/src/jdk.attach/windows/classes/sun/tools/attach/WindowsAttachProvider.java
similarity index 100%
rename from jdk/src/windows/classes/sun/tools/attach/WindowsAttachProvider.java
rename to jdk/src/jdk.attach/windows/classes/sun/tools/attach/WindowsAttachProvider.java
diff --git a/jdk/src/windows/classes/sun/tools/attach/WindowsVirtualMachine.java b/jdk/src/jdk.attach/windows/classes/sun/tools/attach/WindowsVirtualMachine.java
similarity index 100%
rename from jdk/src/windows/classes/sun/tools/attach/WindowsVirtualMachine.java
rename to jdk/src/jdk.attach/windows/classes/sun/tools/attach/WindowsVirtualMachine.java
diff --git a/jdk/src/windows/native/sun/tools/attach/WindowsAttachProvider.c b/jdk/src/jdk.attach/windows/native/libattach/WindowsAttachProvider.c
similarity index 100%
rename from jdk/src/windows/native/sun/tools/attach/WindowsAttachProvider.c
rename to jdk/src/jdk.attach/windows/native/libattach/WindowsAttachProvider.c
diff --git a/jdk/src/windows/native/sun/tools/attach/WindowsVirtualMachine.c b/jdk/src/jdk.attach/windows/native/libattach/WindowsVirtualMachine.c
similarity index 100%
rename from jdk/src/windows/native/sun/tools/attach/WindowsVirtualMachine.c
rename to jdk/src/jdk.attach/windows/native/libattach/WindowsVirtualMachine.c
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/Big5_HKSCS.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/Big5_HKSCS.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/Big5_HKSCS.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/Big5_HKSCS.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/Big5_HKSCS_2001.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/Big5_HKSCS_2001.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/Big5_HKSCS_2001.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/Big5_HKSCS_2001.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/Big5_Solaris.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/Big5_Solaris.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/Big5_Solaris.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/Big5_Solaris.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/DelegatableDecoder.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/DelegatableDecoder.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/DelegatableDecoder.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/DelegatableDecoder.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/DoubleByte.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/DoubleByte.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/DoubleByte.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/DoubleByte.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/DoubleByteEncoder.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/DoubleByteEncoder.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/DoubleByteEncoder.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/DoubleByteEncoder.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/EUC_JP.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_JP.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/EUC_JP.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_JP.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_LINUX.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_JP_LINUX.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_LINUX.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_JP_LINUX.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_Open.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_JP_Open.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_Open.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_JP_Open.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/EUC_TW.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_TW.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/EUC_TW.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_TW.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ExtendedCharsets.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ExtendedCharsets.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/GB18030.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/GB18030.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/GB18030.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/GB18030.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/HKSCS.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/HKSCS.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/HKSCS.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/HKSCS.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/IBM33722.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM33722.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/IBM33722.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM33722.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/IBM834.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM834.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/IBM834.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM834.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/IBM942C.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM942C.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/IBM942C.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM942C.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/IBM943C.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM943C.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/IBM943C.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM943C.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/IBM949C.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM949C.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/IBM949C.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM949C.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/IBM964.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM964.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/IBM964.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM964.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/ISCII91.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISCII91.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/ISCII91.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISCII91.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/ISO2022.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/ISO2022.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/ISO2022_CN.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_CN.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/ISO2022_CN.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_CN.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/ISO2022_CN_CNS.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_CN_CNS.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/ISO2022_CN_CNS.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_CN_CNS.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/ISO2022_CN_GB.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_CN_GB.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/ISO2022_CN_GB.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_CN_GB.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/ISO2022_JP.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_JP.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/ISO2022_JP.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_JP.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/ISO2022_JP_2.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_JP_2.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/ISO2022_JP_2.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_JP_2.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/ISO2022_KR.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_KR.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/ISO2022_KR.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_KR.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/JISAutoDetect.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/JISAutoDetect.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/JISAutoDetect.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/JISAutoDetect.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/MS50220.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/MS50220.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/MS50220.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/MS50220.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/MS50221.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/MS50221.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/MS50221.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/MS50221.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/MS932_0213.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/MS932_0213.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/MS932_0213.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/MS932_0213.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/MS950_HKSCS.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/MS950_HKSCS.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/MS950_HKSCS.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/MS950_HKSCS.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/MS950_HKSCS_XP.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/MS950_HKSCS_XP.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/MS950_HKSCS_XP.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/MS950_HKSCS_XP.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/MSISO2022JP.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/MSISO2022JP.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/MSISO2022JP.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/MSISO2022JP.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/SJIS_0213.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/SJIS_0213.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/SJIS_0213.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/SJIS_0213.java
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/SimpleEUCEncoder.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/SimpleEUCEncoder.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/cs/ext/SimpleEUCEncoder.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/SimpleEUCEncoder.java
diff --git a/jdk/src/solaris/classes/sun/nio/cs/ext/COMPOUND_TEXT.java b/jdk/src/jdk.charsets/unix/classes/sun/nio/cs/ext/COMPOUND_TEXT.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/cs/ext/COMPOUND_TEXT.java
rename to jdk/src/jdk.charsets/unix/classes/sun/nio/cs/ext/COMPOUND_TEXT.java
diff --git a/jdk/src/solaris/classes/sun/nio/cs/ext/COMPOUND_TEXT_Decoder.java b/jdk/src/jdk.charsets/unix/classes/sun/nio/cs/ext/COMPOUND_TEXT_Decoder.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/cs/ext/COMPOUND_TEXT_Decoder.java
rename to jdk/src/jdk.charsets/unix/classes/sun/nio/cs/ext/COMPOUND_TEXT_Decoder.java
diff --git a/jdk/src/solaris/classes/sun/nio/cs/ext/COMPOUND_TEXT_Encoder.java b/jdk/src/jdk.charsets/unix/classes/sun/nio/cs/ext/COMPOUND_TEXT_Encoder.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/cs/ext/COMPOUND_TEXT_Encoder.java
rename to jdk/src/jdk.charsets/unix/classes/sun/nio/cs/ext/COMPOUND_TEXT_Encoder.java
diff --git a/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java b/jdk/src/jdk.charsets/unix/classes/sun/nio/cs/ext/CompoundTextSupport.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java
rename to jdk/src/jdk.charsets/unix/classes/sun/nio/cs/ext/CompoundTextSupport.java
diff --git a/jdk/src/share/classes/sun/tools/serialver/SerialVer.java b/jdk/src/jdk.compiler/share/classes/sun/tools/serialver/SerialVer.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/serialver/SerialVer.java
rename to jdk/src/jdk.compiler/share/classes/sun/tools/serialver/SerialVer.java
diff --git a/jdk/src/share/classes/sun/tools/serialver/resources/serialver.properties b/jdk/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver.properties
similarity index 100%
rename from jdk/src/share/classes/sun/tools/serialver/resources/serialver.properties
rename to jdk/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver.properties
diff --git a/jdk/src/share/classes/sun/tools/serialver/resources/serialver_ja.properties b/jdk/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_ja.properties
similarity index 100%
rename from jdk/src/share/classes/sun/tools/serialver/resources/serialver_ja.properties
rename to jdk/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_ja.properties
diff --git a/jdk/src/share/classes/sun/tools/serialver/resources/serialver_zh_CN.properties b/jdk/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_zh_CN.properties
similarity index 100%
rename from jdk/src/share/classes/sun/tools/serialver/resources/serialver_zh_CN.properties
rename to jdk/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_zh_CN.properties
diff --git a/jdk/src/share/classes/sun/security/ec/ECDHKeyAgreement.java b/jdk/src/jdk.crypto.ec/share/classes/sun/security/ec/ECDHKeyAgreement.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ec/ECDHKeyAgreement.java
rename to jdk/src/jdk.crypto.ec/share/classes/sun/security/ec/ECDHKeyAgreement.java
diff --git a/jdk/src/share/classes/sun/security/ec/ECDSASignature.java b/jdk/src/jdk.crypto.ec/share/classes/sun/security/ec/ECDSASignature.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ec/ECDSASignature.java
rename to jdk/src/jdk.crypto.ec/share/classes/sun/security/ec/ECDSASignature.java
diff --git a/jdk/src/share/classes/sun/security/ec/ECKeyFactory.java b/jdk/src/jdk.crypto.ec/share/classes/sun/security/ec/ECKeyFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ec/ECKeyFactory.java
rename to jdk/src/jdk.crypto.ec/share/classes/sun/security/ec/ECKeyFactory.java
diff --git a/jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java b/jdk/src/jdk.crypto.ec/share/classes/sun/security/ec/ECKeyPairGenerator.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java
rename to jdk/src/jdk.crypto.ec/share/classes/sun/security/ec/ECKeyPairGenerator.java
diff --git a/jdk/src/share/classes/sun/security/ec/ECPrivateKeyImpl.java b/jdk/src/jdk.crypto.ec/share/classes/sun/security/ec/ECPrivateKeyImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ec/ECPrivateKeyImpl.java
rename to jdk/src/jdk.crypto.ec/share/classes/sun/security/ec/ECPrivateKeyImpl.java
diff --git a/jdk/src/share/classes/sun/security/ec/ECPublicKeyImpl.java b/jdk/src/jdk.crypto.ec/share/classes/sun/security/ec/ECPublicKeyImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ec/ECPublicKeyImpl.java
rename to jdk/src/jdk.crypto.ec/share/classes/sun/security/ec/ECPublicKeyImpl.java
diff --git a/jdk/src/share/classes/sun/security/ec/SunEC.java b/jdk/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ec/SunEC.java
rename to jdk/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
diff --git a/jdk/src/share/classes/sun/security/ec/SunECEntries.java b/jdk/src/jdk.crypto.ec/share/classes/sun/security/ec/SunECEntries.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/ec/SunECEntries.java
rename to jdk/src/jdk.crypto.ec/share/classes/sun/security/ec/SunECEntries.java
diff --git a/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp b/jdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
diff --git a/jdk/src/share/native/sun/security/ec/impl/ec.c b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec.c
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/ec.c
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec.c
diff --git a/jdk/src/share/native/sun/security/ec/impl/ec.h b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec.h
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/ec.h
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec.h
diff --git a/jdk/src/share/native/sun/security/ec/impl/ec2.h b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2.h
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/ec2.h
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2.h
diff --git a/jdk/src/share/native/sun/security/ec/impl/ec2_163.c b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_163.c
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/ec2_163.c
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_163.c
diff --git a/jdk/src/share/native/sun/security/ec/impl/ec2_193.c b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_193.c
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/ec2_193.c
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_193.c
diff --git a/jdk/src/share/native/sun/security/ec/impl/ec2_233.c b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_233.c
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/ec2_233.c
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_233.c
diff --git a/jdk/src/share/native/sun/security/ec/impl/ec2_aff.c b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_aff.c
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/ec2_aff.c
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_aff.c
diff --git a/jdk/src/share/native/sun/security/ec/impl/ec2_mont.c b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_mont.c
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/ec2_mont.c
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_mont.c
diff --git a/jdk/src/share/native/sun/security/ec/impl/ec_naf.c b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec_naf.c
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/ec_naf.c
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec_naf.c
diff --git a/jdk/src/share/native/sun/security/ec/impl/ecc_impl.h b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecc_impl.h
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/ecc_impl.h
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecc_impl.h
diff --git a/jdk/src/share/native/sun/security/ec/impl/ecdecode.c b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecdecode.c
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/ecdecode.c
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecdecode.c
diff --git a/jdk/src/share/native/sun/security/ec/impl/ecl-curve.h b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl-curve.h
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/ecl-curve.h
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl-curve.h
diff --git a/jdk/src/share/native/sun/security/ec/impl/ecl-exp.h b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl-exp.h
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/ecl-exp.h
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl-exp.h
diff --git a/jdk/src/share/native/sun/security/ec/impl/ecl-priv.h b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl-priv.h
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/ecl-priv.h
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl-priv.h
diff --git a/jdk/src/share/native/sun/security/ec/impl/ecl.c b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl.c
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/ecl.c
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl.c
diff --git a/jdk/src/share/native/sun/security/ec/impl/ecl.h b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl.h
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/ecl.h
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl.h
diff --git a/jdk/src/share/native/sun/security/ec/impl/ecl_curve.c b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl_curve.c
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/ecl_curve.c
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl_curve.c
diff --git a/jdk/src/share/native/sun/security/ec/impl/ecl_gf.c b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl_gf.c
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/ecl_gf.c
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl_gf.c
diff --git a/jdk/src/share/native/sun/security/ec/impl/ecl_mult.c b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl_mult.c
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/ecl_mult.c
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl_mult.c
diff --git a/jdk/src/share/native/sun/security/ec/impl/ecp.h b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp.h
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/ecp.h
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp.h
diff --git a/jdk/src/share/native/sun/security/ec/impl/ecp_192.c b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_192.c
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/ecp_192.c
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_192.c
diff --git a/jdk/src/share/native/sun/security/ec/impl/ecp_224.c b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_224.c
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/ecp_224.c
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_224.c
diff --git a/jdk/src/share/native/sun/security/ec/impl/ecp_256.c b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_256.c
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/ecp_256.c
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_256.c
diff --git a/jdk/src/share/native/sun/security/ec/impl/ecp_384.c b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_384.c
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/ecp_384.c
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_384.c
diff --git a/jdk/src/share/native/sun/security/ec/impl/ecp_521.c b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_521.c
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/ecp_521.c
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_521.c
diff --git a/jdk/src/share/native/sun/security/ec/impl/ecp_aff.c b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_aff.c
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/ecp_aff.c
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_aff.c
diff --git a/jdk/src/share/native/sun/security/ec/impl/ecp_jac.c b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_jac.c
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/ecp_jac.c
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_jac.c
diff --git a/jdk/src/share/native/sun/security/ec/impl/ecp_jm.c b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_jm.c
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/ecp_jm.c
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_jm.c
diff --git a/jdk/src/share/native/sun/security/ec/impl/ecp_mont.c b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_mont.c
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/ecp_mont.c
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_mont.c
diff --git a/jdk/src/share/native/sun/security/ec/impl/logtab.h b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/logtab.h
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/logtab.h
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/logtab.h
diff --git a/jdk/src/share/native/sun/security/ec/impl/mp_gf2m-priv.h b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mp_gf2m-priv.h
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/mp_gf2m-priv.h
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mp_gf2m-priv.h
diff --git a/jdk/src/share/native/sun/security/ec/impl/mp_gf2m.c b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mp_gf2m.c
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/mp_gf2m.c
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mp_gf2m.c
diff --git a/jdk/src/share/native/sun/security/ec/impl/mp_gf2m.h b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mp_gf2m.h
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/mp_gf2m.h
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mp_gf2m.h
diff --git a/jdk/src/share/native/sun/security/ec/impl/mpi-config.h b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpi-config.h
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/mpi-config.h
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpi-config.h
diff --git a/jdk/src/share/native/sun/security/ec/impl/mpi-priv.h b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpi-priv.h
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/mpi-priv.h
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpi-priv.h
diff --git a/jdk/src/share/native/sun/security/ec/impl/mpi.c b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpi.c
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/mpi.c
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpi.c
diff --git a/jdk/src/share/native/sun/security/ec/impl/mpi.h b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpi.h
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/mpi.h
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpi.h
diff --git a/jdk/src/share/native/sun/security/ec/impl/mplogic.c b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mplogic.c
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/mplogic.c
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mplogic.c
diff --git a/jdk/src/share/native/sun/security/ec/impl/mplogic.h b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mplogic.h
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/mplogic.h
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mplogic.h
diff --git a/jdk/src/share/native/sun/security/ec/impl/mpmontg.c b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpmontg.c
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/mpmontg.c
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpmontg.c
diff --git a/jdk/src/share/native/sun/security/ec/impl/mpprime.h b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpprime.h
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/mpprime.h
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpprime.h
diff --git a/jdk/src/share/native/sun/security/ec/impl/oid.c b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/oid.c
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/oid.c
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/oid.c
diff --git a/jdk/src/share/native/sun/security/ec/impl/secitem.c b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/secitem.c
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/secitem.c
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/secitem.c
diff --git a/jdk/src/share/native/sun/security/ec/impl/secoidt.h b/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/secoidt.h
similarity index 100%
rename from jdk/src/share/native/sun/security/ec/impl/secoidt.h
rename to jdk/src/jdk.crypto.ec/share/native/libsunec/impl/secoidt.h
diff --git a/jdk/src/windows/classes/sun/security/mscapi/Key.java b/jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/Key.java
similarity index 100%
rename from jdk/src/windows/classes/sun/security/mscapi/Key.java
rename to jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/Key.java
diff --git a/jdk/src/windows/classes/sun/security/mscapi/KeyStore.java b/jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/KeyStore.java
similarity index 100%
rename from jdk/src/windows/classes/sun/security/mscapi/KeyStore.java
rename to jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/KeyStore.java
diff --git a/jdk/src/windows/classes/sun/security/mscapi/PRNG.java b/jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/PRNG.java
similarity index 100%
rename from jdk/src/windows/classes/sun/security/mscapi/PRNG.java
rename to jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/PRNG.java
diff --git a/jdk/src/windows/classes/sun/security/mscapi/RSACipher.java b/jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSACipher.java
similarity index 100%
rename from jdk/src/windows/classes/sun/security/mscapi/RSACipher.java
rename to jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSACipher.java
diff --git a/jdk/src/windows/classes/sun/security/mscapi/RSAKeyPair.java b/jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAKeyPair.java
similarity index 100%
rename from jdk/src/windows/classes/sun/security/mscapi/RSAKeyPair.java
rename to jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAKeyPair.java
diff --git a/jdk/src/windows/classes/sun/security/mscapi/RSAKeyPairGenerator.java b/jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAKeyPairGenerator.java
similarity index 100%
rename from jdk/src/windows/classes/sun/security/mscapi/RSAKeyPairGenerator.java
rename to jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAKeyPairGenerator.java
diff --git a/jdk/src/windows/classes/sun/security/mscapi/RSAPrivateKey.java b/jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAPrivateKey.java
similarity index 100%
rename from jdk/src/windows/classes/sun/security/mscapi/RSAPrivateKey.java
rename to jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAPrivateKey.java
diff --git a/jdk/src/windows/classes/sun/security/mscapi/RSAPublicKey.java b/jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAPublicKey.java
similarity index 100%
rename from jdk/src/windows/classes/sun/security/mscapi/RSAPublicKey.java
rename to jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAPublicKey.java
diff --git a/jdk/src/windows/classes/sun/security/mscapi/RSASignature.java b/jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSASignature.java
similarity index 100%
rename from jdk/src/windows/classes/sun/security/mscapi/RSASignature.java
rename to jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSASignature.java
diff --git a/jdk/src/windows/classes/sun/security/mscapi/SunMSCAPI.java b/jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/SunMSCAPI.java
similarity index 100%
rename from jdk/src/windows/classes/sun/security/mscapi/SunMSCAPI.java
rename to jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/SunMSCAPI.java
diff --git a/jdk/src/windows/native/sun/security/mscapi/security.cpp b/jdk/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp
similarity index 100%
rename from jdk/src/windows/native/sun/security/mscapi/security.cpp
rename to jdk/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp
diff --git a/jdk/src/share/classes/sun/security/pkcs11/Config.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/Config.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/Config.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/Config.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/KeyCache.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/KeyCache.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/KeyCache.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/KeyCache.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Cipher.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Cipher.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/P11DHKeyFactory.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11DHKeyFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/P11DHKeyFactory.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11DHKeyFactory.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/P11DSAKeyFactory.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11DSAKeyFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/P11DSAKeyFactory.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11DSAKeyFactory.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/P11Digest.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Digest.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/P11Digest.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Digest.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/P11ECDHKeyAgreement.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11ECDHKeyAgreement.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/P11ECDHKeyAgreement.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11ECDHKeyAgreement.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/P11ECKeyFactory.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11ECKeyFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/P11ECKeyFactory.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11ECKeyFactory.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/P11Key.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Key.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/P11Key.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Key.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/P11KeyAgreement.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11KeyAgreement.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/P11KeyAgreement.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11KeyAgreement.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/P11KeyFactory.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11KeyFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/P11KeyFactory.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11KeyFactory.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/P11KeyGenerator.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11KeyGenerator.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/P11KeyGenerator.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11KeyGenerator.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/P11KeyStore.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11KeyStore.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/P11KeyStore.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11KeyStore.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/P11Mac.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Mac.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/P11Mac.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Mac.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/P11RSACipher.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11RSACipher.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/P11RSACipher.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11RSACipher.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/P11RSAKeyFactory.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11RSAKeyFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/P11RSAKeyFactory.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11RSAKeyFactory.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/P11SecureRandom.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11SecureRandom.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/P11SecureRandom.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11SecureRandom.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/P11Signature.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Signature.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/P11Signature.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Signature.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/P11TlsMasterSecretGenerator.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11TlsMasterSecretGenerator.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/P11TlsMasterSecretGenerator.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11TlsMasterSecretGenerator.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/P11Util.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Util.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/P11Util.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Util.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/Secmod.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/Secmod.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/Secmod.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/Secmod.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/Session.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/Session.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/Session.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/Session.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/SessionManager.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/SessionManager.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/SessionManager.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/SessionManager.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/SunPKCS11.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/SunPKCS11.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/TemplateManager.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/TemplateManager.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/TemplateManager.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/TemplateManager.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/Token.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/Token.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/Token.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/Token.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_AES_CTR_PARAMS.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_AES_CTR_PARAMS.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_AES_CTR_PARAMS.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_AES_CTR_PARAMS.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_ATTRIBUTE.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_ATTRIBUTE.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_ATTRIBUTE.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_ATTRIBUTE.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_CREATEMUTEX.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_CREATEMUTEX.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_CREATEMUTEX.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_CREATEMUTEX.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_C_INITIALIZE_ARGS.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_C_INITIALIZE_ARGS.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_C_INITIALIZE_ARGS.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_C_INITIALIZE_ARGS.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_DATE.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_DATE.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_DATE.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_DATE.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_DESTROYMUTEX.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_DESTROYMUTEX.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_DESTROYMUTEX.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_DESTROYMUTEX.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_ECDH1_DERIVE_PARAMS.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_ECDH1_DERIVE_PARAMS.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_ECDH1_DERIVE_PARAMS.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_ECDH1_DERIVE_PARAMS.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_ECDH2_DERIVE_PARAMS.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_ECDH2_DERIVE_PARAMS.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_ECDH2_DERIVE_PARAMS.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_ECDH2_DERIVE_PARAMS.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_INFO.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_INFO.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_INFO.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_INFO.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_LOCKMUTEX.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_LOCKMUTEX.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_LOCKMUTEX.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_LOCKMUTEX.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM_INFO.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM_INFO.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM_INFO.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM_INFO.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_NOTIFY.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_NOTIFY.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_NOTIFY.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_NOTIFY.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_PBE_PARAMS.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_PBE_PARAMS.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_PBE_PARAMS.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_PBE_PARAMS.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_PKCS5_PBKD2_PARAMS.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_PKCS5_PBKD2_PARAMS.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_PKCS5_PBKD2_PARAMS.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_PKCS5_PBKD2_PARAMS.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_OAEP_PARAMS.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_OAEP_PARAMS.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_OAEP_PARAMS.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_OAEP_PARAMS.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_PSS_PARAMS.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_PSS_PARAMS.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_PSS_PARAMS.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_PSS_PARAMS.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_SESSION_INFO.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_SESSION_INFO.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_SESSION_INFO.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_SESSION_INFO.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_SLOT_INFO.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_SLOT_INFO.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_SLOT_INFO.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_SLOT_INFO.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_OUT.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_OUT.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_OUT.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_OUT.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_PARAMS.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_PARAMS.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_PARAMS.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_PARAMS.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_MASTER_KEY_DERIVE_PARAMS.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_MASTER_KEY_DERIVE_PARAMS.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_MASTER_KEY_DERIVE_PARAMS.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_MASTER_KEY_DERIVE_PARAMS.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_TLS_PRF_PARAMS.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_TLS_PRF_PARAMS.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_TLS_PRF_PARAMS.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_TLS_PRF_PARAMS.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_TOKEN_INFO.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_TOKEN_INFO.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_TOKEN_INFO.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_TOKEN_INFO.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_UNLOCKMUTEX.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_UNLOCKMUTEX.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_UNLOCKMUTEX.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_UNLOCKMUTEX.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_VERSION.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_VERSION.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_VERSION.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_VERSION.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH1_DERIVE_PARAMS.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH1_DERIVE_PARAMS.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH1_DERIVE_PARAMS.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH1_DERIVE_PARAMS.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH2_DERIVE_PARAMS.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH2_DERIVE_PARAMS.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH2_DERIVE_PARAMS.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH2_DERIVE_PARAMS.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/wrapper/Constants.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/Constants.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/wrapper/Constants.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/Constants.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/wrapper/Functions.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/Functions.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/wrapper/Functions.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/Functions.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/PKCS11.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/PKCS11.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java
diff --git a/jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11RuntimeException.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/PKCS11RuntimeException.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11RuntimeException.java
rename to jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/PKCS11RuntimeException.java
diff --git a/jdk/src/share/native/sun/security/pkcs11/j2secmod.c b/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/j2secmod.c
similarity index 100%
rename from jdk/src/share/native/sun/security/pkcs11/j2secmod.c
rename to jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/j2secmod.c
diff --git a/jdk/src/share/native/sun/security/pkcs11/j2secmod.h b/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/j2secmod.h
similarity index 100%
rename from jdk/src/share/native/sun/security/pkcs11/j2secmod.h
rename to jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/j2secmod.h
diff --git a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c b/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_convert.c
similarity index 100%
rename from jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c
rename to jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_convert.c
diff --git a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_crypt.c b/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_crypt.c
similarity index 100%
rename from jdk/src/share/native/sun/security/pkcs11/wrapper/p11_crypt.c
rename to jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_crypt.c
diff --git a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_digest.c b/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_digest.c
similarity index 100%
rename from jdk/src/share/native/sun/security/pkcs11/wrapper/p11_digest.c
rename to jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_digest.c
diff --git a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_dual.c b/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_dual.c
similarity index 100%
rename from jdk/src/share/native/sun/security/pkcs11/wrapper/p11_dual.c
rename to jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_dual.c
diff --git a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_general.c b/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_general.c
similarity index 100%
rename from jdk/src/share/native/sun/security/pkcs11/wrapper/p11_general.c
rename to jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_general.c
diff --git a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c b/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_keymgmt.c
similarity index 100%
rename from jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c
rename to jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_keymgmt.c
diff --git a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_mutex.c b/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_mutex.c
similarity index 100%
rename from jdk/src/share/native/sun/security/pkcs11/wrapper/p11_mutex.c
rename to jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_mutex.c
diff --git a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_objmgmt.c b/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_objmgmt.c
similarity index 100%
rename from jdk/src/share/native/sun/security/pkcs11/wrapper/p11_objmgmt.c
rename to jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_objmgmt.c
diff --git a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sessmgmt.c b/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_sessmgmt.c
similarity index 100%
rename from jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sessmgmt.c
rename to jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_sessmgmt.c
diff --git a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sign.c b/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_sign.c
similarity index 100%
rename from jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sign.c
rename to jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_sign.c
diff --git a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_util.c b/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_util.c
similarity index 100%
rename from jdk/src/share/native/sun/security/pkcs11/wrapper/p11_util.c
rename to jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_util.c
diff --git a/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs-11v2-20a3.h b/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs-11v2-20a3.h
similarity index 100%
rename from jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs-11v2-20a3.h
rename to jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs-11v2-20a3.h
diff --git a/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11.h b/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11.h
similarity index 100%
rename from jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11.h
rename to jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11.h
diff --git a/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11f.h b/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11f.h
similarity index 100%
rename from jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11f.h
rename to jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11f.h
diff --git a/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h b/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11t.h
similarity index 100%
rename from jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h
rename to jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11t.h
diff --git a/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h b/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11wrapper.h
similarity index 100%
rename from jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h
rename to jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11wrapper.h
diff --git a/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c b/jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/j2secmod_md.c
similarity index 98%
rename from jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c
rename to jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/j2secmod_md.c
index 20cfabe3fd1..225263247db 100644
--- a/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c
+++ b/jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/j2secmod_md.c
@@ -32,7 +32,7 @@
 #include 
 
 #include "j2secmod.h"
-#include "wrapper/pkcs11wrapper.h"
+#include "pkcs11wrapper.h"
 
 void *findFunction(JNIEnv *env, jlong jHandle, const char *functionName) {
     void *hModule = (void*)jlong_to_ptr(jHandle);
diff --git a/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.h b/jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/j2secmod_md.h
similarity index 100%
rename from jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.h
rename to jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/j2secmod_md.h
diff --git a/jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c b/jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/p11_md.c
similarity index 100%
rename from jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c
rename to jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/p11_md.c
diff --git a/jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.h b/jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/p11_md.h
similarity index 100%
rename from jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.h
rename to jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/p11_md.h
diff --git a/jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.c b/jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/j2secmod_md.c
similarity index 100%
rename from jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.c
rename to jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/j2secmod_md.c
diff --git a/jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.h b/jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/j2secmod_md.h
similarity index 100%
rename from jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.h
rename to jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/j2secmod_md.h
diff --git a/jdk/src/windows/native/sun/security/pkcs11/wrapper/p11_md.c b/jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/p11_md.c
similarity index 100%
rename from jdk/src/windows/native/sun/security/pkcs11/wrapper/p11_md.c
rename to jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/p11_md.c
diff --git a/jdk/src/windows/native/sun/security/pkcs11/wrapper/p11_md.h b/jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/p11_md.h
similarity index 100%
rename from jdk/src/windows/native/sun/security/pkcs11/wrapper/p11_md.h
rename to jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/p11_md.h
diff --git a/jdk/src/macosx/classes/apple/applescript/AppleScriptEngine.java b/jdk/src/jdk.deploy.osx/macosx/classes/apple/applescript/AppleScriptEngine.java
similarity index 100%
rename from jdk/src/macosx/classes/apple/applescript/AppleScriptEngine.java
rename to jdk/src/jdk.deploy.osx/macosx/classes/apple/applescript/AppleScriptEngine.java
diff --git a/jdk/src/macosx/classes/apple/applescript/AppleScriptEngineFactory.java b/jdk/src/jdk.deploy.osx/macosx/classes/apple/applescript/AppleScriptEngineFactory.java
similarity index 100%
rename from jdk/src/macosx/classes/apple/applescript/AppleScriptEngineFactory.java
rename to jdk/src/jdk.deploy.osx/macosx/classes/apple/applescript/AppleScriptEngineFactory.java
diff --git a/jdk/src/macosx/classes/apple/security/AppleProvider.java b/jdk/src/jdk.deploy.osx/macosx/classes/apple/security/AppleProvider.java
similarity index 100%
rename from jdk/src/macosx/classes/apple/security/AppleProvider.java
rename to jdk/src/jdk.deploy.osx/macosx/classes/apple/security/AppleProvider.java
diff --git a/jdk/src/macosx/classes/apple/security/KeychainStore.java b/jdk/src/jdk.deploy.osx/macosx/classes/apple/security/KeychainStore.java
similarity index 100%
rename from jdk/src/macosx/classes/apple/security/KeychainStore.java
rename to jdk/src/jdk.deploy.osx/macosx/classes/apple/security/KeychainStore.java
diff --git a/jdk/src/macosx/classes/com/apple/concurrent/Dispatch.java b/jdk/src/jdk.deploy.osx/macosx/classes/com/apple/concurrent/Dispatch.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/concurrent/Dispatch.java
rename to jdk/src/jdk.deploy.osx/macosx/classes/com/apple/concurrent/Dispatch.java
diff --git a/jdk/src/macosx/classes/com/apple/concurrent/LibDispatchConcurrentQueue.java b/jdk/src/jdk.deploy.osx/macosx/classes/com/apple/concurrent/LibDispatchConcurrentQueue.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/concurrent/LibDispatchConcurrentQueue.java
rename to jdk/src/jdk.deploy.osx/macosx/classes/com/apple/concurrent/LibDispatchConcurrentQueue.java
diff --git a/jdk/src/macosx/classes/com/apple/concurrent/LibDispatchMainQueue.java b/jdk/src/jdk.deploy.osx/macosx/classes/com/apple/concurrent/LibDispatchMainQueue.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/concurrent/LibDispatchMainQueue.java
rename to jdk/src/jdk.deploy.osx/macosx/classes/com/apple/concurrent/LibDispatchMainQueue.java
diff --git a/jdk/src/macosx/classes/com/apple/concurrent/LibDispatchNative.java b/jdk/src/jdk.deploy.osx/macosx/classes/com/apple/concurrent/LibDispatchNative.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/concurrent/LibDispatchNative.java
rename to jdk/src/jdk.deploy.osx/macosx/classes/com/apple/concurrent/LibDispatchNative.java
diff --git a/jdk/src/macosx/classes/com/apple/concurrent/LibDispatchQueue.java b/jdk/src/jdk.deploy.osx/macosx/classes/com/apple/concurrent/LibDispatchQueue.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/concurrent/LibDispatchQueue.java
rename to jdk/src/jdk.deploy.osx/macosx/classes/com/apple/concurrent/LibDispatchQueue.java
diff --git a/jdk/src/macosx/classes/com/apple/concurrent/LibDispatchRetainedResource.java b/jdk/src/jdk.deploy.osx/macosx/classes/com/apple/concurrent/LibDispatchRetainedResource.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/concurrent/LibDispatchRetainedResource.java
rename to jdk/src/jdk.deploy.osx/macosx/classes/com/apple/concurrent/LibDispatchRetainedResource.java
diff --git a/jdk/src/macosx/classes/com/apple/concurrent/LibDispatchSerialQueue.java b/jdk/src/jdk.deploy.osx/macosx/classes/com/apple/concurrent/LibDispatchSerialQueue.java
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/concurrent/LibDispatchSerialQueue.java
rename to jdk/src/jdk.deploy.osx/macosx/classes/com/apple/concurrent/LibDispatchSerialQueue.java
diff --git a/jdk/src/macosx/classes/com/apple/concurrent/package.html b/jdk/src/jdk.deploy.osx/macosx/classes/com/apple/concurrent/package.html
similarity index 100%
rename from jdk/src/macosx/classes/com/apple/concurrent/package.html
rename to jdk/src/jdk.deploy.osx/macosx/classes/com/apple/concurrent/package.html
diff --git a/jdk/src/macosx/native/apple/applescript/AS_NS_ConversionUtils.h b/jdk/src/jdk.deploy.osx/macosx/native/libapplescriptengine/AS_NS_ConversionUtils.h
similarity index 100%
rename from jdk/src/macosx/native/apple/applescript/AS_NS_ConversionUtils.h
rename to jdk/src/jdk.deploy.osx/macosx/native/libapplescriptengine/AS_NS_ConversionUtils.h
diff --git a/jdk/src/macosx/native/apple/applescript/AS_NS_ConversionUtils.m b/jdk/src/jdk.deploy.osx/macosx/native/libapplescriptengine/AS_NS_ConversionUtils.m
similarity index 100%
rename from jdk/src/macosx/native/apple/applescript/AS_NS_ConversionUtils.m
rename to jdk/src/jdk.deploy.osx/macosx/native/libapplescriptengine/AS_NS_ConversionUtils.m
diff --git a/jdk/src/macosx/native/apple/applescript/AppleScriptEngine.m b/jdk/src/jdk.deploy.osx/macosx/native/libapplescriptengine/AppleScriptEngine.m
similarity index 100%
rename from jdk/src/macosx/native/apple/applescript/AppleScriptEngine.m
rename to jdk/src/jdk.deploy.osx/macosx/native/libapplescriptengine/AppleScriptEngine.m
diff --git a/jdk/src/macosx/native/apple/applescript/AppleScriptExecutionContext.h b/jdk/src/jdk.deploy.osx/macosx/native/libapplescriptengine/AppleScriptExecutionContext.h
similarity index 100%
rename from jdk/src/macosx/native/apple/applescript/AppleScriptExecutionContext.h
rename to jdk/src/jdk.deploy.osx/macosx/native/libapplescriptengine/AppleScriptExecutionContext.h
diff --git a/jdk/src/macosx/native/apple/applescript/AppleScriptExecutionContext.m b/jdk/src/jdk.deploy.osx/macosx/native/libapplescriptengine/AppleScriptExecutionContext.m
similarity index 100%
rename from jdk/src/macosx/native/apple/applescript/AppleScriptExecutionContext.m
rename to jdk/src/jdk.deploy.osx/macosx/native/libapplescriptengine/AppleScriptExecutionContext.m
diff --git a/jdk/src/macosx/native/apple/applescript/NS_Java_ConversionUtils.h b/jdk/src/jdk.deploy.osx/macosx/native/libapplescriptengine/NS_Java_ConversionUtils.h
similarity index 100%
rename from jdk/src/macosx/native/apple/applescript/NS_Java_ConversionUtils.h
rename to jdk/src/jdk.deploy.osx/macosx/native/libapplescriptengine/NS_Java_ConversionUtils.h
diff --git a/jdk/src/macosx/native/apple/applescript/NS_Java_ConversionUtils.m b/jdk/src/jdk.deploy.osx/macosx/native/libapplescriptengine/NS_Java_ConversionUtils.m
similarity index 100%
rename from jdk/src/macosx/native/apple/applescript/NS_Java_ConversionUtils.m
rename to jdk/src/jdk.deploy.osx/macosx/native/libapplescriptengine/NS_Java_ConversionUtils.m
diff --git a/jdk/src/macosx/native/com/apple/eio/CFileManager.m b/jdk/src/jdk.deploy.osx/macosx/native/libosx/CFileManager.m
similarity index 100%
rename from jdk/src/macosx/native/com/apple/eio/CFileManager.m
rename to jdk/src/jdk.deploy.osx/macosx/native/libosx/CFileManager.m
diff --git a/jdk/src/macosx/native/com/apple/concurrent/Dispatch.m b/jdk/src/jdk.deploy.osx/macosx/native/libosx/Dispatch.m
similarity index 100%
rename from jdk/src/macosx/native/com/apple/concurrent/Dispatch.m
rename to jdk/src/jdk.deploy.osx/macosx/native/libosx/Dispatch.m
diff --git a/jdk/src/macosx/native/apple/security/KeystoreImpl.m b/jdk/src/jdk.deploy.osx/macosx/native/libosx/KeystoreImpl.m
similarity index 100%
rename from jdk/src/macosx/native/apple/security/KeystoreImpl.m
rename to jdk/src/jdk.deploy.osx/macosx/native/libosx/KeystoreImpl.m
diff --git a/jdk/src/share/classes/com/sun/jarsigner/ContentSigner.java b/jdk/src/jdk.dev/share/classes/com/sun/jarsigner/ContentSigner.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jarsigner/ContentSigner.java
rename to jdk/src/jdk.dev/share/classes/com/sun/jarsigner/ContentSigner.java
diff --git a/jdk/src/share/classes/com/sun/jarsigner/ContentSignerParameters.java b/jdk/src/jdk.dev/share/classes/com/sun/jarsigner/ContentSignerParameters.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jarsigner/ContentSignerParameters.java
rename to jdk/src/jdk.dev/share/classes/com/sun/jarsigner/ContentSignerParameters.java
diff --git a/jdk/src/share/classes/com/sun/jarsigner/package.html b/jdk/src/jdk.dev/share/classes/com/sun/jarsigner/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/jarsigner/package.html
rename to jdk/src/jdk.dev/share/classes/com/sun/jarsigner/package.html
diff --git a/jdk/src/share/classes/com/sun/tools/extcheck/ExtCheck.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/extcheck/ExtCheck.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/extcheck/ExtCheck.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/extcheck/ExtCheck.java
diff --git a/jdk/src/share/classes/com/sun/tools/extcheck/Main.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/extcheck/Main.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/extcheck/Main.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/extcheck/Main.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/Main.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/Main.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/Main.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/Main.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/model/AbstractJavaHeapObjectVisitor.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/AbstractJavaHeapObjectVisitor.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/model/AbstractJavaHeapObjectVisitor.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/AbstractJavaHeapObjectVisitor.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/model/ArrayTypeCodes.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/ArrayTypeCodes.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/model/ArrayTypeCodes.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/ArrayTypeCodes.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/model/HackJavaValue.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/HackJavaValue.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/model/HackJavaValue.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/HackJavaValue.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaBoolean.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaBoolean.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaBoolean.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaBoolean.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaByte.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaByte.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaByte.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaByte.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaChar.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaChar.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaChar.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaChar.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaClass.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaClass.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaClass.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaClass.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaDouble.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaDouble.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaDouble.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaDouble.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaField.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaField.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaField.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaField.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaFloat.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaFloat.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaFloat.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaFloat.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaHeapObject.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaHeapObject.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaHeapObject.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaHeapObject.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaHeapObjectVisitor.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaHeapObjectVisitor.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaHeapObjectVisitor.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaHeapObjectVisitor.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaInt.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaInt.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaInt.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaInt.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaLazyReadObject.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaLazyReadObject.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaLazyReadObject.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaLazyReadObject.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaLong.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaLong.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaLong.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaLong.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaObject.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaObject.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaObject.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaObject.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaObjectArray.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaObjectArray.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaObjectArray.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaObjectArray.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaObjectRef.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaObjectRef.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaObjectRef.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaObjectRef.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaShort.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaShort.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaShort.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaShort.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaStatic.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaStatic.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaStatic.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaStatic.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaThing.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaThing.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaThing.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaThing.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaValue.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaValue.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaValue.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaValue.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/model/ReachableExcludes.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/ReachableExcludes.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/model/ReachableExcludes.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/ReachableExcludes.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/model/ReachableExcludesImpl.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/ReachableExcludesImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/model/ReachableExcludesImpl.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/ReachableExcludesImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/model/ReachableObjects.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/ReachableObjects.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/model/ReachableObjects.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/ReachableObjects.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/model/ReferenceChain.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/ReferenceChain.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/model/ReferenceChain.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/ReferenceChain.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/model/Root.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/Root.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/model/Root.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/Root.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/model/Snapshot.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/Snapshot.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/model/Snapshot.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/Snapshot.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/model/StackFrame.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/StackFrame.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/model/StackFrame.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/StackFrame.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/model/StackTrace.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/StackTrace.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/model/StackTrace.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/StackTrace.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/oql/OQLEngine.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/oql/OQLEngine.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/oql/OQLEngine.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/oql/OQLEngine.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/oql/OQLException.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/oql/OQLException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/oql/OQLException.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/oql/OQLException.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/oql/OQLQuery.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/oql/OQLQuery.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/oql/OQLQuery.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/oql/OQLQuery.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/oql/ObjectVisitor.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/oql/ObjectVisitor.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/oql/ObjectVisitor.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/oql/ObjectVisitor.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/parser/FileReadBuffer.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/parser/FileReadBuffer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/parser/FileReadBuffer.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/parser/FileReadBuffer.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/parser/HprofReader.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/parser/HprofReader.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/parser/HprofReader.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/parser/HprofReader.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/parser/MappedReadBuffer.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/parser/MappedReadBuffer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/parser/MappedReadBuffer.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/parser/MappedReadBuffer.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/parser/PositionDataInputStream.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/parser/PositionDataInputStream.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/parser/PositionDataInputStream.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/parser/PositionDataInputStream.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/parser/PositionInputStream.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/parser/PositionInputStream.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/parser/PositionInputStream.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/parser/PositionInputStream.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/parser/ReadBuffer.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/parser/ReadBuffer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/parser/ReadBuffer.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/parser/ReadBuffer.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/parser/Reader.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/parser/Reader.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/parser/Reader.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/parser/Reader.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/server/AllClassesQuery.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/AllClassesQuery.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/server/AllClassesQuery.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/AllClassesQuery.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/server/AllRootsQuery.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/AllRootsQuery.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/server/AllRootsQuery.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/AllRootsQuery.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/server/ClassQuery.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/ClassQuery.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/server/ClassQuery.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/ClassQuery.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/server/FinalizerObjectsQuery.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/FinalizerObjectsQuery.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/server/FinalizerObjectsQuery.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/FinalizerObjectsQuery.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/server/FinalizerSummaryQuery.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/FinalizerSummaryQuery.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/server/FinalizerSummaryQuery.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/FinalizerSummaryQuery.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/server/HistogramQuery.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/HistogramQuery.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/server/HistogramQuery.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/HistogramQuery.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/server/HttpReader.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/HttpReader.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/server/HttpReader.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/HttpReader.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/server/InstancesCountQuery.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/InstancesCountQuery.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/server/InstancesCountQuery.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/InstancesCountQuery.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/server/InstancesQuery.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/InstancesQuery.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/server/InstancesQuery.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/InstancesQuery.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/server/OQLHelp.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/OQLHelp.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/server/OQLHelp.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/OQLHelp.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/server/OQLQuery.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/OQLQuery.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/server/OQLQuery.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/OQLQuery.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/server/ObjectQuery.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/ObjectQuery.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/server/ObjectQuery.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/ObjectQuery.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/server/PlatformClasses.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/PlatformClasses.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/server/PlatformClasses.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/PlatformClasses.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/server/QueryHandler.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/QueryHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/server/QueryHandler.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/QueryHandler.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/server/QueryListener.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/QueryListener.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/server/QueryListener.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/QueryListener.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/server/ReachableQuery.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/ReachableQuery.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/server/ReachableQuery.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/ReachableQuery.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/server/RefsByTypeQuery.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/RefsByTypeQuery.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/server/RefsByTypeQuery.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/RefsByTypeQuery.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/server/RootStackQuery.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/RootStackQuery.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/server/RootStackQuery.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/RootStackQuery.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/server/RootsQuery.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/RootsQuery.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/server/RootsQuery.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/RootsQuery.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/util/ArraySorter.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/util/ArraySorter.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/util/ArraySorter.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/util/ArraySorter.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/util/Comparer.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/util/Comparer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/util/Comparer.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/util/Comparer.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/util/CompositeEnumeration.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/util/CompositeEnumeration.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/util/CompositeEnumeration.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/util/CompositeEnumeration.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/util/Misc.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/util/Misc.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/util/Misc.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/util/Misc.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/util/VectorSorter.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/util/VectorSorter.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/internal/util/VectorSorter.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/internal/util/VectorSorter.java
diff --git a/jdk/src/share/classes/com/sun/tools/hat/resources/hat.js b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/resources/hat.js
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/resources/hat.js
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/resources/hat.js
diff --git a/jdk/src/share/classes/com/sun/tools/hat/resources/oqlhelp.html b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/resources/oqlhelp.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/resources/oqlhelp.html
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/resources/oqlhelp.html
diff --git a/jdk/src/share/classes/com/sun/tools/hat/resources/platform_names.txt b/jdk/src/jdk.dev/share/classes/com/sun/tools/hat/resources/platform_names.txt
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/hat/resources/platform_names.txt
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/hat/resources/platform_names.txt
diff --git a/jdk/src/share/classes/com/sun/tools/script/shell/Main.java b/jdk/src/jdk.dev/share/classes/com/sun/tools/script/shell/Main.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/script/shell/Main.java
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/script/shell/Main.java
diff --git a/jdk/src/share/classes/com/sun/tools/script/shell/init.js b/jdk/src/jdk.dev/share/classes/com/sun/tools/script/shell/init.js
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/script/shell/init.js
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/script/shell/init.js
diff --git a/jdk/src/share/classes/com/sun/tools/script/shell/messages.properties b/jdk/src/jdk.dev/share/classes/com/sun/tools/script/shell/messages.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/script/shell/messages.properties
rename to jdk/src/jdk.dev/share/classes/com/sun/tools/script/shell/messages.properties
diff --git a/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java b/jdk/src/jdk.dev/share/classes/sun/security/tools/jarsigner/Main.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/tools/jarsigner/Main.java
rename to jdk/src/jdk.dev/share/classes/sun/security/tools/jarsigner/Main.java
diff --git a/jdk/src/share/classes/sun/security/tools/jarsigner/Resources.java b/jdk/src/jdk.dev/share/classes/sun/security/tools/jarsigner/Resources.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/tools/jarsigner/Resources.java
rename to jdk/src/jdk.dev/share/classes/sun/security/tools/jarsigner/Resources.java
diff --git a/jdk/src/share/classes/sun/security/tools/jarsigner/Resources_ja.java b/jdk/src/jdk.dev/share/classes/sun/security/tools/jarsigner/Resources_ja.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/tools/jarsigner/Resources_ja.java
rename to jdk/src/jdk.dev/share/classes/sun/security/tools/jarsigner/Resources_ja.java
diff --git a/jdk/src/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java b/jdk/src/jdk.dev/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java
rename to jdk/src/jdk.dev/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java
diff --git a/jdk/src/share/classes/sun/security/tools/jarsigner/TimestampedSigner.java b/jdk/src/jdk.dev/share/classes/sun/security/tools/jarsigner/TimestampedSigner.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/tools/jarsigner/TimestampedSigner.java
rename to jdk/src/jdk.dev/share/classes/sun/security/tools/jarsigner/TimestampedSigner.java
diff --git a/jdk/src/share/classes/sun/tools/jar/CommandLine.java b/jdk/src/jdk.dev/share/classes/sun/tools/jar/CommandLine.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jar/CommandLine.java
rename to jdk/src/jdk.dev/share/classes/sun/tools/jar/CommandLine.java
diff --git a/jdk/src/share/classes/sun/tools/jar/JarException.java b/jdk/src/jdk.dev/share/classes/sun/tools/jar/JarException.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jar/JarException.java
rename to jdk/src/jdk.dev/share/classes/sun/tools/jar/JarException.java
diff --git a/jdk/src/share/classes/sun/tools/jar/Main.java b/jdk/src/jdk.dev/share/classes/sun/tools/jar/Main.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jar/Main.java
rename to jdk/src/jdk.dev/share/classes/sun/tools/jar/Main.java
diff --git a/jdk/src/share/classes/sun/tools/jar/Manifest.java b/jdk/src/jdk.dev/share/classes/sun/tools/jar/Manifest.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jar/Manifest.java
rename to jdk/src/jdk.dev/share/classes/sun/tools/jar/Manifest.java
diff --git a/jdk/src/share/classes/sun/tools/jar/SignatureFile.java b/jdk/src/jdk.dev/share/classes/sun/tools/jar/SignatureFile.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jar/SignatureFile.java
rename to jdk/src/jdk.dev/share/classes/sun/tools/jar/SignatureFile.java
diff --git a/jdk/src/share/classes/sun/tools/jar/resources/jar.properties b/jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar.properties
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jar/resources/jar.properties
rename to jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar.properties
diff --git a/jdk/src/share/classes/sun/tools/jar/resources/jar_de.properties b/jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_de.properties
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jar/resources/jar_de.properties
rename to jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_de.properties
diff --git a/jdk/src/share/classes/sun/tools/jar/resources/jar_es.properties b/jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_es.properties
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jar/resources/jar_es.properties
rename to jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_es.properties
diff --git a/jdk/src/share/classes/sun/tools/jar/resources/jar_fr.properties b/jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_fr.properties
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jar/resources/jar_fr.properties
rename to jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_fr.properties
diff --git a/jdk/src/share/classes/sun/tools/jar/resources/jar_it.properties b/jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_it.properties
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jar/resources/jar_it.properties
rename to jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_it.properties
diff --git a/jdk/src/share/classes/sun/tools/jar/resources/jar_ja.properties b/jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_ja.properties
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jar/resources/jar_ja.properties
rename to jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_ja.properties
diff --git a/jdk/src/share/classes/sun/tools/jar/resources/jar_ko.properties b/jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_ko.properties
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jar/resources/jar_ko.properties
rename to jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_ko.properties
diff --git a/jdk/src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties b/jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_pt_BR.properties
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties
rename to jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_pt_BR.properties
diff --git a/jdk/src/share/classes/sun/tools/jar/resources/jar_sv.properties b/jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_sv.properties
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jar/resources/jar_sv.properties
rename to jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_sv.properties
diff --git a/jdk/src/share/classes/sun/tools/jar/resources/jar_zh_CN.properties b/jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_zh_CN.properties
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jar/resources/jar_zh_CN.properties
rename to jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_zh_CN.properties
diff --git a/jdk/src/share/classes/sun/tools/jar/resources/jar_zh_TW.properties b/jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_zh_TW.properties
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jar/resources/jar_zh_TW.properties
rename to jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_zh_TW.properties
diff --git a/jdk/src/share/classes/sun/tools/native2ascii/A2NFilter.java b/jdk/src/jdk.dev/share/classes/sun/tools/native2ascii/A2NFilter.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/native2ascii/A2NFilter.java
rename to jdk/src/jdk.dev/share/classes/sun/tools/native2ascii/A2NFilter.java
diff --git a/jdk/src/share/classes/sun/tools/native2ascii/Main.java b/jdk/src/jdk.dev/share/classes/sun/tools/native2ascii/Main.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/native2ascii/Main.java
rename to jdk/src/jdk.dev/share/classes/sun/tools/native2ascii/Main.java
diff --git a/jdk/src/share/classes/sun/tools/native2ascii/N2AFilter.java b/jdk/src/jdk.dev/share/classes/sun/tools/native2ascii/N2AFilter.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/native2ascii/N2AFilter.java
rename to jdk/src/jdk.dev/share/classes/sun/tools/native2ascii/N2AFilter.java
diff --git a/jdk/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii.java b/jdk/src/jdk.dev/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii.java
rename to jdk/src/jdk.dev/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii.java
diff --git a/jdk/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_ja.java b/jdk/src/jdk.dev/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_ja.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_ja.java
rename to jdk/src/jdk.dev/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_ja.java
diff --git a/jdk/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_zh_CN.java b/jdk/src/jdk.dev/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_zh_CN.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_zh_CN.java
rename to jdk/src/jdk.dev/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_zh_CN.java
diff --git a/jdk/src/share/classes/com/sun/demo/jvmti/hprof/Tracker.java b/jdk/src/jdk.hprof.agent/share/classes/com/sun/demo/jvmti/hprof/Tracker.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/demo/jvmti/hprof/Tracker.java
rename to jdk/src/jdk.hprof.agent/share/classes/com/sun/demo/jvmti/hprof/Tracker.java
diff --git a/jdk/src/share/classes/com/sun/net/httpserver/Authenticator.java b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Authenticator.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/net/httpserver/Authenticator.java
rename to jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Authenticator.java
diff --git a/jdk/src/share/classes/com/sun/net/httpserver/BasicAuthenticator.java b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/BasicAuthenticator.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/net/httpserver/BasicAuthenticator.java
rename to jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/BasicAuthenticator.java
diff --git a/jdk/src/share/classes/com/sun/net/httpserver/Filter.java b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Filter.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/net/httpserver/Filter.java
rename to jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Filter.java
diff --git a/jdk/src/share/classes/com/sun/net/httpserver/Headers.java b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Headers.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/net/httpserver/Headers.java
rename to jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Headers.java
diff --git a/jdk/src/share/classes/com/sun/net/httpserver/HttpContext.java b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpContext.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/net/httpserver/HttpContext.java
rename to jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpContext.java
diff --git a/jdk/src/share/classes/com/sun/net/httpserver/HttpExchange.java b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpExchange.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/net/httpserver/HttpExchange.java
rename to jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpExchange.java
diff --git a/jdk/src/share/classes/com/sun/net/httpserver/HttpHandler.java b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/net/httpserver/HttpHandler.java
rename to jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpHandler.java
diff --git a/jdk/src/share/classes/com/sun/net/httpserver/HttpPrincipal.java b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpPrincipal.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/net/httpserver/HttpPrincipal.java
rename to jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpPrincipal.java
diff --git a/jdk/src/share/classes/com/sun/net/httpserver/HttpServer.java b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpServer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/net/httpserver/HttpServer.java
rename to jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpServer.java
diff --git a/jdk/src/share/classes/com/sun/net/httpserver/HttpsConfigurator.java b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsConfigurator.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/net/httpserver/HttpsConfigurator.java
rename to jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsConfigurator.java
diff --git a/jdk/src/share/classes/com/sun/net/httpserver/HttpsExchange.java b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsExchange.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/net/httpserver/HttpsExchange.java
rename to jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsExchange.java
diff --git a/jdk/src/share/classes/com/sun/net/httpserver/HttpsParameters.java b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsParameters.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/net/httpserver/HttpsParameters.java
rename to jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsParameters.java
diff --git a/jdk/src/share/classes/com/sun/net/httpserver/HttpsServer.java b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsServer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/net/httpserver/HttpsServer.java
rename to jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsServer.java
diff --git a/jdk/src/share/classes/com/sun/net/httpserver/package-info.java b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/package-info.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/net/httpserver/package-info.java
rename to jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/package-info.java
diff --git a/jdk/src/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java
rename to jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java
diff --git a/jdk/src/share/classes/com/sun/net/httpserver/spi/package-info.java b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/package-info.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/net/httpserver/spi/package-info.java
rename to jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/package-info.java
diff --git a/jdk/src/share/classes/sun/net/httpserver/AuthFilter.java b/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/AuthFilter.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/httpserver/AuthFilter.java
rename to jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/AuthFilter.java
diff --git a/jdk/src/share/classes/sun/net/httpserver/ChunkedInputStream.java b/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedInputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/httpserver/ChunkedInputStream.java
rename to jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedInputStream.java
diff --git a/jdk/src/share/classes/sun/net/httpserver/ChunkedOutputStream.java b/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/httpserver/ChunkedOutputStream.java
rename to jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedOutputStream.java
diff --git a/jdk/src/share/classes/sun/net/httpserver/Code.java b/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/Code.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/httpserver/Code.java
rename to jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/Code.java
diff --git a/jdk/src/share/classes/sun/net/httpserver/ContextList.java b/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/ContextList.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/httpserver/ContextList.java
rename to jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/ContextList.java
diff --git a/jdk/src/share/classes/sun/net/httpserver/DefaultHttpServerProvider.java b/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/DefaultHttpServerProvider.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/httpserver/DefaultHttpServerProvider.java
rename to jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/DefaultHttpServerProvider.java
diff --git a/jdk/src/share/classes/sun/net/httpserver/Event.java b/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/Event.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/httpserver/Event.java
rename to jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/Event.java
diff --git a/jdk/src/share/classes/sun/net/httpserver/ExchangeImpl.java b/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/httpserver/ExchangeImpl.java
rename to jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java
diff --git a/jdk/src/share/classes/sun/net/httpserver/FixedLengthInputStream.java b/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthInputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/httpserver/FixedLengthInputStream.java
rename to jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthInputStream.java
diff --git a/jdk/src/share/classes/sun/net/httpserver/FixedLengthOutputStream.java b/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/httpserver/FixedLengthOutputStream.java
rename to jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthOutputStream.java
diff --git a/jdk/src/share/classes/sun/net/httpserver/HttpConnection.java b/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpConnection.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/httpserver/HttpConnection.java
rename to jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpConnection.java
diff --git a/jdk/src/share/classes/sun/net/httpserver/HttpContextImpl.java b/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpContextImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/httpserver/HttpContextImpl.java
rename to jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpContextImpl.java
diff --git a/jdk/src/share/classes/sun/net/httpserver/HttpError.java b/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpError.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/httpserver/HttpError.java
rename to jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpError.java
diff --git a/jdk/src/share/classes/sun/net/httpserver/HttpExchangeImpl.java b/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpExchangeImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/httpserver/HttpExchangeImpl.java
rename to jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpExchangeImpl.java
diff --git a/jdk/src/share/classes/sun/net/httpserver/HttpServerImpl.java b/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpServerImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/httpserver/HttpServerImpl.java
rename to jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpServerImpl.java
diff --git a/jdk/src/share/classes/sun/net/httpserver/HttpsExchangeImpl.java b/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpsExchangeImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/httpserver/HttpsExchangeImpl.java
rename to jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpsExchangeImpl.java
diff --git a/jdk/src/share/classes/sun/net/httpserver/HttpsServerImpl.java b/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpsServerImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/httpserver/HttpsServerImpl.java
rename to jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpsServerImpl.java
diff --git a/jdk/src/share/classes/sun/net/httpserver/LeftOverInputStream.java b/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/LeftOverInputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/httpserver/LeftOverInputStream.java
rename to jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/LeftOverInputStream.java
diff --git a/jdk/src/share/classes/sun/net/httpserver/Request.java b/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/Request.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/httpserver/Request.java
rename to jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/Request.java
diff --git a/jdk/src/share/classes/sun/net/httpserver/SSLStreams.java b/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/SSLStreams.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/httpserver/SSLStreams.java
rename to jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/SSLStreams.java
diff --git a/jdk/src/share/classes/sun/net/httpserver/ServerConfig.java b/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerConfig.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/httpserver/ServerConfig.java
rename to jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerConfig.java
diff --git a/jdk/src/share/classes/sun/net/httpserver/ServerImpl.java b/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/httpserver/ServerImpl.java
rename to jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java
diff --git a/jdk/src/share/classes/sun/net/httpserver/StreamClosedException.java b/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/StreamClosedException.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/httpserver/StreamClosedException.java
rename to jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/StreamClosedException.java
diff --git a/jdk/src/share/classes/sun/net/httpserver/TimeSource.java b/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/TimeSource.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/httpserver/TimeSource.java
rename to jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/TimeSource.java
diff --git a/jdk/src/share/classes/sun/net/httpserver/UndefLengthOutputStream.java b/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/UndefLengthOutputStream.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/httpserver/UndefLengthOutputStream.java
rename to jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/UndefLengthOutputStream.java
diff --git a/jdk/src/share/classes/sun/net/httpserver/UnmodifiableHeaders.java b/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/UnmodifiableHeaders.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/httpserver/UnmodifiableHeaders.java
rename to jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/UnmodifiableHeaders.java
diff --git a/jdk/src/share/classes/sun/net/httpserver/WriteFinishedEvent.java b/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/WriteFinishedEvent.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/httpserver/WriteFinishedEvent.java
rename to jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/WriteFinishedEvent.java
diff --git a/jdk/src/share/classes/sun/tools/jcmd/Arguments.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jcmd/Arguments.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jcmd/Arguments.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jcmd/Arguments.java
diff --git a/jdk/src/share/classes/sun/tools/jcmd/JCmd.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jcmd/JCmd.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jcmd/JCmd.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jcmd/JCmd.java
diff --git a/jdk/src/share/classes/sun/tools/jinfo/JInfo.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jinfo/JInfo.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jinfo/JInfo.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jinfo/JInfo.java
diff --git a/jdk/src/share/classes/sun/tools/jmap/JMap.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jmap/JMap.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jmap/JMap.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jmap/JMap.java
diff --git a/jdk/src/share/classes/sun/tools/jps/Arguments.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jps/Arguments.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jps/Arguments.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jps/Arguments.java
diff --git a/jdk/src/share/classes/sun/tools/jps/Jps.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jps/Jps.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jps/Jps.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jps/Jps.java
diff --git a/jdk/src/share/classes/sun/tools/jstack/JStack.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstack/JStack.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jstack/JStack.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jstack/JStack.java
diff --git a/jdk/src/share/classes/sun/tools/jstat/Alignment.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Alignment.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jstat/Alignment.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Alignment.java
diff --git a/jdk/src/share/classes/sun/tools/jstat/Arguments.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Arguments.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jstat/Arguments.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Arguments.java
diff --git a/jdk/src/share/classes/sun/tools/jstat/AscendingMonitorComparator.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/AscendingMonitorComparator.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jstat/AscendingMonitorComparator.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/AscendingMonitorComparator.java
diff --git a/jdk/src/share/classes/sun/tools/jstat/Closure.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Closure.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jstat/Closure.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Closure.java
diff --git a/jdk/src/share/classes/sun/tools/jstat/ColumnFormat.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/ColumnFormat.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jstat/ColumnFormat.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/ColumnFormat.java
diff --git a/jdk/src/share/classes/sun/tools/jstat/DescendingMonitorComparator.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/DescendingMonitorComparator.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jstat/DescendingMonitorComparator.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/DescendingMonitorComparator.java
diff --git a/jdk/src/share/classes/sun/tools/jstat/Expression.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Expression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jstat/Expression.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Expression.java
diff --git a/jdk/src/share/classes/sun/tools/jstat/ExpressionEvaluator.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/ExpressionEvaluator.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jstat/ExpressionEvaluator.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/ExpressionEvaluator.java
diff --git a/jdk/src/share/classes/sun/tools/jstat/ExpressionExecuter.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/ExpressionExecuter.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jstat/ExpressionExecuter.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/ExpressionExecuter.java
diff --git a/jdk/src/share/classes/sun/tools/jstat/ExpressionResolver.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/ExpressionResolver.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jstat/ExpressionResolver.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/ExpressionResolver.java
diff --git a/jdk/src/share/classes/sun/tools/jstat/HeaderClosure.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/HeaderClosure.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jstat/HeaderClosure.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/HeaderClosure.java
diff --git a/jdk/src/share/classes/sun/tools/jstat/Identifier.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Identifier.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jstat/Identifier.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Identifier.java
diff --git a/jdk/src/share/classes/sun/tools/jstat/JStatLogger.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/JStatLogger.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jstat/JStatLogger.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/JStatLogger.java
diff --git a/jdk/src/share/classes/sun/tools/jstat/Jstat.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Jstat.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jstat/Jstat.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Jstat.java
diff --git a/jdk/src/share/classes/sun/tools/jstat/Literal.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Literal.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jstat/Literal.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Literal.java
diff --git a/jdk/src/share/classes/sun/tools/jstat/Operator.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Operator.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jstat/Operator.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Operator.java
diff --git a/jdk/src/share/classes/sun/tools/jstat/OptionFinder.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/OptionFinder.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jstat/OptionFinder.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/OptionFinder.java
diff --git a/jdk/src/share/classes/sun/tools/jstat/OptionFormat.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/OptionFormat.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jstat/OptionFormat.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/OptionFormat.java
diff --git a/jdk/src/share/classes/sun/tools/jstat/OptionLister.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/OptionLister.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jstat/OptionLister.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/OptionLister.java
diff --git a/jdk/src/share/classes/sun/tools/jstat/OptionOutputFormatter.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/OptionOutputFormatter.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jstat/OptionOutputFormatter.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/OptionOutputFormatter.java
diff --git a/jdk/src/share/classes/sun/tools/jstat/OutputFormatter.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/OutputFormatter.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jstat/OutputFormatter.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/OutputFormatter.java
diff --git a/jdk/src/share/classes/sun/tools/jstat/Parser.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Parser.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jstat/Parser.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Parser.java
diff --git a/jdk/src/share/classes/sun/tools/jstat/ParserException.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/ParserException.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jstat/ParserException.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/ParserException.java
diff --git a/jdk/src/share/classes/sun/tools/jstat/RawOutputFormatter.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/RawOutputFormatter.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jstat/RawOutputFormatter.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/RawOutputFormatter.java
diff --git a/jdk/src/share/classes/sun/tools/jstat/RowClosure.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/RowClosure.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jstat/RowClosure.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/RowClosure.java
diff --git a/jdk/src/share/classes/sun/tools/jstat/Scale.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Scale.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jstat/Scale.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Scale.java
diff --git a/jdk/src/share/classes/sun/tools/jstat/SymbolResolutionClosure.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/SymbolResolutionClosure.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jstat/SymbolResolutionClosure.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/SymbolResolutionClosure.java
diff --git a/jdk/src/share/classes/sun/tools/jstat/SyntaxException.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/SyntaxException.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jstat/SyntaxException.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/SyntaxException.java
diff --git a/jdk/src/share/classes/sun/tools/jstat/Token.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Token.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jstat/Token.java
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Token.java
diff --git a/jdk/src/share/classes/sun/tools/jstat/resources/jstat_options b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/resources/jstat_options
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jstat/resources/jstat_options
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/resources/jstat_options
diff --git a/jdk/src/share/classes/sun/tools/jstat/resources/jstat_unsupported_options b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/resources/jstat_unsupported_options
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jstat/resources/jstat_unsupported_options
rename to jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/resources/jstat_unsupported_options
diff --git a/jdk/src/share/classes/com/sun/tools/jconsole/JConsoleContext.java b/jdk/src/jdk.jconsole/share/classes/com/sun/tools/jconsole/JConsoleContext.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jconsole/JConsoleContext.java
rename to jdk/src/jdk.jconsole/share/classes/com/sun/tools/jconsole/JConsoleContext.java
diff --git a/jdk/src/share/classes/com/sun/tools/jconsole/JConsolePlugin.java b/jdk/src/jdk.jconsole/share/classes/com/sun/tools/jconsole/JConsolePlugin.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jconsole/JConsolePlugin.java
rename to jdk/src/jdk.jconsole/share/classes/com/sun/tools/jconsole/JConsolePlugin.java
diff --git a/jdk/src/share/classes/com/sun/tools/jconsole/package-info.java b/jdk/src/jdk.jconsole/share/classes/com/sun/tools/jconsole/package-info.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jconsole/package-info.java
rename to jdk/src/jdk.jconsole/share/classes/com/sun/tools/jconsole/package-info.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/AboutDialog.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/AboutDialog.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/AboutDialog.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/AboutDialog.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/BorderedComponent.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/BorderedComponent.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/BorderedComponent.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/BorderedComponent.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/ClassTab.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/ClassTab.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/ClassTab.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/ClassTab.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/ConnectDialog.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/ConnectDialog.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/ConnectDialog.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/ConnectDialog.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/CreateMBeanDialog.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/CreateMBeanDialog.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/CreateMBeanDialog.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/CreateMBeanDialog.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/ExceptionSafePlugin.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/ExceptionSafePlugin.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/ExceptionSafePlugin.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/ExceptionSafePlugin.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/Formatter.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/Formatter.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/Formatter.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/Formatter.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/HTMLPane.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/HTMLPane.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/HTMLPane.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/HTMLPane.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/InternalDialog.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/InternalDialog.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/InternalDialog.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/InternalDialog.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/JConsole.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/JConsole.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/JConsole.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/JConsole.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/LabeledComponent.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/LabeledComponent.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/LabeledComponent.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/LabeledComponent.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/LocalVirtualMachine.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/LocalVirtualMachine.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/LocalVirtualMachine.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/LocalVirtualMachine.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/MBeansTab.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/MBeansTab.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/MBeansTab.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/MBeansTab.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/MaximizableInternalFrame.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/MaximizableInternalFrame.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/MaximizableInternalFrame.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/MaximizableInternalFrame.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/MemoryPoolProxy.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/MemoryPoolProxy.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/MemoryPoolProxy.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/MemoryPoolProxy.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/MemoryPoolStat.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/MemoryPoolStat.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/MemoryPoolStat.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/MemoryPoolStat.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/MemoryTab.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/MemoryTab.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/MemoryTab.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/MemoryTab.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/Messages.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/Messages.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/Messages.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/Messages.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/OutputViewer.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/OutputViewer.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/OutputViewer.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/OutputViewer.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/OverviewPanel.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/OverviewPanel.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/OverviewPanel.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/OverviewPanel.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/OverviewTab.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/OverviewTab.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/OverviewTab.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/OverviewTab.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/Plotter.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/Plotter.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/Plotter.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/Plotter.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/PlotterPanel.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/PlotterPanel.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/PlotterPanel.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/PlotterPanel.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/ProxyClient.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/ProxyClient.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/ProxyClient.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/ProxyClient.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/Resources.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/Resources.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/Resources.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/Resources.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/SheetDialog.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/SheetDialog.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/SheetDialog.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/SheetDialog.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/SummaryTab.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/SummaryTab.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/SummaryTab.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/SummaryTab.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/Tab.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/Tab.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/Tab.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/Tab.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/ThreadTab.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/ThreadTab.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/ThreadTab.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/ThreadTab.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/TimeComboBox.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/TimeComboBox.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/TimeComboBox.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/TimeComboBox.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/Utilities.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/Utilities.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/Utilities.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/Utilities.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/VMInternalFrame.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/VMInternalFrame.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/VMInternalFrame.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/VMInternalFrame.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/VMPanel.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/VMPanel.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/VMPanel.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/VMPanel.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/VariableGridLayout.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/VariableGridLayout.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/VariableGridLayout.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/VariableGridLayout.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/Version.java.template b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/Version.java.template
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/Version.java.template
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/Version.java.template
diff --git a/jdk/src/share/classes/sun/tools/jconsole/Worker.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/Worker.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/Worker.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/Worker.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/inspector/IconManager.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/IconManager.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/inspector/IconManager.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/IconManager.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/inspector/OperationEntry.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/OperationEntry.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/inspector/OperationEntry.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/OperationEntry.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/inspector/TableSorter.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/TableSorter.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/inspector/TableSorter.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/TableSorter.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/inspector/ThreadDialog.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/ThreadDialog.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/inspector/ThreadDialog.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/ThreadDialog.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/inspector/Utils.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/Utils.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/inspector/Utils.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/Utils.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/inspector/XDataViewer.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XDataViewer.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/inspector/XDataViewer.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XDataViewer.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/inspector/XMBean.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XMBean.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/inspector/XMBean.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XMBean.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/inspector/XMBeanAttributes.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XMBeanAttributes.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/inspector/XMBeanAttributes.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XMBeanAttributes.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/inspector/XMBeanInfo.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XMBeanInfo.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/inspector/XMBeanInfo.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XMBeanInfo.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/inspector/XMBeanNotifications.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XMBeanNotifications.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/inspector/XMBeanNotifications.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XMBeanNotifications.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/inspector/XMBeanOperations.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XMBeanOperations.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/inspector/XMBeanOperations.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XMBeanOperations.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/inspector/XNodeInfo.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XNodeInfo.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/inspector/XNodeInfo.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XNodeInfo.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/inspector/XObject.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XObject.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/inspector/XObject.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XObject.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/inspector/XOpenTypeViewer.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XOpenTypeViewer.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/inspector/XOpenTypeViewer.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XOpenTypeViewer.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/inspector/XOperations.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XOperations.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/inspector/XOperations.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XOperations.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/inspector/XPlotter.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XPlotter.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/inspector/XPlotter.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XPlotter.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/inspector/XPlottingViewer.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XPlottingViewer.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/inspector/XPlottingViewer.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XPlottingViewer.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/inspector/XSheet.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XSheet.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/inspector/XSheet.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XSheet.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/inspector/XTable.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XTable.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/inspector/XTable.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XTable.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/inspector/XTextField.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XTextField.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/inspector/XTextField.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XTextField.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/inspector/XTextFieldEditor.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XTextFieldEditor.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/inspector/XTextFieldEditor.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XTextFieldEditor.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/inspector/XTree.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XTree.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/inspector/XTree.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XTree.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/inspector/XTreeRenderer.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XTreeRenderer.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/inspector/XTreeRenderer.java
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XTreeRenderer.java
diff --git a/jdk/src/share/classes/sun/tools/jconsole/resources/brandlogo.png b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/brandlogo.png
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/resources/brandlogo.png
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/brandlogo.png
diff --git a/jdk/src/share/classes/sun/tools/jconsole/resources/collapse-winlf.png b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/collapse-winlf.png
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/resources/collapse-winlf.png
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/collapse-winlf.png
diff --git a/jdk/src/share/classes/sun/tools/jconsole/resources/connected16.png b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/connected16.png
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/resources/connected16.png
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/connected16.png
diff --git a/jdk/src/share/classes/sun/tools/jconsole/resources/connected24.png b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/connected24.png
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/resources/connected24.png
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/connected24.png
diff --git a/jdk/src/share/classes/sun/tools/jconsole/resources/disconnected16.png b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/disconnected16.png
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/resources/disconnected16.png
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/disconnected16.png
diff --git a/jdk/src/share/classes/sun/tools/jconsole/resources/disconnected24.png b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/disconnected24.png
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/resources/disconnected24.png
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/disconnected24.png
diff --git a/jdk/src/share/classes/sun/tools/jconsole/resources/expand-winlf.png b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/expand-winlf.png
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/resources/expand-winlf.png
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/expand-winlf.png
diff --git a/jdk/src/share/classes/sun/tools/jconsole/resources/masthead-left.png b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/masthead-left.png
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/resources/masthead-left.png
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/masthead-left.png
diff --git a/jdk/src/share/classes/sun/tools/jconsole/resources/masthead-right.png b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/masthead-right.png
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/resources/masthead-right.png
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/masthead-right.png
diff --git a/jdk/src/share/classes/sun/tools/jconsole/resources/mbean.gif b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/mbean.gif
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/resources/mbean.gif
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/mbean.gif
diff --git a/jdk/src/share/classes/sun/tools/jconsole/resources/mbeanserverdelegate.gif b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/mbeanserverdelegate.gif
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/resources/mbeanserverdelegate.gif
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/mbeanserverdelegate.gif
diff --git a/jdk/src/share/classes/sun/tools/jconsole/resources/messages.properties b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages.properties
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/resources/messages.properties
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages.properties
diff --git a/jdk/src/share/classes/sun/tools/jconsole/resources/messages_ja.properties b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_ja.properties
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/resources/messages_ja.properties
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_ja.properties
diff --git a/jdk/src/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties
diff --git a/jdk/src/share/classes/sun/tools/jconsole/resources/xobject.gif b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/xobject.gif
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jconsole/resources/xobject.gif
rename to jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/xobject.gif
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/META-INF/services/com.sun.jdi.connect.Connector b/jdk/src/jdk.jdi/share/classes/META-INF/services/com.sun.jdi.connect.Connector
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/META-INF/services/com.sun.jdi.connect.Connector
rename to jdk/src/jdk.jdi/share/classes/META-INF/services/com.sun.jdi.connect.Connector
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/META-INF/services/com.sun.jdi.connect.spi.TransportService b/jdk/src/jdk.jdi/share/classes/META-INF/services/com.sun.jdi.connect.spi.TransportService
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/META-INF/services/com.sun.jdi.connect.spi.TransportService
rename to jdk/src/jdk.jdi/share/classes/META-INF/services/com.sun.jdi.connect.spi.TransportService
diff --git a/jdk/src/share/classes/com/sun/jdi/AbsentInformationException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/AbsentInformationException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/AbsentInformationException.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/AbsentInformationException.java
diff --git a/jdk/src/share/classes/com/sun/jdi/Accessible.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Accessible.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/Accessible.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/Accessible.java
diff --git a/jdk/src/share/classes/com/sun/jdi/ArrayReference.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ArrayReference.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/ArrayReference.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/ArrayReference.java
diff --git a/jdk/src/share/classes/com/sun/jdi/ArrayType.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ArrayType.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/ArrayType.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/ArrayType.java
diff --git a/jdk/src/share/classes/com/sun/jdi/BooleanType.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/BooleanType.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/BooleanType.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/BooleanType.java
diff --git a/jdk/src/share/classes/com/sun/jdi/BooleanValue.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/BooleanValue.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/BooleanValue.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/BooleanValue.java
diff --git a/jdk/src/share/classes/com/sun/jdi/Bootstrap.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Bootstrap.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/Bootstrap.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/Bootstrap.java
diff --git a/jdk/src/share/classes/com/sun/jdi/ByteType.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ByteType.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/ByteType.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/ByteType.java
diff --git a/jdk/src/share/classes/com/sun/jdi/ByteValue.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ByteValue.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/ByteValue.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/ByteValue.java
diff --git a/jdk/src/share/classes/com/sun/jdi/CharType.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/CharType.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/CharType.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/CharType.java
diff --git a/jdk/src/share/classes/com/sun/jdi/CharValue.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/CharValue.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/CharValue.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/CharValue.java
diff --git a/jdk/src/share/classes/com/sun/jdi/ClassLoaderReference.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassLoaderReference.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/ClassLoaderReference.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassLoaderReference.java
diff --git a/jdk/src/share/classes/com/sun/jdi/ClassNotLoadedException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotLoadedException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/ClassNotLoadedException.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotLoadedException.java
diff --git a/jdk/src/share/classes/com/sun/jdi/ClassNotPreparedException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotPreparedException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/ClassNotPreparedException.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotPreparedException.java
diff --git a/jdk/src/share/classes/com/sun/jdi/ClassObjectReference.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassObjectReference.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/ClassObjectReference.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassObjectReference.java
diff --git a/jdk/src/share/classes/com/sun/jdi/ClassType.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassType.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/ClassType.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassType.java
diff --git a/jdk/src/share/classes/com/sun/jdi/DoubleType.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/DoubleType.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/DoubleType.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/DoubleType.java
diff --git a/jdk/src/share/classes/com/sun/jdi/DoubleValue.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/DoubleValue.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/DoubleValue.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/DoubleValue.java
diff --git a/jdk/src/share/classes/com/sun/jdi/Field.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Field.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/Field.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/Field.java
diff --git a/jdk/src/share/classes/com/sun/jdi/FloatType.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/FloatType.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/FloatType.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/FloatType.java
diff --git a/jdk/src/share/classes/com/sun/jdi/FloatValue.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/FloatValue.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/FloatValue.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/FloatValue.java
diff --git a/jdk/src/share/classes/com/sun/jdi/IncompatibleThreadStateException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/IncompatibleThreadStateException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/IncompatibleThreadStateException.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/IncompatibleThreadStateException.java
diff --git a/jdk/src/share/classes/com/sun/jdi/InconsistentDebugInfoException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InconsistentDebugInfoException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/InconsistentDebugInfoException.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/InconsistentDebugInfoException.java
diff --git a/jdk/src/share/classes/com/sun/jdi/IntegerType.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/IntegerType.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/IntegerType.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/IntegerType.java
diff --git a/jdk/src/share/classes/com/sun/jdi/IntegerValue.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/IntegerValue.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/IntegerValue.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/IntegerValue.java
diff --git a/jdk/src/share/classes/com/sun/jdi/InterfaceType.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InterfaceType.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/InterfaceType.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/InterfaceType.java
diff --git a/jdk/src/share/classes/com/sun/jdi/InternalException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InternalException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/InternalException.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/InternalException.java
diff --git a/jdk/src/share/classes/com/sun/jdi/InvalidCodeIndexException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvalidCodeIndexException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/InvalidCodeIndexException.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvalidCodeIndexException.java
diff --git a/jdk/src/share/classes/com/sun/jdi/InvalidLineNumberException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvalidLineNumberException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/InvalidLineNumberException.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvalidLineNumberException.java
diff --git a/jdk/src/share/classes/com/sun/jdi/InvalidStackFrameException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvalidStackFrameException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/InvalidStackFrameException.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvalidStackFrameException.java
diff --git a/jdk/src/share/classes/com/sun/jdi/InvalidTypeException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvalidTypeException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/InvalidTypeException.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvalidTypeException.java
diff --git a/jdk/src/share/classes/com/sun/jdi/InvocationException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvocationException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/InvocationException.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvocationException.java
diff --git a/jdk/src/share/classes/com/sun/jdi/JDIPermission.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/JDIPermission.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/JDIPermission.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/JDIPermission.java
diff --git a/jdk/src/share/classes/com/sun/jdi/LocalVariable.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/LocalVariable.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/LocalVariable.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/LocalVariable.java
diff --git a/jdk/src/share/classes/com/sun/jdi/Locatable.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Locatable.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/Locatable.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/Locatable.java
diff --git a/jdk/src/share/classes/com/sun/jdi/Location.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Location.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/Location.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/Location.java
diff --git a/jdk/src/share/classes/com/sun/jdi/LongType.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/LongType.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/LongType.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/LongType.java
diff --git a/jdk/src/share/classes/com/sun/jdi/LongValue.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/LongValue.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/LongValue.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/LongValue.java
diff --git a/jdk/src/share/classes/com/sun/jdi/Method.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Method.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/Method.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/Method.java
diff --git a/jdk/src/share/classes/com/sun/jdi/Mirror.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Mirror.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/Mirror.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/Mirror.java
diff --git a/jdk/src/share/classes/com/sun/jdi/MonitorInfo.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/MonitorInfo.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/MonitorInfo.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/MonitorInfo.java
diff --git a/jdk/src/share/classes/com/sun/jdi/NativeMethodException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/NativeMethodException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/NativeMethodException.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/NativeMethodException.java
diff --git a/jdk/src/share/classes/com/sun/jdi/ObjectCollectedException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ObjectCollectedException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/ObjectCollectedException.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/ObjectCollectedException.java
diff --git a/jdk/src/share/classes/com/sun/jdi/ObjectReference.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ObjectReference.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/ObjectReference.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/ObjectReference.java
diff --git a/jdk/src/share/classes/com/sun/jdi/PathSearchingVirtualMachine.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/PathSearchingVirtualMachine.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/PathSearchingVirtualMachine.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/PathSearchingVirtualMachine.java
diff --git a/jdk/src/share/classes/com/sun/jdi/PrimitiveType.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/PrimitiveType.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/PrimitiveType.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/PrimitiveType.java
diff --git a/jdk/src/share/classes/com/sun/jdi/PrimitiveValue.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/PrimitiveValue.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/PrimitiveValue.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/PrimitiveValue.java
diff --git a/jdk/src/share/classes/com/sun/jdi/ReferenceType.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ReferenceType.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/ReferenceType.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/ReferenceType.java
diff --git a/jdk/src/share/classes/com/sun/jdi/ShortType.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ShortType.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/ShortType.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/ShortType.java
diff --git a/jdk/src/share/classes/com/sun/jdi/ShortValue.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ShortValue.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/ShortValue.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/ShortValue.java
diff --git a/jdk/src/share/classes/com/sun/jdi/StackFrame.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/StackFrame.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/StackFrame.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/StackFrame.java
diff --git a/jdk/src/share/classes/com/sun/jdi/StringReference.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/StringReference.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/StringReference.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/StringReference.java
diff --git a/jdk/src/share/classes/com/sun/jdi/ThreadGroupReference.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ThreadGroupReference.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/ThreadGroupReference.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/ThreadGroupReference.java
diff --git a/jdk/src/share/classes/com/sun/jdi/ThreadReference.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ThreadReference.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/ThreadReference.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/ThreadReference.java
diff --git a/jdk/src/share/classes/com/sun/jdi/Type.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Type.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/Type.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/Type.java
diff --git a/jdk/src/share/classes/com/sun/jdi/TypeComponent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/TypeComponent.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/TypeComponent.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/TypeComponent.java
diff --git a/jdk/src/share/classes/com/sun/jdi/VMCannotBeModifiedException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VMCannotBeModifiedException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/VMCannotBeModifiedException.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/VMCannotBeModifiedException.java
diff --git a/jdk/src/share/classes/com/sun/jdi/VMDisconnectedException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VMDisconnectedException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/VMDisconnectedException.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/VMDisconnectedException.java
diff --git a/jdk/src/share/classes/com/sun/jdi/VMMismatchException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VMMismatchException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/VMMismatchException.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/VMMismatchException.java
diff --git a/jdk/src/share/classes/com/sun/jdi/VMOutOfMemoryException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VMOutOfMemoryException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/VMOutOfMemoryException.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/VMOutOfMemoryException.java
diff --git a/jdk/src/share/classes/com/sun/jdi/Value.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Value.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/Value.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/Value.java
diff --git a/jdk/src/share/classes/com/sun/jdi/VirtualMachine.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachine.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/VirtualMachine.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachine.java
diff --git a/jdk/src/share/classes/com/sun/jdi/VirtualMachineManager.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachineManager.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/VirtualMachineManager.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachineManager.java
diff --git a/jdk/src/share/classes/com/sun/jdi/VoidType.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VoidType.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/VoidType.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/VoidType.java
diff --git a/jdk/src/share/classes/com/sun/jdi/VoidValue.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VoidValue.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/VoidValue.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/VoidValue.java
diff --git a/jdk/src/share/classes/com/sun/jdi/connect/AttachingConnector.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/AttachingConnector.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/connect/AttachingConnector.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/AttachingConnector.java
diff --git a/jdk/src/share/classes/com/sun/jdi/connect/Connector.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/Connector.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/connect/Connector.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/Connector.java
diff --git a/jdk/src/share/classes/com/sun/jdi/connect/IllegalConnectorArgumentsException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/IllegalConnectorArgumentsException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/connect/IllegalConnectorArgumentsException.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/IllegalConnectorArgumentsException.java
diff --git a/jdk/src/share/classes/com/sun/jdi/connect/LaunchingConnector.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/LaunchingConnector.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/connect/LaunchingConnector.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/LaunchingConnector.java
diff --git a/jdk/src/share/classes/com/sun/jdi/connect/ListeningConnector.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/ListeningConnector.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/connect/ListeningConnector.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/ListeningConnector.java
diff --git a/jdk/src/share/classes/com/sun/jdi/connect/Transport.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/Transport.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/connect/Transport.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/Transport.java
diff --git a/jdk/src/share/classes/com/sun/jdi/connect/TransportTimeoutException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/TransportTimeoutException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/connect/TransportTimeoutException.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/TransportTimeoutException.java
diff --git a/jdk/src/share/classes/com/sun/jdi/connect/VMStartException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/VMStartException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/connect/VMStartException.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/VMStartException.java
diff --git a/jdk/src/share/classes/com/sun/jdi/connect/package-info.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/package-info.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/connect/package-info.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/package-info.java
diff --git a/jdk/src/share/classes/com/sun/jdi/connect/spi/ClosedConnectionException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/ClosedConnectionException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/connect/spi/ClosedConnectionException.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/ClosedConnectionException.java
diff --git a/jdk/src/share/classes/com/sun/jdi/connect/spi/Connection.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/Connection.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/connect/spi/Connection.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/Connection.java
diff --git a/jdk/src/share/classes/com/sun/jdi/connect/spi/TransportService.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/TransportService.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/connect/spi/TransportService.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/TransportService.java
diff --git a/jdk/src/share/classes/com/sun/jdi/connect/spi/package-info.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/package-info.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/connect/spi/package-info.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/package-info.java
diff --git a/jdk/src/share/classes/com/sun/jdi/doc-files/signature.html b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/doc-files/signature.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/doc-files/signature.html
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/doc-files/signature.html
diff --git a/jdk/src/share/classes/com/sun/jdi/event/AccessWatchpointEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/AccessWatchpointEvent.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/event/AccessWatchpointEvent.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/AccessWatchpointEvent.java
diff --git a/jdk/src/share/classes/com/sun/jdi/event/BreakpointEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/BreakpointEvent.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/event/BreakpointEvent.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/BreakpointEvent.java
diff --git a/jdk/src/share/classes/com/sun/jdi/event/ClassPrepareEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ClassPrepareEvent.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/event/ClassPrepareEvent.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ClassPrepareEvent.java
diff --git a/jdk/src/share/classes/com/sun/jdi/event/ClassUnloadEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ClassUnloadEvent.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/event/ClassUnloadEvent.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ClassUnloadEvent.java
diff --git a/jdk/src/share/classes/com/sun/jdi/event/Event.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/Event.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/event/Event.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/Event.java
diff --git a/jdk/src/share/classes/com/sun/jdi/event/EventIterator.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/EventIterator.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/event/EventIterator.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/EventIterator.java
diff --git a/jdk/src/share/classes/com/sun/jdi/event/EventQueue.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/EventQueue.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/event/EventQueue.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/EventQueue.java
diff --git a/jdk/src/share/classes/com/sun/jdi/event/EventSet.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/EventSet.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/event/EventSet.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/EventSet.java
diff --git a/jdk/src/share/classes/com/sun/jdi/event/ExceptionEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ExceptionEvent.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/event/ExceptionEvent.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ExceptionEvent.java
diff --git a/jdk/src/share/classes/com/sun/jdi/event/LocatableEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/LocatableEvent.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/event/LocatableEvent.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/LocatableEvent.java
diff --git a/jdk/src/share/classes/com/sun/jdi/event/MethodEntryEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MethodEntryEvent.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/event/MethodEntryEvent.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MethodEntryEvent.java
diff --git a/jdk/src/share/classes/com/sun/jdi/event/MethodExitEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MethodExitEvent.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/event/MethodExitEvent.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MethodExitEvent.java
diff --git a/jdk/src/share/classes/com/sun/jdi/event/ModificationWatchpointEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ModificationWatchpointEvent.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/event/ModificationWatchpointEvent.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ModificationWatchpointEvent.java
diff --git a/jdk/src/share/classes/com/sun/jdi/event/MonitorContendedEnterEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorContendedEnterEvent.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/event/MonitorContendedEnterEvent.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorContendedEnterEvent.java
diff --git a/jdk/src/share/classes/com/sun/jdi/event/MonitorContendedEnteredEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorContendedEnteredEvent.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/event/MonitorContendedEnteredEvent.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorContendedEnteredEvent.java
diff --git a/jdk/src/share/classes/com/sun/jdi/event/MonitorWaitEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorWaitEvent.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/event/MonitorWaitEvent.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorWaitEvent.java
diff --git a/jdk/src/share/classes/com/sun/jdi/event/MonitorWaitedEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorWaitedEvent.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/event/MonitorWaitedEvent.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorWaitedEvent.java
diff --git a/jdk/src/share/classes/com/sun/jdi/event/StepEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/StepEvent.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/event/StepEvent.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/StepEvent.java
diff --git a/jdk/src/share/classes/com/sun/jdi/event/ThreadDeathEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ThreadDeathEvent.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/event/ThreadDeathEvent.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ThreadDeathEvent.java
diff --git a/jdk/src/share/classes/com/sun/jdi/event/ThreadStartEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ThreadStartEvent.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/event/ThreadStartEvent.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ThreadStartEvent.java
diff --git a/jdk/src/share/classes/com/sun/jdi/event/VMDeathEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/VMDeathEvent.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/event/VMDeathEvent.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/VMDeathEvent.java
diff --git a/jdk/src/share/classes/com/sun/jdi/event/VMDisconnectEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/VMDisconnectEvent.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/event/VMDisconnectEvent.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/VMDisconnectEvent.java
diff --git a/jdk/src/share/classes/com/sun/jdi/event/VMStartEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/VMStartEvent.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/event/VMStartEvent.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/VMStartEvent.java
diff --git a/jdk/src/share/classes/com/sun/jdi/event/WatchpointEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/WatchpointEvent.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/event/WatchpointEvent.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/WatchpointEvent.java
diff --git a/jdk/src/share/classes/com/sun/jdi/event/package-info.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/package-info.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/event/package-info.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/package-info.java
diff --git a/jdk/src/share/classes/com/sun/jdi/package-info.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/package-info.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/package-info.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/package-info.java
diff --git a/jdk/src/share/classes/com/sun/jdi/request/AccessWatchpointRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/AccessWatchpointRequest.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/request/AccessWatchpointRequest.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/AccessWatchpointRequest.java
diff --git a/jdk/src/share/classes/com/sun/jdi/request/BreakpointRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/BreakpointRequest.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/request/BreakpointRequest.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/BreakpointRequest.java
diff --git a/jdk/src/share/classes/com/sun/jdi/request/ClassPrepareRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ClassPrepareRequest.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/request/ClassPrepareRequest.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ClassPrepareRequest.java
diff --git a/jdk/src/share/classes/com/sun/jdi/request/ClassUnloadRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ClassUnloadRequest.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/request/ClassUnloadRequest.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ClassUnloadRequest.java
diff --git a/jdk/src/share/classes/com/sun/jdi/request/DuplicateRequestException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/DuplicateRequestException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/request/DuplicateRequestException.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/DuplicateRequestException.java
diff --git a/jdk/src/share/classes/com/sun/jdi/request/EventRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/EventRequest.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/request/EventRequest.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/EventRequest.java
diff --git a/jdk/src/share/classes/com/sun/jdi/request/EventRequestManager.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/EventRequestManager.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/request/EventRequestManager.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/EventRequestManager.java
diff --git a/jdk/src/share/classes/com/sun/jdi/request/ExceptionRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ExceptionRequest.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/request/ExceptionRequest.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ExceptionRequest.java
diff --git a/jdk/src/share/classes/com/sun/jdi/request/InvalidRequestStateException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/InvalidRequestStateException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/request/InvalidRequestStateException.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/InvalidRequestStateException.java
diff --git a/jdk/src/share/classes/com/sun/jdi/request/MethodEntryRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MethodEntryRequest.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/request/MethodEntryRequest.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MethodEntryRequest.java
diff --git a/jdk/src/share/classes/com/sun/jdi/request/MethodExitRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MethodExitRequest.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/request/MethodExitRequest.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MethodExitRequest.java
diff --git a/jdk/src/share/classes/com/sun/jdi/request/ModificationWatchpointRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ModificationWatchpointRequest.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/request/ModificationWatchpointRequest.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ModificationWatchpointRequest.java
diff --git a/jdk/src/share/classes/com/sun/jdi/request/MonitorContendedEnterRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorContendedEnterRequest.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/request/MonitorContendedEnterRequest.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorContendedEnterRequest.java
diff --git a/jdk/src/share/classes/com/sun/jdi/request/MonitorContendedEnteredRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorContendedEnteredRequest.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/request/MonitorContendedEnteredRequest.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorContendedEnteredRequest.java
diff --git a/jdk/src/share/classes/com/sun/jdi/request/MonitorWaitRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorWaitRequest.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/request/MonitorWaitRequest.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorWaitRequest.java
diff --git a/jdk/src/share/classes/com/sun/jdi/request/MonitorWaitedRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorWaitedRequest.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/request/MonitorWaitedRequest.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorWaitedRequest.java
diff --git a/jdk/src/share/classes/com/sun/jdi/request/StepRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/StepRequest.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/request/StepRequest.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/StepRequest.java
diff --git a/jdk/src/share/classes/com/sun/jdi/request/ThreadDeathRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadDeathRequest.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/request/ThreadDeathRequest.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadDeathRequest.java
diff --git a/jdk/src/share/classes/com/sun/jdi/request/ThreadStartRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadStartRequest.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/request/ThreadStartRequest.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadStartRequest.java
diff --git a/jdk/src/share/classes/com/sun/jdi/request/VMDeathRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/VMDeathRequest.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/request/VMDeathRequest.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/VMDeathRequest.java
diff --git a/jdk/src/share/classes/com/sun/jdi/request/WatchpointRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/WatchpointRequest.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/request/WatchpointRequest.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/WatchpointRequest.java
diff --git a/jdk/src/share/classes/com/sun/jdi/request/package-info.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/package-info.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jdi/request/package-info.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/package-info.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/expr/ASCII_UCodeESC_CharStream.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/ASCII_UCodeESC_CharStream.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/expr/ASCII_UCodeESC_CharStream.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/ASCII_UCodeESC_CharStream.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParser.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/ExpressionParser.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParser.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/ExpressionParser.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParserConstants.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/ExpressionParserConstants.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParserConstants.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/ExpressionParserConstants.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParserTokenManager.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/ExpressionParserTokenManager.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParserTokenManager.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/ExpressionParserTokenManager.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/expr/JavaCharStream.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/JavaCharStream.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/expr/JavaCharStream.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/JavaCharStream.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/expr/LValue.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/LValue.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/expr/LValue.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/LValue.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/expr/ParseException.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/ParseException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/expr/ParseException.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/ParseException.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/expr/Token.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/Token.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/expr/Token.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/Token.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/tty/AccessWatchpointSpec.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/AccessWatchpointSpec.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/tty/AccessWatchpointSpec.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/AccessWatchpointSpec.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/tty/AmbiguousMethodException.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/AmbiguousMethodException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/tty/AmbiguousMethodException.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/AmbiguousMethodException.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/tty/BreakpointSpec.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/BreakpointSpec.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/tty/BreakpointSpec.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/BreakpointSpec.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/tty/Commands.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/Commands.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/tty/Commands.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/Commands.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/tty/Env.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/Env.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/tty/Env.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/Env.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/tty/EventHandler.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/tty/EventHandler.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventHandler.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/tty/EventNotifier.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventNotifier.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/tty/EventNotifier.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventNotifier.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpec.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventRequestSpec.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpec.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventRequestSpec.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpecList.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventRequestSpecList.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpecList.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventRequestSpecList.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/tty/ExceptionSpec.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ExceptionSpec.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/tty/ExceptionSpec.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ExceptionSpec.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/tty/LineNotFoundException.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/LineNotFoundException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/tty/LineNotFoundException.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/LineNotFoundException.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/tty/MalformedMemberNameException.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/MalformedMemberNameException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/tty/MalformedMemberNameException.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/MalformedMemberNameException.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/tty/MessageOutput.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/MessageOutput.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/tty/MessageOutput.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/MessageOutput.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/tty/ModificationWatchpointSpec.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ModificationWatchpointSpec.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/tty/ModificationWatchpointSpec.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ModificationWatchpointSpec.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/tty/PatternReferenceTypeSpec.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/PatternReferenceTypeSpec.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/tty/PatternReferenceTypeSpec.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/PatternReferenceTypeSpec.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/tty/ReferenceTypeSpec.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ReferenceTypeSpec.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/tty/ReferenceTypeSpec.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ReferenceTypeSpec.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/tty/SourceMapper.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/SourceMapper.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/tty/SourceMapper.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/SourceMapper.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTY.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/tty/TTY.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/tty/ThreadGroupIterator.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ThreadGroupIterator.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/tty/ThreadGroupIterator.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ThreadGroupIterator.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/tty/ThreadInfo.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ThreadInfo.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/tty/ThreadInfo.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ThreadInfo.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/tty/ThreadIterator.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ThreadIterator.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/tty/ThreadIterator.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ThreadIterator.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/tty/VMConnection.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/VMConnection.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/tty/VMConnection.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/VMConnection.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/tty/VMNotConnectedException.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/VMNotConnectedException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/tty/VMNotConnectedException.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/VMNotConnectedException.java
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/tty/WatchpointSpec.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/WatchpointSpec.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/example/debug/tty/WatchpointSpec.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/WatchpointSpec.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/AbstractLauncher.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/AbstractLauncher.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/AbstractLauncher.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/AbstractLauncher.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/ArrayReferenceImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ArrayReferenceImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/ArrayReferenceImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ArrayReferenceImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/ArrayTypeImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ArrayTypeImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/ArrayTypeImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ArrayTypeImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/BaseLineInfo.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/BaseLineInfo.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/BaseLineInfo.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/BaseLineInfo.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/BooleanTypeImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/BooleanTypeImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/BooleanTypeImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/BooleanTypeImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/BooleanValueImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/BooleanValueImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/BooleanValueImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/BooleanValueImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/ByteTypeImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ByteTypeImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/ByteTypeImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ByteTypeImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/ByteValueImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ByteValueImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/ByteValueImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ByteValueImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/CharTypeImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/CharTypeImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/CharTypeImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/CharTypeImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/CharValueImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/CharValueImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/CharValueImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/CharValueImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/ClassLoaderReferenceImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ClassLoaderReferenceImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/ClassLoaderReferenceImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ClassLoaderReferenceImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/ClassObjectReferenceImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ClassObjectReferenceImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/ClassObjectReferenceImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ClassObjectReferenceImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/ClassTypeImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ClassTypeImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/ClassTypeImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ClassTypeImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/CommandSender.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/CommandSender.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/CommandSender.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/CommandSender.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/ConcreteMethodImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ConcreteMethodImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/ConcreteMethodImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ConcreteMethodImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/ConnectorImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ConnectorImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/ConnectorImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ConnectorImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/DoubleTypeImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/DoubleTypeImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/DoubleTypeImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/DoubleTypeImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/DoubleValueImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/DoubleValueImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/DoubleValueImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/DoubleValueImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/EventQueueImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/EventQueueImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/EventQueueImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/EventQueueImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/EventRequestManagerImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/EventRequestManagerImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/EventRequestManagerImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/EventRequestManagerImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/EventSetImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/EventSetImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/EventSetImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/EventSetImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/FieldImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/FieldImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/FieldImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/FieldImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/FloatTypeImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/FloatTypeImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/FloatTypeImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/FloatTypeImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/FloatValueImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/FloatValueImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/FloatValueImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/FloatValueImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/GenericAttachingConnector.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/GenericAttachingConnector.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/GenericAttachingConnector.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/GenericAttachingConnector.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/GenericListeningConnector.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/GenericListeningConnector.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/GenericListeningConnector.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/GenericListeningConnector.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/IntegerTypeImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/IntegerTypeImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/IntegerTypeImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/IntegerTypeImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/IntegerValueImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/IntegerValueImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/IntegerValueImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/IntegerValueImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/InterfaceTypeImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/InterfaceTypeImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/InterfaceTypeImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/InterfaceTypeImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/InternalEventHandler.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/InternalEventHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/InternalEventHandler.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/InternalEventHandler.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/InvokableTypeImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/InvokableTypeImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/InvokableTypeImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/InvokableTypeImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/JDWPException.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/JDWPException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/JDWPException.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/JDWPException.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/JNITypeParser.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/JNITypeParser.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/JNITypeParser.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/JNITypeParser.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/LineInfo.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/LineInfo.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/LineInfo.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/LineInfo.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/LocalVariableImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/LocalVariableImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/LocalVariableImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/LocalVariableImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/LocationImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/LocationImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/LocationImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/LocationImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/LockObject.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/LockObject.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/LockObject.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/LockObject.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/LongTypeImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/LongTypeImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/LongTypeImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/LongTypeImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/LongValueImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/LongValueImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/LongValueImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/LongValueImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/MethodImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/MethodImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/MethodImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/MethodImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/MirrorImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/MirrorImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/MirrorImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/MirrorImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/MonitorInfoImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/MonitorInfoImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/MonitorInfoImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/MonitorInfoImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/NonConcreteMethodImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/NonConcreteMethodImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/NonConcreteMethodImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/NonConcreteMethodImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/ObjectReferenceImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ObjectReferenceImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/ObjectReferenceImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ObjectReferenceImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/ObsoleteMethodImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ObsoleteMethodImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/ObsoleteMethodImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ObsoleteMethodImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/Packet.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/Packet.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/Packet.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/Packet.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/PacketStream.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/PacketStream.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/PacketStream.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/PacketStream.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/PrimitiveTypeImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/PrimitiveTypeImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/PrimitiveTypeImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/PrimitiveTypeImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/PrimitiveValueImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/PrimitiveValueImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/PrimitiveValueImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/PrimitiveValueImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/ProcessAttachingConnector.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ProcessAttachingConnector.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/ProcessAttachingConnector.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ProcessAttachingConnector.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/RawCommandLineLauncher.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/RawCommandLineLauncher.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/RawCommandLineLauncher.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/RawCommandLineLauncher.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/ReferenceTypeImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ReferenceTypeImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/ReferenceTypeImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ReferenceTypeImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/SDE.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/SDE.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/SDE.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/SDE.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/ShortTypeImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ShortTypeImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/ShortTypeImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ShortTypeImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/ShortValueImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ShortValueImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/ShortValueImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ShortValueImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/SocketAttachingConnector.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/SocketAttachingConnector.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/SocketAttachingConnector.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/SocketAttachingConnector.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/SocketListeningConnector.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/SocketListeningConnector.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/SocketListeningConnector.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/SocketListeningConnector.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/SocketTransportService.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/SocketTransportService.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/SocketTransportService.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/SocketTransportService.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/StackFrameImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/StackFrameImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/StackFrameImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/StackFrameImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/StratumLineInfo.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/StratumLineInfo.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/StratumLineInfo.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/StratumLineInfo.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/StringReferenceImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/StringReferenceImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/StringReferenceImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/StringReferenceImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/TargetVM.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/TargetVM.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/TargetVM.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/TargetVM.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/ThreadAction.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadAction.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/ThreadAction.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadAction.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/ThreadGroupReferenceImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadGroupReferenceImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/ThreadGroupReferenceImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadGroupReferenceImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/ThreadListener.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadListener.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/ThreadListener.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadListener.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/ThreadReferenceImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadReferenceImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/ThreadReferenceImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadReferenceImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/TypeComponentImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/TypeComponentImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/TypeComponentImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/TypeComponentImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/TypeImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/TypeImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/TypeImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/TypeImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/VMAction.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VMAction.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/VMAction.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VMAction.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/VMListener.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VMListener.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/VMListener.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VMListener.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/VMModifiers.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VMModifiers.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/VMModifiers.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VMModifiers.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/VMState.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VMState.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/VMState.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VMState.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/ValueContainer.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ValueContainer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/ValueContainer.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ValueContainer.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/ValueImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ValueImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/ValueImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ValueImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/VirtualMachineManagerImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineManagerImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/VirtualMachineManagerImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineManagerImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/VirtualMachineManagerService.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineManagerService.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/VirtualMachineManagerService.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineManagerService.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/VoidTypeImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VoidTypeImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/VoidTypeImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VoidTypeImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/VoidValueImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VoidValueImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/VoidValueImpl.java
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VoidValueImpl.java
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/resources/jdi.properties b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/resources/jdi.properties
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi.properties
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/resources/jdi_ja.properties b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_ja.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/resources/jdi_ja.properties
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_ja.properties
diff --git a/jdk/src/share/classes/com/sun/tools/jdi/resources/jdi_zh_CN.properties b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_zh_CN.properties
similarity index 100%
rename from jdk/src/share/classes/com/sun/tools/jdi/resources/jdi_zh_CN.properties
rename to jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_zh_CN.properties
diff --git a/jdk/src/share/classes/jdi-overview.html b/jdk/src/jdk.jdi/share/classes/jdi-overview.html
similarity index 100%
rename from jdk/src/share/classes/jdi-overview.html
rename to jdk/src/jdk.jdi/share/classes/jdi-overview.html
diff --git a/jdk/src/share/native/com/sun/tools/jdi/SharedMemory.h b/jdk/src/jdk.jdi/share/native/libdt_shmem/SharedMemory.h
similarity index 100%
rename from jdk/src/share/native/com/sun/tools/jdi/SharedMemory.h
rename to jdk/src/jdk.jdi/share/native/libdt_shmem/SharedMemory.h
diff --git a/jdk/src/share/native/com/sun/tools/jdi/SharedMemoryConnection.c b/jdk/src/jdk.jdi/share/native/libdt_shmem/SharedMemoryConnection.c
similarity index 100%
rename from jdk/src/share/native/com/sun/tools/jdi/SharedMemoryConnection.c
rename to jdk/src/jdk.jdi/share/native/libdt_shmem/SharedMemoryConnection.c
diff --git a/jdk/src/share/native/com/sun/tools/jdi/SharedMemoryTransport.c b/jdk/src/jdk.jdi/share/native/libdt_shmem/SharedMemoryTransport.c
similarity index 100%
rename from jdk/src/share/native/com/sun/tools/jdi/SharedMemoryTransport.c
rename to jdk/src/jdk.jdi/share/native/libdt_shmem/SharedMemoryTransport.c
diff --git a/jdk/src/share/transport/shmem/shmemBack.c b/jdk/src/jdk.jdi/share/native/libdt_shmem/shmemBack.c
similarity index 100%
rename from jdk/src/share/transport/shmem/shmemBack.c
rename to jdk/src/jdk.jdi/share/native/libdt_shmem/shmemBack.c
diff --git a/jdk/src/share/transport/shmem/shmemBase.c b/jdk/src/jdk.jdi/share/native/libdt_shmem/shmemBase.c
similarity index 100%
rename from jdk/src/share/transport/shmem/shmemBase.c
rename to jdk/src/jdk.jdi/share/native/libdt_shmem/shmemBase.c
diff --git a/jdk/src/share/transport/shmem/shmemBase.h b/jdk/src/jdk.jdi/share/native/libdt_shmem/shmemBase.h
similarity index 100%
rename from jdk/src/share/transport/shmem/shmemBase.h
rename to jdk/src/jdk.jdi/share/native/libdt_shmem/shmemBase.h
diff --git a/jdk/src/share/transport/shmem/sysShmem.h b/jdk/src/jdk.jdi/share/native/libdt_shmem/sysShmem.h
similarity index 100%
rename from jdk/src/share/transport/shmem/sysShmem.h
rename to jdk/src/jdk.jdi/share/native/libdt_shmem/sysShmem.h
diff --git a/jdk/src/windows/classes/com/sun/tools/jdi/SharedMemoryAttachingConnector.java b/jdk/src/jdk.jdi/windows/classes/com/sun/tools/jdi/SharedMemoryAttachingConnector.java
similarity index 100%
rename from jdk/src/windows/classes/com/sun/tools/jdi/SharedMemoryAttachingConnector.java
rename to jdk/src/jdk.jdi/windows/classes/com/sun/tools/jdi/SharedMemoryAttachingConnector.java
diff --git a/jdk/src/windows/classes/com/sun/tools/jdi/SharedMemoryConnection.java b/jdk/src/jdk.jdi/windows/classes/com/sun/tools/jdi/SharedMemoryConnection.java
similarity index 100%
rename from jdk/src/windows/classes/com/sun/tools/jdi/SharedMemoryConnection.java
rename to jdk/src/jdk.jdi/windows/classes/com/sun/tools/jdi/SharedMemoryConnection.java
diff --git a/jdk/src/windows/classes/com/sun/tools/jdi/SharedMemoryListeningConnector.java b/jdk/src/jdk.jdi/windows/classes/com/sun/tools/jdi/SharedMemoryListeningConnector.java
similarity index 100%
rename from jdk/src/windows/classes/com/sun/tools/jdi/SharedMemoryListeningConnector.java
rename to jdk/src/jdk.jdi/windows/classes/com/sun/tools/jdi/SharedMemoryListeningConnector.java
diff --git a/jdk/src/windows/classes/com/sun/tools/jdi/SharedMemoryTransportService.java b/jdk/src/jdk.jdi/windows/classes/com/sun/tools/jdi/SharedMemoryTransportService.java
similarity index 100%
rename from jdk/src/windows/classes/com/sun/tools/jdi/SharedMemoryTransportService.java
rename to jdk/src/jdk.jdi/windows/classes/com/sun/tools/jdi/SharedMemoryTransportService.java
diff --git a/jdk/src/windows/classes/com/sun/tools/jdi/SunSDK.java b/jdk/src/jdk.jdi/windows/classes/com/sun/tools/jdi/SunSDK.java
similarity index 100%
rename from jdk/src/windows/classes/com/sun/tools/jdi/SunSDK.java
rename to jdk/src/jdk.jdi/windows/classes/com/sun/tools/jdi/SunSDK.java
diff --git a/jdk/src/windows/transport/shmem/shmem_md.c b/jdk/src/jdk.jdi/windows/native/libdt_shmem/shmem_md.c
similarity index 100%
rename from jdk/src/windows/transport/shmem/shmem_md.c
rename to jdk/src/jdk.jdi/windows/native/libdt_shmem/shmem_md.c
diff --git a/jdk/src/windows/transport/shmem/shmem_md.h b/jdk/src/jdk.jdi/windows/native/libdt_shmem/shmem_md.h
similarity index 100%
rename from jdk/src/windows/transport/shmem/shmem_md.h
rename to jdk/src/jdk.jdi/windows/native/libdt_shmem/shmem_md.h
diff --git a/jdk/src/share/javavm/export/jdwpTransport.h b/jdk/src/jdk.jdwp.agent/share/native/include/jdwpTransport.h
similarity index 100%
rename from jdk/src/share/javavm/export/jdwpTransport.h
rename to jdk/src/jdk.jdwp.agent/share/native/include/jdwpTransport.h
diff --git a/jdk/src/share/transport/socket/socketTransport.c b/jdk/src/jdk.jdwp.agent/share/native/libdt_socket/socketTransport.c
similarity index 100%
rename from jdk/src/share/transport/socket/socketTransport.c
rename to jdk/src/jdk.jdwp.agent/share/native/libdt_socket/socketTransport.c
diff --git a/jdk/src/share/transport/socket/socketTransport.h b/jdk/src/jdk.jdwp.agent/share/native/libdt_socket/socketTransport.h
similarity index 100%
rename from jdk/src/share/transport/socket/socketTransport.h
rename to jdk/src/jdk.jdwp.agent/share/native/libdt_socket/socketTransport.h
diff --git a/jdk/src/share/transport/socket/sysSocket.h b/jdk/src/jdk.jdwp.agent/share/native/libdt_socket/sysSocket.h
similarity index 100%
rename from jdk/src/share/transport/socket/sysSocket.h
rename to jdk/src/jdk.jdwp.agent/share/native/libdt_socket/sysSocket.h
diff --git a/jdk/src/share/back/ArrayReferenceImpl.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ArrayReferenceImpl.c
similarity index 100%
rename from jdk/src/share/back/ArrayReferenceImpl.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/ArrayReferenceImpl.c
diff --git a/jdk/src/share/back/ArrayReferenceImpl.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ArrayReferenceImpl.h
similarity index 100%
rename from jdk/src/share/back/ArrayReferenceImpl.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/ArrayReferenceImpl.h
diff --git a/jdk/src/share/back/ArrayTypeImpl.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ArrayTypeImpl.c
similarity index 100%
rename from jdk/src/share/back/ArrayTypeImpl.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/ArrayTypeImpl.c
diff --git a/jdk/src/share/back/ArrayTypeImpl.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ArrayTypeImpl.h
similarity index 100%
rename from jdk/src/share/back/ArrayTypeImpl.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/ArrayTypeImpl.h
diff --git a/jdk/src/share/back/ClassLoaderReferenceImpl.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ClassLoaderReferenceImpl.c
similarity index 100%
rename from jdk/src/share/back/ClassLoaderReferenceImpl.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/ClassLoaderReferenceImpl.c
diff --git a/jdk/src/share/back/ClassLoaderReferenceImpl.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ClassLoaderReferenceImpl.h
similarity index 100%
rename from jdk/src/share/back/ClassLoaderReferenceImpl.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/ClassLoaderReferenceImpl.h
diff --git a/jdk/src/share/back/ClassObjectReferenceImpl.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ClassObjectReferenceImpl.c
similarity index 100%
rename from jdk/src/share/back/ClassObjectReferenceImpl.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/ClassObjectReferenceImpl.c
diff --git a/jdk/src/share/back/ClassObjectReferenceImpl.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ClassObjectReferenceImpl.h
similarity index 100%
rename from jdk/src/share/back/ClassObjectReferenceImpl.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/ClassObjectReferenceImpl.h
diff --git a/jdk/src/share/back/ClassTypeImpl.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ClassTypeImpl.c
similarity index 100%
rename from jdk/src/share/back/ClassTypeImpl.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/ClassTypeImpl.c
diff --git a/jdk/src/share/back/ClassTypeImpl.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ClassTypeImpl.h
similarity index 100%
rename from jdk/src/share/back/ClassTypeImpl.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/ClassTypeImpl.h
diff --git a/jdk/src/share/back/EventRequestImpl.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/EventRequestImpl.c
similarity index 100%
rename from jdk/src/share/back/EventRequestImpl.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/EventRequestImpl.c
diff --git a/jdk/src/share/back/EventRequestImpl.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/EventRequestImpl.h
similarity index 100%
rename from jdk/src/share/back/EventRequestImpl.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/EventRequestImpl.h
diff --git a/jdk/src/share/back/FieldImpl.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/FieldImpl.c
similarity index 100%
rename from jdk/src/share/back/FieldImpl.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/FieldImpl.c
diff --git a/jdk/src/share/back/FieldImpl.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/FieldImpl.h
similarity index 100%
rename from jdk/src/share/back/FieldImpl.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/FieldImpl.h
diff --git a/jdk/src/share/back/FrameID.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/FrameID.c
similarity index 100%
rename from jdk/src/share/back/FrameID.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/FrameID.c
diff --git a/jdk/src/share/back/FrameID.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/FrameID.h
similarity index 100%
rename from jdk/src/share/back/FrameID.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/FrameID.h
diff --git a/jdk/src/share/back/InterfaceTypeImpl.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/InterfaceTypeImpl.c
similarity index 100%
rename from jdk/src/share/back/InterfaceTypeImpl.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/InterfaceTypeImpl.c
diff --git a/jdk/src/share/back/InterfaceTypeImpl.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/InterfaceTypeImpl.h
similarity index 100%
rename from jdk/src/share/back/InterfaceTypeImpl.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/InterfaceTypeImpl.h
diff --git a/jdk/src/share/back/JDWP.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/JDWP.h
similarity index 100%
rename from jdk/src/share/back/JDWP.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/JDWP.h
diff --git a/jdk/src/share/back/MethodImpl.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/MethodImpl.c
similarity index 100%
rename from jdk/src/share/back/MethodImpl.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/MethodImpl.c
diff --git a/jdk/src/share/back/MethodImpl.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/MethodImpl.h
similarity index 100%
rename from jdk/src/share/back/MethodImpl.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/MethodImpl.h
diff --git a/jdk/src/share/back/ObjectReferenceImpl.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ObjectReferenceImpl.c
similarity index 100%
rename from jdk/src/share/back/ObjectReferenceImpl.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/ObjectReferenceImpl.c
diff --git a/jdk/src/share/back/ObjectReferenceImpl.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ObjectReferenceImpl.h
similarity index 100%
rename from jdk/src/share/back/ObjectReferenceImpl.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/ObjectReferenceImpl.h
diff --git a/jdk/src/share/back/ReferenceTypeImpl.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ReferenceTypeImpl.c
similarity index 100%
rename from jdk/src/share/back/ReferenceTypeImpl.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/ReferenceTypeImpl.c
diff --git a/jdk/src/share/back/ReferenceTypeImpl.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ReferenceTypeImpl.h
similarity index 100%
rename from jdk/src/share/back/ReferenceTypeImpl.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/ReferenceTypeImpl.h
diff --git a/jdk/src/share/back/SDE.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/SDE.c
similarity index 100%
rename from jdk/src/share/back/SDE.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/SDE.c
diff --git a/jdk/src/share/back/SDE.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/SDE.h
similarity index 100%
rename from jdk/src/share/back/SDE.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/SDE.h
diff --git a/jdk/src/share/back/StackFrameImpl.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/StackFrameImpl.c
similarity index 100%
rename from jdk/src/share/back/StackFrameImpl.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/StackFrameImpl.c
diff --git a/jdk/src/share/back/StackFrameImpl.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/StackFrameImpl.h
similarity index 100%
rename from jdk/src/share/back/StackFrameImpl.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/StackFrameImpl.h
diff --git a/jdk/src/share/back/StringReferenceImpl.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/StringReferenceImpl.c
similarity index 100%
rename from jdk/src/share/back/StringReferenceImpl.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/StringReferenceImpl.c
diff --git a/jdk/src/share/back/StringReferenceImpl.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/StringReferenceImpl.h
similarity index 100%
rename from jdk/src/share/back/StringReferenceImpl.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/StringReferenceImpl.h
diff --git a/jdk/src/share/back/ThreadGroupReferenceImpl.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ThreadGroupReferenceImpl.c
similarity index 100%
rename from jdk/src/share/back/ThreadGroupReferenceImpl.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/ThreadGroupReferenceImpl.c
diff --git a/jdk/src/share/back/ThreadGroupReferenceImpl.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ThreadGroupReferenceImpl.h
similarity index 100%
rename from jdk/src/share/back/ThreadGroupReferenceImpl.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/ThreadGroupReferenceImpl.h
diff --git a/jdk/src/share/back/ThreadReferenceImpl.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ThreadReferenceImpl.c
similarity index 100%
rename from jdk/src/share/back/ThreadReferenceImpl.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/ThreadReferenceImpl.c
diff --git a/jdk/src/share/back/ThreadReferenceImpl.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ThreadReferenceImpl.h
similarity index 100%
rename from jdk/src/share/back/ThreadReferenceImpl.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/ThreadReferenceImpl.h
diff --git a/jdk/src/share/back/VirtualMachineImpl.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.c
similarity index 100%
rename from jdk/src/share/back/VirtualMachineImpl.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.c
diff --git a/jdk/src/share/back/VirtualMachineImpl.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.h
similarity index 100%
rename from jdk/src/share/back/VirtualMachineImpl.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.h
diff --git a/jdk/src/share/back/bag.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/bag.c
similarity index 100%
rename from jdk/src/share/back/bag.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/bag.c
diff --git a/jdk/src/share/back/bag.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/bag.h
similarity index 100%
rename from jdk/src/share/back/bag.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/bag.h
diff --git a/jdk/src/share/back/classTrack.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/classTrack.c
similarity index 100%
rename from jdk/src/share/back/classTrack.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/classTrack.c
diff --git a/jdk/src/share/back/classTrack.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/classTrack.h
similarity index 100%
rename from jdk/src/share/back/classTrack.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/classTrack.h
diff --git a/jdk/src/share/back/commonRef.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/commonRef.c
similarity index 100%
rename from jdk/src/share/back/commonRef.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/commonRef.c
diff --git a/jdk/src/share/back/commonRef.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/commonRef.h
similarity index 100%
rename from jdk/src/share/back/commonRef.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/commonRef.h
diff --git a/jdk/src/share/back/debugDispatch.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/debugDispatch.c
similarity index 100%
rename from jdk/src/share/back/debugDispatch.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/debugDispatch.c
diff --git a/jdk/src/share/back/debugDispatch.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/debugDispatch.h
similarity index 100%
rename from jdk/src/share/back/debugDispatch.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/debugDispatch.h
diff --git a/jdk/src/share/back/debugInit.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/debugInit.c
similarity index 100%
rename from jdk/src/share/back/debugInit.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/debugInit.c
diff --git a/jdk/src/share/back/debugInit.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/debugInit.h
similarity index 100%
rename from jdk/src/share/back/debugInit.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/debugInit.h
diff --git a/jdk/src/share/back/debugLoop.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/debugLoop.c
similarity index 100%
rename from jdk/src/share/back/debugLoop.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/debugLoop.c
diff --git a/jdk/src/share/back/debugLoop.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/debugLoop.h
similarity index 100%
rename from jdk/src/share/back/debugLoop.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/debugLoop.h
diff --git a/jdk/src/share/back/error_messages.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/error_messages.c
similarity index 100%
rename from jdk/src/share/back/error_messages.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/error_messages.c
diff --git a/jdk/src/share/back/error_messages.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/error_messages.h
similarity index 100%
rename from jdk/src/share/back/error_messages.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/error_messages.h
diff --git a/jdk/src/share/back/eventFilter.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventFilter.c
similarity index 100%
rename from jdk/src/share/back/eventFilter.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventFilter.c
diff --git a/jdk/src/share/back/eventFilter.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventFilter.h
similarity index 100%
rename from jdk/src/share/back/eventFilter.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventFilter.h
diff --git a/jdk/src/share/back/eventFilterRestricted.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventFilterRestricted.h
similarity index 100%
rename from jdk/src/share/back/eventFilterRestricted.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventFilterRestricted.h
diff --git a/jdk/src/share/back/eventHandler.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventHandler.c
similarity index 100%
rename from jdk/src/share/back/eventHandler.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventHandler.c
diff --git a/jdk/src/share/back/eventHandler.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventHandler.h
similarity index 100%
rename from jdk/src/share/back/eventHandler.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventHandler.h
diff --git a/jdk/src/share/back/eventHandlerRestricted.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventHandlerRestricted.h
similarity index 100%
rename from jdk/src/share/back/eventHandlerRestricted.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventHandlerRestricted.h
diff --git a/jdk/src/share/back/eventHelper.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventHelper.c
similarity index 100%
rename from jdk/src/share/back/eventHelper.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventHelper.c
diff --git a/jdk/src/share/back/eventHelper.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventHelper.h
similarity index 100%
rename from jdk/src/share/back/eventHelper.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventHelper.h
diff --git a/jdk/src/share/back/export/sys.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/export/sys.h
similarity index 100%
rename from jdk/src/share/back/export/sys.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/export/sys.h
diff --git a/jdk/src/share/back/inStream.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/inStream.c
similarity index 100%
rename from jdk/src/share/back/inStream.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/inStream.c
diff --git a/jdk/src/share/back/inStream.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/inStream.h
similarity index 100%
rename from jdk/src/share/back/inStream.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/inStream.h
diff --git a/jdk/src/share/back/invoker.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/invoker.c
similarity index 100%
rename from jdk/src/share/back/invoker.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/invoker.c
diff --git a/jdk/src/share/back/invoker.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/invoker.h
similarity index 100%
rename from jdk/src/share/back/invoker.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/invoker.h
diff --git a/jdk/src/share/back/log_messages.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/log_messages.c
similarity index 100%
rename from jdk/src/share/back/log_messages.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/log_messages.c
diff --git a/jdk/src/share/back/log_messages.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/log_messages.h
similarity index 100%
rename from jdk/src/share/back/log_messages.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/log_messages.h
diff --git a/jdk/src/share/back/outStream.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/outStream.c
similarity index 100%
rename from jdk/src/share/back/outStream.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/outStream.c
diff --git a/jdk/src/share/back/outStream.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/outStream.h
similarity index 100%
rename from jdk/src/share/back/outStream.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/outStream.h
diff --git a/jdk/src/share/back/standardHandlers.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/standardHandlers.c
similarity index 100%
rename from jdk/src/share/back/standardHandlers.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/standardHandlers.c
diff --git a/jdk/src/share/back/standardHandlers.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/standardHandlers.h
similarity index 100%
rename from jdk/src/share/back/standardHandlers.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/standardHandlers.h
diff --git a/jdk/src/share/back/stepControl.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/stepControl.c
similarity index 100%
rename from jdk/src/share/back/stepControl.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/stepControl.c
diff --git a/jdk/src/share/back/stepControl.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/stepControl.h
similarity index 100%
rename from jdk/src/share/back/stepControl.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/stepControl.h
diff --git a/jdk/src/share/back/stream.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/stream.c
similarity index 100%
rename from jdk/src/share/back/stream.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/stream.c
diff --git a/jdk/src/share/back/stream.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/stream.h
similarity index 100%
rename from jdk/src/share/back/stream.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/stream.h
diff --git a/jdk/src/share/back/threadControl.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c
similarity index 100%
rename from jdk/src/share/back/threadControl.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c
diff --git a/jdk/src/share/back/threadControl.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.h
similarity index 100%
rename from jdk/src/share/back/threadControl.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.h
diff --git a/jdk/src/share/back/transport.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/transport.c
similarity index 100%
rename from jdk/src/share/back/transport.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/transport.c
diff --git a/jdk/src/share/back/transport.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/transport.h
similarity index 100%
rename from jdk/src/share/back/transport.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/transport.h
diff --git a/jdk/src/share/back/utf_util.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/utf_util.c
similarity index 100%
rename from jdk/src/share/back/utf_util.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/utf_util.c
diff --git a/jdk/src/share/back/utf_util.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/utf_util.h
similarity index 100%
rename from jdk/src/share/back/utf_util.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/utf_util.h
diff --git a/jdk/src/share/back/util.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/util.c
similarity index 100%
rename from jdk/src/share/back/util.c
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/util.c
diff --git a/jdk/src/share/back/util.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/util.h
similarity index 100%
rename from jdk/src/share/back/util.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/util.h
diff --git a/jdk/src/share/back/vm_interface.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/vm_interface.h
similarity index 100%
rename from jdk/src/share/back/vm_interface.h
rename to jdk/src/jdk.jdwp.agent/share/native/libjdwp/vm_interface.h
diff --git a/jdk/src/solaris/transport/socket/socket_md.c b/jdk/src/jdk.jdwp.agent/unix/native/libdt_socket/socket_md.c
similarity index 100%
rename from jdk/src/solaris/transport/socket/socket_md.c
rename to jdk/src/jdk.jdwp.agent/unix/native/libdt_socket/socket_md.c
diff --git a/jdk/src/solaris/transport/socket/socket_md.h b/jdk/src/jdk.jdwp.agent/unix/native/libdt_socket/socket_md.h
similarity index 100%
rename from jdk/src/solaris/transport/socket/socket_md.h
rename to jdk/src/jdk.jdwp.agent/unix/native/libdt_socket/socket_md.h
diff --git a/jdk/src/solaris/back/exec_md.c b/jdk/src/jdk.jdwp.agent/unix/native/libjdwp/exec_md.c
similarity index 100%
rename from jdk/src/solaris/back/exec_md.c
rename to jdk/src/jdk.jdwp.agent/unix/native/libjdwp/exec_md.c
diff --git a/jdk/src/solaris/back/linker_md.c b/jdk/src/jdk.jdwp.agent/unix/native/libjdwp/linker_md.c
similarity index 100%
rename from jdk/src/solaris/back/linker_md.c
rename to jdk/src/jdk.jdwp.agent/unix/native/libjdwp/linker_md.c
diff --git a/jdk/src/solaris/back/path_md.h b/jdk/src/jdk.jdwp.agent/unix/native/libjdwp/path_md.h
similarity index 100%
rename from jdk/src/solaris/back/path_md.h
rename to jdk/src/jdk.jdwp.agent/unix/native/libjdwp/path_md.h
diff --git a/jdk/src/solaris/back/proc_md.h b/jdk/src/jdk.jdwp.agent/unix/native/libjdwp/proc_md.h
similarity index 100%
rename from jdk/src/solaris/back/proc_md.h
rename to jdk/src/jdk.jdwp.agent/unix/native/libjdwp/proc_md.h
diff --git a/jdk/src/solaris/back/util_md.h b/jdk/src/jdk.jdwp.agent/unix/native/libjdwp/util_md.h
similarity index 100%
rename from jdk/src/solaris/back/util_md.h
rename to jdk/src/jdk.jdwp.agent/unix/native/libjdwp/util_md.h
diff --git a/jdk/src/windows/transport/socket/socket_md.c b/jdk/src/jdk.jdwp.agent/windows/native/libdt_socket/socket_md.c
similarity index 100%
rename from jdk/src/windows/transport/socket/socket_md.c
rename to jdk/src/jdk.jdwp.agent/windows/native/libdt_socket/socket_md.c
diff --git a/jdk/src/windows/transport/socket/socket_md.h b/jdk/src/jdk.jdwp.agent/windows/native/libdt_socket/socket_md.h
similarity index 100%
rename from jdk/src/windows/transport/socket/socket_md.h
rename to jdk/src/jdk.jdwp.agent/windows/native/libdt_socket/socket_md.h
diff --git a/jdk/src/windows/back/exec_md.c b/jdk/src/jdk.jdwp.agent/windows/native/libjdwp/exec_md.c
similarity index 100%
rename from jdk/src/windows/back/exec_md.c
rename to jdk/src/jdk.jdwp.agent/windows/native/libjdwp/exec_md.c
diff --git a/jdk/src/windows/back/linker_md.c b/jdk/src/jdk.jdwp.agent/windows/native/libjdwp/linker_md.c
similarity index 100%
rename from jdk/src/windows/back/linker_md.c
rename to jdk/src/jdk.jdwp.agent/windows/native/libjdwp/linker_md.c
diff --git a/jdk/src/windows/back/mutex_md.h b/jdk/src/jdk.jdwp.agent/windows/native/libjdwp/mutex_md.h
similarity index 100%
rename from jdk/src/windows/back/mutex_md.h
rename to jdk/src/jdk.jdwp.agent/windows/native/libjdwp/mutex_md.h
diff --git a/jdk/src/windows/back/path_md.h b/jdk/src/jdk.jdwp.agent/windows/native/libjdwp/path_md.h
similarity index 100%
rename from jdk/src/windows/back/path_md.h
rename to jdk/src/jdk.jdwp.agent/windows/native/libjdwp/path_md.h
diff --git a/jdk/src/windows/back/proc_md.h b/jdk/src/jdk.jdwp.agent/windows/native/libjdwp/proc_md.h
similarity index 100%
rename from jdk/src/windows/back/proc_md.h
rename to jdk/src/jdk.jdwp.agent/windows/native/libjdwp/proc_md.h
diff --git a/jdk/src/windows/back/util_md.h b/jdk/src/jdk.jdwp.agent/windows/native/libjdwp/util_md.h
similarity index 100%
rename from jdk/src/windows/back/util_md.h
rename to jdk/src/jdk.jdwp.agent/windows/native/libjdwp/util_md.h
diff --git a/jdk/src/share/classes/sun/jvmstat/monitor/META-INF/services/sun.jvmstat.monitor.MonitoredHostService b/jdk/src/jdk.jvmstat/share/classes/META-INF/services/sun.jvmstat.monitor.MonitoredHostService
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/monitor/META-INF/services/sun.jvmstat.monitor.MonitoredHostService
rename to jdk/src/jdk.jvmstat/share/classes/META-INF/services/sun.jvmstat.monitor.MonitoredHostService
diff --git a/jdk/src/share/classes/sun/jvmstat/monitor/AbstractMonitor.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/AbstractMonitor.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/monitor/AbstractMonitor.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/AbstractMonitor.java
diff --git a/jdk/src/share/classes/sun/jvmstat/monitor/BufferedMonitoredVm.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/BufferedMonitoredVm.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/monitor/BufferedMonitoredVm.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/BufferedMonitoredVm.java
diff --git a/jdk/src/share/classes/sun/jvmstat/monitor/ByteArrayMonitor.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/ByteArrayMonitor.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/monitor/ByteArrayMonitor.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/ByteArrayMonitor.java
diff --git a/jdk/src/share/classes/sun/jvmstat/monitor/HostIdentifier.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/HostIdentifier.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/monitor/HostIdentifier.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/HostIdentifier.java
diff --git a/jdk/src/share/classes/sun/jvmstat/monitor/IntegerMonitor.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/IntegerMonitor.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/monitor/IntegerMonitor.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/IntegerMonitor.java
diff --git a/jdk/src/share/classes/sun/jvmstat/monitor/LongMonitor.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/LongMonitor.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/monitor/LongMonitor.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/LongMonitor.java
diff --git a/jdk/src/share/classes/sun/jvmstat/monitor/Monitor.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/Monitor.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/monitor/Monitor.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/Monitor.java
diff --git a/jdk/src/share/classes/sun/jvmstat/monitor/MonitorException.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/MonitorException.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/monitor/MonitorException.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/MonitorException.java
diff --git a/jdk/src/share/classes/sun/jvmstat/monitor/MonitoredHost.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredHost.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/monitor/MonitoredHost.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredHost.java
diff --git a/jdk/src/share/classes/sun/jvmstat/monitor/MonitoredHostService.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredHostService.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/monitor/MonitoredHostService.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredHostService.java
diff --git a/jdk/src/share/classes/sun/jvmstat/monitor/MonitoredVm.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredVm.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/monitor/MonitoredVm.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredVm.java
diff --git a/jdk/src/share/classes/sun/jvmstat/monitor/MonitoredVmUtil.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredVmUtil.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/monitor/MonitoredVmUtil.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredVmUtil.java
diff --git a/jdk/src/share/classes/sun/jvmstat/monitor/StringMonitor.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/StringMonitor.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/monitor/StringMonitor.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/StringMonitor.java
diff --git a/jdk/src/share/classes/sun/jvmstat/monitor/Units.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/Units.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/monitor/Units.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/Units.java
diff --git a/jdk/src/share/classes/sun/jvmstat/monitor/Variability.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/Variability.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/monitor/Variability.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/Variability.java
diff --git a/jdk/src/share/classes/sun/jvmstat/monitor/VmIdentifier.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/VmIdentifier.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/monitor/VmIdentifier.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/VmIdentifier.java
diff --git a/jdk/src/share/classes/sun/jvmstat/monitor/event/HostEvent.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/event/HostEvent.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/monitor/event/HostEvent.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/event/HostEvent.java
diff --git a/jdk/src/share/classes/sun/jvmstat/monitor/event/HostListener.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/event/HostListener.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/monitor/event/HostListener.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/event/HostListener.java
diff --git a/jdk/src/share/classes/sun/jvmstat/monitor/event/MonitorStatusChangeEvent.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/event/MonitorStatusChangeEvent.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/monitor/event/MonitorStatusChangeEvent.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/event/MonitorStatusChangeEvent.java
diff --git a/jdk/src/share/classes/sun/jvmstat/monitor/event/VmEvent.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/event/VmEvent.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/monitor/event/VmEvent.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/event/VmEvent.java
diff --git a/jdk/src/share/classes/sun/jvmstat/monitor/event/VmListener.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/event/VmListener.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/monitor/event/VmListener.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/event/VmListener.java
diff --git a/jdk/src/share/classes/sun/jvmstat/monitor/event/VmStatusChangeEvent.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/event/VmStatusChangeEvent.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/monitor/event/VmStatusChangeEvent.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/event/VmStatusChangeEvent.java
diff --git a/jdk/src/share/classes/sun/jvmstat/monitor/event/package.html b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/event/package.html
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/monitor/event/package.html
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/event/package.html
diff --git a/jdk/src/share/classes/sun/jvmstat/monitor/package.html b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/package.html
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/monitor/package.html
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/package.html
diff --git a/jdk/src/share/classes/sun/jvmstat/monitor/remote/RemoteHost.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/remote/RemoteHost.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/monitor/remote/RemoteHost.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/remote/RemoteHost.java
diff --git a/jdk/src/share/classes/sun/jvmstat/monitor/remote/RemoteVm.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/remote/RemoteVm.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/monitor/remote/RemoteVm.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/remote/RemoteVm.java
diff --git a/jdk/src/share/classes/sun/jvmstat/monitor/remote/package.html b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/remote/package.html
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/monitor/remote/package.html
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/remote/package.html
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/AbstractMonitoredVm.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/AbstractMonitoredVm.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/AbstractMonitoredVm.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/AbstractMonitoredVm.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBuffer.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBuffer.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBuffer.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBuffer.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBufferPrologue.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBufferPrologue.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBufferPrologue.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBufferPrologue.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/AliasFileParser.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/AliasFileParser.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/AliasFileParser.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/AliasFileParser.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/CountedTimerTask.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/CountedTimerTask.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/CountedTimerTask.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/CountedTimerTask.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/CountedTimerTaskUtils.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/CountedTimerTaskUtils.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/CountedTimerTaskUtils.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/CountedTimerTaskUtils.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/MonitorDataException.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/MonitorDataException.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/MonitorDataException.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/MonitorDataException.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/MonitorStatus.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/MonitorStatus.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/MonitorStatus.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/MonitorStatus.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/MonitorStructureException.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/MonitorStructureException.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/MonitorStructureException.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/MonitorStructureException.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/MonitorTypeException.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/MonitorTypeException.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/MonitorTypeException.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/MonitorTypeException.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/MonitorVersionException.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/MonitorVersionException.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/MonitorVersionException.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/MonitorVersionException.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/PerfByteArrayMonitor.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfByteArrayMonitor.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/PerfByteArrayMonitor.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfByteArrayMonitor.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/PerfDataBufferImpl.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfDataBufferImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/PerfDataBufferImpl.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfDataBufferImpl.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/PerfIntegerMonitor.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfIntegerMonitor.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/PerfIntegerMonitor.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfIntegerMonitor.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/PerfLongMonitor.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfLongMonitor.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/PerfLongMonitor.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfLongMonitor.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/PerfStringConstantMonitor.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfStringConstantMonitor.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/PerfStringConstantMonitor.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfStringConstantMonitor.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/PerfStringMonitor.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfStringMonitor.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/PerfStringMonitor.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfStringMonitor.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/PerfStringVariableMonitor.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfStringVariableMonitor.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/PerfStringVariableMonitor.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfStringVariableMonitor.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/SyntaxException.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/SyntaxException.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/SyntaxException.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/SyntaxException.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/package.html b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/package.html
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/package.html
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/package.html
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/FileMonitoredVm.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/FileMonitoredVm.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/FileMonitoredVm.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/FileMonitoredVm.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/MonitoredHostFileService.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/MonitoredHostFileService.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/MonitoredHostFileService.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/MonitoredHostFileService.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/MonitoredHostProvider.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/MonitoredHostProvider.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/MonitoredHostProvider.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/MonitoredHostProvider.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/PerfDataBuffer.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/PerfDataBuffer.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/PerfDataBuffer.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/PerfDataBuffer.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/package.html b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/package.html
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/package.html
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/package.html
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalEventTimer.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalEventTimer.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalEventTimer.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalEventTimer.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalMonitoredVm.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalMonitoredVm.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalMonitoredVm.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalMonitoredVm.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalVmManager.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalVmManager.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalVmManager.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalVmManager.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/MonitoredHostLocalService.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/MonitoredHostLocalService.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/MonitoredHostLocalService.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/MonitoredHostLocalService.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/MonitoredHostProvider.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/MonitoredHostProvider.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/MonitoredHostProvider.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/MonitoredHostProvider.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataBuffer.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataBuffer.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataBuffer.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataBuffer.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataFile.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataFile.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataFile.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataFile.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/package.html b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/package.html
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/package.html
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/package.html
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/MonitoredHostProvider.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/MonitoredHostProvider.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/MonitoredHostProvider.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/MonitoredHostProvider.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/MonitoredHostRmiService.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/MonitoredHostRmiService.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/MonitoredHostRmiService.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/MonitoredHostRmiService.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/PerfDataBuffer.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/PerfDataBuffer.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/PerfDataBuffer.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/PerfDataBuffer.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteMonitoredVm.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteMonitoredVm.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteMonitoredVm.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteMonitoredVm.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteVmManager.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteVmManager.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteVmManager.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteVmManager.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/package.html b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/package.html
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/package.html
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/package.html
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/v1_0/BasicType.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v1_0/BasicType.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/v1_0/BasicType.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v1_0/BasicType.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBuffer.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBuffer.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBuffer.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBuffer.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBufferPrologue.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBufferPrologue.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBufferPrologue.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBufferPrologue.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/v2_0/PerfDataBuffer.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v2_0/PerfDataBuffer.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/v2_0/PerfDataBuffer.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v2_0/PerfDataBuffer.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/v2_0/PerfDataBufferPrologue.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v2_0/PerfDataBufferPrologue.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/v2_0/PerfDataBufferPrologue.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v2_0/PerfDataBufferPrologue.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/monitor/v2_0/TypeCode.java b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v2_0/TypeCode.java
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/monitor/v2_0/TypeCode.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v2_0/TypeCode.java
diff --git a/jdk/src/share/classes/sun/jvmstat/perfdata/resources/aliasmap b/jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/resources/aliasmap
similarity index 100%
rename from jdk/src/share/classes/sun/jvmstat/perfdata/resources/aliasmap
rename to jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/resources/aliasmap
diff --git a/jdk/src/share/classes/sun/tools/jstatd/Jstatd.java b/jdk/src/jdk.jvmstat/share/classes/sun/tools/jstatd/Jstatd.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jstatd/Jstatd.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/tools/jstatd/Jstatd.java
diff --git a/jdk/src/share/classes/sun/tools/jstatd/RemoteHostImpl.java b/jdk/src/jdk.jvmstat/share/classes/sun/tools/jstatd/RemoteHostImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jstatd/RemoteHostImpl.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/tools/jstatd/RemoteHostImpl.java
diff --git a/jdk/src/share/classes/sun/tools/jstatd/RemoteVmImpl.java b/jdk/src/jdk.jvmstat/share/classes/sun/tools/jstatd/RemoteVmImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/jstatd/RemoteVmImpl.java
rename to jdk/src/jdk.jvmstat/share/classes/sun/tools/jstatd/RemoteVmImpl.java
diff --git a/jdk/src/share/classes/sun/text/resources/ar/CollationData_ar.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ar/CollationData_ar.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/ar/CollationData_ar.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/ar/CollationData_ar.java
diff --git a/jdk/src/share/classes/sun/text/resources/ar/FormatData_ar.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ar/FormatData_ar.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/ar/FormatData_ar.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/ar/FormatData_ar.java
diff --git a/jdk/src/share/classes/sun/text/resources/ar/FormatData_ar_JO.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ar/FormatData_ar_JO.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/ar/FormatData_ar_JO.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/ar/FormatData_ar_JO.java
diff --git a/jdk/src/share/classes/sun/text/resources/ar/FormatData_ar_LB.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ar/FormatData_ar_LB.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/ar/FormatData_ar_LB.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/ar/FormatData_ar_LB.java
diff --git a/jdk/src/share/classes/sun/text/resources/ar/FormatData_ar_SY.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ar/FormatData_ar_SY.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/ar/FormatData_ar_SY.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/ar/FormatData_ar_SY.java
diff --git a/jdk/src/share/classes/sun/text/resources/ar/JavaTimeSupplementary_ar.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ar/JavaTimeSupplementary_ar.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/ar/JavaTimeSupplementary_ar.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/ar/JavaTimeSupplementary_ar.java
diff --git a/jdk/src/share/classes/sun/text/resources/be/CollationData_be.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/be/CollationData_be.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/be/CollationData_be.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/be/CollationData_be.java
diff --git a/jdk/src/share/classes/sun/text/resources/be/FormatData_be.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/be/FormatData_be.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/be/FormatData_be.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/be/FormatData_be.java
diff --git a/jdk/src/share/classes/sun/text/resources/be/FormatData_be_BY.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/be/FormatData_be_BY.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/be/FormatData_be_BY.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/be/FormatData_be_BY.java
diff --git a/jdk/src/share/classes/sun/text/resources/be/JavaTimeSupplementary_be.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/be/JavaTimeSupplementary_be.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/be/JavaTimeSupplementary_be.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/be/JavaTimeSupplementary_be.java
diff --git a/jdk/src/share/classes/sun/text/resources/bg/CollationData_bg.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/bg/CollationData_bg.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/bg/CollationData_bg.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/bg/CollationData_bg.java
diff --git a/jdk/src/share/classes/sun/text/resources/bg/FormatData_bg.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/bg/FormatData_bg.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/bg/FormatData_bg.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/bg/FormatData_bg.java
diff --git a/jdk/src/share/classes/sun/text/resources/bg/FormatData_bg_BG.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/bg/FormatData_bg_BG.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/bg/FormatData_bg_BG.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/bg/FormatData_bg_BG.java
diff --git a/jdk/src/share/classes/sun/text/resources/bg/JavaTimeSupplementary_bg.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/bg/JavaTimeSupplementary_bg.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/bg/JavaTimeSupplementary_bg.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/bg/JavaTimeSupplementary_bg.java
diff --git a/jdk/src/share/classes/sun/text/resources/ca/CollationData_ca.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ca/CollationData_ca.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/ca/CollationData_ca.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/ca/CollationData_ca.java
diff --git a/jdk/src/share/classes/sun/text/resources/ca/FormatData_ca.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ca/FormatData_ca.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/ca/FormatData_ca.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/ca/FormatData_ca.java
diff --git a/jdk/src/share/classes/sun/text/resources/ca/FormatData_ca_ES.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ca/FormatData_ca_ES.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/ca/FormatData_ca_ES.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/ca/FormatData_ca_ES.java
diff --git a/jdk/src/share/classes/sun/text/resources/ca/JavaTimeSupplementary_ca.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ca/JavaTimeSupplementary_ca.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/ca/JavaTimeSupplementary_ca.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/ca/JavaTimeSupplementary_ca.java
diff --git a/jdk/src/share/classes/sun/text/resources/cs/CollationData_cs.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/cs/CollationData_cs.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/cs/CollationData_cs.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/cs/CollationData_cs.java
diff --git a/jdk/src/share/classes/sun/text/resources/cs/FormatData_cs.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/cs/FormatData_cs.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/cs/FormatData_cs.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/cs/FormatData_cs.java
diff --git a/jdk/src/share/classes/sun/text/resources/cs/FormatData_cs_CZ.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/cs/FormatData_cs_CZ.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/cs/FormatData_cs_CZ.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/cs/FormatData_cs_CZ.java
diff --git a/jdk/src/share/classes/sun/text/resources/cs/JavaTimeSupplementary_cs.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/cs/JavaTimeSupplementary_cs.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/cs/JavaTimeSupplementary_cs.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/cs/JavaTimeSupplementary_cs.java
diff --git a/jdk/src/share/classes/sun/text/resources/da/CollationData_da.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/da/CollationData_da.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/da/CollationData_da.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/da/CollationData_da.java
diff --git a/jdk/src/share/classes/sun/text/resources/da/FormatData_da.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/da/FormatData_da.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/da/FormatData_da.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/da/FormatData_da.java
diff --git a/jdk/src/share/classes/sun/text/resources/da/FormatData_da_DK.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/da/FormatData_da_DK.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/da/FormatData_da_DK.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/da/FormatData_da_DK.java
diff --git a/jdk/src/share/classes/sun/text/resources/da/JavaTimeSupplementary_da.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/da/JavaTimeSupplementary_da.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/da/JavaTimeSupplementary_da.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/da/JavaTimeSupplementary_da.java
diff --git a/jdk/src/share/classes/sun/text/resources/de/FormatData_de.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/de/FormatData_de.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/de/FormatData_de.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/de/FormatData_de.java
diff --git a/jdk/src/share/classes/sun/text/resources/de/FormatData_de_AT.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/de/FormatData_de_AT.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/de/FormatData_de_AT.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/de/FormatData_de_AT.java
diff --git a/jdk/src/share/classes/sun/text/resources/de/FormatData_de_CH.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/de/FormatData_de_CH.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/de/FormatData_de_CH.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/de/FormatData_de_CH.java
diff --git a/jdk/src/share/classes/sun/text/resources/de/FormatData_de_DE.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/de/FormatData_de_DE.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/de/FormatData_de_DE.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/de/FormatData_de_DE.java
diff --git a/jdk/src/share/classes/sun/text/resources/de/FormatData_de_LU.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/de/FormatData_de_LU.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/de/FormatData_de_LU.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/de/FormatData_de_LU.java
diff --git a/jdk/src/share/classes/sun/text/resources/de/JavaTimeSupplementary_de.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/de/JavaTimeSupplementary_de.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/de/JavaTimeSupplementary_de.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/de/JavaTimeSupplementary_de.java
diff --git a/jdk/src/share/classes/sun/text/resources/el/CollationData_el.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/el/CollationData_el.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/el/CollationData_el.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/el/CollationData_el.java
diff --git a/jdk/src/share/classes/sun/text/resources/el/FormatData_el.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/el/FormatData_el.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/el/FormatData_el.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/el/FormatData_el.java
diff --git a/jdk/src/share/classes/sun/text/resources/el/FormatData_el_CY.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/el/FormatData_el_CY.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/el/FormatData_el_CY.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/el/FormatData_el_CY.java
diff --git a/jdk/src/share/classes/sun/text/resources/el/FormatData_el_GR.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/el/FormatData_el_GR.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/el/FormatData_el_GR.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/el/FormatData_el_GR.java
diff --git a/jdk/src/share/classes/sun/text/resources/el/JavaTimeSupplementary_el.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/el/JavaTimeSupplementary_el.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/el/JavaTimeSupplementary_el.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/el/JavaTimeSupplementary_el.java
diff --git a/jdk/src/share/classes/sun/text/resources/es/CollationData_es.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/es/CollationData_es.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/es/CollationData_es.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/es/CollationData_es.java
diff --git a/jdk/src/share/classes/sun/text/resources/es/FormatData_es.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/es/FormatData_es.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es.java
diff --git a/jdk/src/share/classes/sun/text/resources/es/FormatData_es_AR.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_AR.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/es/FormatData_es_AR.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_AR.java
diff --git a/jdk/src/share/classes/sun/text/resources/es/FormatData_es_BO.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_BO.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/es/FormatData_es_BO.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_BO.java
diff --git a/jdk/src/share/classes/sun/text/resources/es/FormatData_es_CL.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_CL.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/es/FormatData_es_CL.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_CL.java
diff --git a/jdk/src/share/classes/sun/text/resources/es/FormatData_es_CO.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_CO.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/es/FormatData_es_CO.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_CO.java
diff --git a/jdk/src/share/classes/sun/text/resources/es/FormatData_es_CR.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_CR.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/es/FormatData_es_CR.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_CR.java
diff --git a/jdk/src/share/classes/sun/text/resources/es/FormatData_es_DO.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_DO.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/es/FormatData_es_DO.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_DO.java
diff --git a/jdk/src/share/classes/sun/text/resources/es/FormatData_es_EC.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_EC.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/es/FormatData_es_EC.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_EC.java
diff --git a/jdk/src/share/classes/sun/text/resources/es/FormatData_es_ES.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_ES.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/es/FormatData_es_ES.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_ES.java
diff --git a/jdk/src/share/classes/sun/text/resources/es/FormatData_es_GT.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_GT.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/es/FormatData_es_GT.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_GT.java
diff --git a/jdk/src/share/classes/sun/text/resources/es/FormatData_es_HN.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_HN.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/es/FormatData_es_HN.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_HN.java
diff --git a/jdk/src/share/classes/sun/text/resources/es/FormatData_es_MX.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_MX.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/es/FormatData_es_MX.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_MX.java
diff --git a/jdk/src/share/classes/sun/text/resources/es/FormatData_es_NI.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_NI.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/es/FormatData_es_NI.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_NI.java
diff --git a/jdk/src/share/classes/sun/text/resources/es/FormatData_es_PA.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_PA.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/es/FormatData_es_PA.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_PA.java
diff --git a/jdk/src/share/classes/sun/text/resources/es/FormatData_es_PE.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_PE.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/es/FormatData_es_PE.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_PE.java
diff --git a/jdk/src/share/classes/sun/text/resources/es/FormatData_es_PR.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_PR.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/es/FormatData_es_PR.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_PR.java
diff --git a/jdk/src/share/classes/sun/text/resources/es/FormatData_es_PY.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_PY.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/es/FormatData_es_PY.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_PY.java
diff --git a/jdk/src/share/classes/sun/text/resources/es/FormatData_es_SV.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_SV.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/es/FormatData_es_SV.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_SV.java
diff --git a/jdk/src/share/classes/sun/text/resources/es/FormatData_es_US.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_US.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/es/FormatData_es_US.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_US.java
diff --git a/jdk/src/share/classes/sun/text/resources/es/FormatData_es_UY.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_UY.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/es/FormatData_es_UY.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_UY.java
diff --git a/jdk/src/share/classes/sun/text/resources/es/FormatData_es_VE.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_VE.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/es/FormatData_es_VE.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_VE.java
diff --git a/jdk/src/share/classes/sun/text/resources/es/JavaTimeSupplementary_es.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/es/JavaTimeSupplementary_es.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/es/JavaTimeSupplementary_es.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/es/JavaTimeSupplementary_es.java
diff --git a/jdk/src/share/classes/sun/text/resources/et/CollationData_et.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/et/CollationData_et.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/et/CollationData_et.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/et/CollationData_et.java
diff --git a/jdk/src/share/classes/sun/text/resources/et/FormatData_et.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/et/FormatData_et.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/et/FormatData_et.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/et/FormatData_et.java
diff --git a/jdk/src/share/classes/sun/text/resources/et/FormatData_et_EE.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/et/FormatData_et_EE.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/et/FormatData_et_EE.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/et/FormatData_et_EE.java
diff --git a/jdk/src/share/classes/sun/text/resources/et/JavaTimeSupplementary_et.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/et/JavaTimeSupplementary_et.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/et/JavaTimeSupplementary_et.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/et/JavaTimeSupplementary_et.java
diff --git a/jdk/src/share/classes/sun/text/resources/fi/CollationData_fi.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/fi/CollationData_fi.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/fi/CollationData_fi.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/fi/CollationData_fi.java
diff --git a/jdk/src/share/classes/sun/text/resources/fi/FormatData_fi.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/fi/FormatData_fi.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/fi/FormatData_fi.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/fi/FormatData_fi.java
diff --git a/jdk/src/share/classes/sun/text/resources/fi/FormatData_fi_FI.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/fi/FormatData_fi_FI.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/fi/FormatData_fi_FI.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/fi/FormatData_fi_FI.java
diff --git a/jdk/src/share/classes/sun/text/resources/fi/JavaTimeSupplementary_fi.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/fi/JavaTimeSupplementary_fi.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/fi/JavaTimeSupplementary_fi.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/fi/JavaTimeSupplementary_fi.java
diff --git a/jdk/src/share/classes/sun/text/resources/fr/CollationData_fr.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/fr/CollationData_fr.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/fr/CollationData_fr.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/fr/CollationData_fr.java
diff --git a/jdk/src/share/classes/sun/text/resources/fr/FormatData_fr.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/fr/FormatData_fr.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/fr/FormatData_fr.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/fr/FormatData_fr.java
diff --git a/jdk/src/share/classes/sun/text/resources/fr/FormatData_fr_BE.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/fr/FormatData_fr_BE.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/fr/FormatData_fr_BE.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/fr/FormatData_fr_BE.java
diff --git a/jdk/src/share/classes/sun/text/resources/fr/FormatData_fr_CA.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/fr/FormatData_fr_CA.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/fr/FormatData_fr_CA.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/fr/FormatData_fr_CA.java
diff --git a/jdk/src/share/classes/sun/text/resources/fr/FormatData_fr_CH.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/fr/FormatData_fr_CH.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/fr/FormatData_fr_CH.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/fr/FormatData_fr_CH.java
diff --git a/jdk/src/share/classes/sun/text/resources/fr/FormatData_fr_FR.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/fr/FormatData_fr_FR.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/fr/FormatData_fr_FR.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/fr/FormatData_fr_FR.java
diff --git a/jdk/src/share/classes/sun/text/resources/fr/JavaTimeSupplementary_fr.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/fr/JavaTimeSupplementary_fr.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/fr/JavaTimeSupplementary_fr.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/fr/JavaTimeSupplementary_fr.java
diff --git a/jdk/src/share/classes/sun/text/resources/ga/FormatData_ga.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ga/FormatData_ga.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/ga/FormatData_ga.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/ga/FormatData_ga.java
diff --git a/jdk/src/share/classes/sun/text/resources/ga/FormatData_ga_IE.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ga/FormatData_ga_IE.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/ga/FormatData_ga_IE.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/ga/FormatData_ga_IE.java
diff --git a/jdk/src/share/classes/sun/text/resources/ga/JavaTimeSupplementary_ga.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ga/JavaTimeSupplementary_ga.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/ga/JavaTimeSupplementary_ga.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/ga/JavaTimeSupplementary_ga.java
diff --git a/jdk/src/share/classes/sun/text/resources/hi/CollationData_hi.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/hi/CollationData_hi.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/hi/CollationData_hi.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/hi/CollationData_hi.java
diff --git a/jdk/src/share/classes/sun/text/resources/hi/FormatData_hi_IN.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/hi/FormatData_hi_IN.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/hi/FormatData_hi_IN.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/hi/FormatData_hi_IN.java
diff --git a/jdk/src/share/classes/sun/text/resources/hi/JavaTimeSupplementary_hi_IN.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/hi/JavaTimeSupplementary_hi_IN.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/hi/JavaTimeSupplementary_hi_IN.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/hi/JavaTimeSupplementary_hi_IN.java
diff --git a/jdk/src/share/classes/sun/text/resources/hr/CollationData_hr.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/hr/CollationData_hr.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/hr/CollationData_hr.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/hr/CollationData_hr.java
diff --git a/jdk/src/share/classes/sun/text/resources/hr/FormatData_hr.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/hr/FormatData_hr.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/hr/FormatData_hr.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/hr/FormatData_hr.java
diff --git a/jdk/src/share/classes/sun/text/resources/hr/FormatData_hr_HR.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/hr/FormatData_hr_HR.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/hr/FormatData_hr_HR.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/hr/FormatData_hr_HR.java
diff --git a/jdk/src/share/classes/sun/text/resources/hr/JavaTimeSupplementary_hr.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/hr/JavaTimeSupplementary_hr.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/hr/JavaTimeSupplementary_hr.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/hr/JavaTimeSupplementary_hr.java
diff --git a/jdk/src/share/classes/sun/text/resources/hu/CollationData_hu.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/hu/CollationData_hu.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/hu/CollationData_hu.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/hu/CollationData_hu.java
diff --git a/jdk/src/share/classes/sun/text/resources/hu/FormatData_hu.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/hu/FormatData_hu.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/hu/FormatData_hu.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/hu/FormatData_hu.java
diff --git a/jdk/src/share/classes/sun/text/resources/hu/FormatData_hu_HU.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/hu/FormatData_hu_HU.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/hu/FormatData_hu_HU.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/hu/FormatData_hu_HU.java
diff --git a/jdk/src/share/classes/sun/text/resources/hu/JavaTimeSupplementary_hu.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/hu/JavaTimeSupplementary_hu.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/hu/JavaTimeSupplementary_hu.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/hu/JavaTimeSupplementary_hu.java
diff --git a/jdk/src/share/classes/sun/text/resources/in/FormatData_in.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/in/FormatData_in.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/in/FormatData_in.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/in/FormatData_in.java
diff --git a/jdk/src/share/classes/sun/text/resources/in/FormatData_in_ID.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/in/FormatData_in_ID.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/in/FormatData_in_ID.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/in/FormatData_in_ID.java
diff --git a/jdk/src/share/classes/sun/text/resources/is/CollationData_is.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/is/CollationData_is.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/is/CollationData_is.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/is/CollationData_is.java
diff --git a/jdk/src/share/classes/sun/text/resources/is/FormatData_is.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/is/FormatData_is.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/is/FormatData_is.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/is/FormatData_is.java
diff --git a/jdk/src/share/classes/sun/text/resources/is/FormatData_is_IS.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/is/FormatData_is_IS.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/is/FormatData_is_IS.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/is/FormatData_is_IS.java
diff --git a/jdk/src/share/classes/sun/text/resources/is/JavaTimeSupplementary_is.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/is/JavaTimeSupplementary_is.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/is/JavaTimeSupplementary_is.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/is/JavaTimeSupplementary_is.java
diff --git a/jdk/src/share/classes/sun/text/resources/it/FormatData_it.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/it/FormatData_it.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/it/FormatData_it.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/it/FormatData_it.java
diff --git a/jdk/src/share/classes/sun/text/resources/it/FormatData_it_CH.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/it/FormatData_it_CH.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/it/FormatData_it_CH.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/it/FormatData_it_CH.java
diff --git a/jdk/src/share/classes/sun/text/resources/it/FormatData_it_IT.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/it/FormatData_it_IT.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/it/FormatData_it_IT.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/it/FormatData_it_IT.java
diff --git a/jdk/src/share/classes/sun/text/resources/it/JavaTimeSupplementary_it.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/it/JavaTimeSupplementary_it.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/it/JavaTimeSupplementary_it.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/it/JavaTimeSupplementary_it.java
diff --git a/jdk/src/share/classes/sun/text/resources/iw/CollationData_iw.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/iw/CollationData_iw.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/iw/CollationData_iw.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/iw/CollationData_iw.java
diff --git a/jdk/src/share/classes/sun/text/resources/iw/FormatData_iw.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/iw/FormatData_iw.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/iw/FormatData_iw.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/iw/FormatData_iw.java
diff --git a/jdk/src/share/classes/sun/text/resources/iw/FormatData_iw_IL.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/iw/FormatData_iw_IL.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/iw/FormatData_iw_IL.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/iw/FormatData_iw_IL.java
diff --git a/jdk/src/share/classes/sun/text/resources/iw/JavaTimeSupplementary_iw.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/iw/JavaTimeSupplementary_iw.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/iw/JavaTimeSupplementary_iw.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/iw/JavaTimeSupplementary_iw.java
diff --git a/jdk/src/share/classes/sun/text/resources/iw/JavaTimeSupplementary_iw_IL.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/iw/JavaTimeSupplementary_iw_IL.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/iw/JavaTimeSupplementary_iw_IL.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/iw/JavaTimeSupplementary_iw_IL.java
diff --git a/jdk/src/share/classes/sun/text/resources/ja/CollationData_ja.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ja/CollationData_ja.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/ja/CollationData_ja.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/ja/CollationData_ja.java
diff --git a/jdk/src/share/classes/sun/text/resources/ja/FormatData_ja.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ja/FormatData_ja.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/ja/FormatData_ja.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/ja/FormatData_ja.java
diff --git a/jdk/src/share/classes/sun/text/resources/ja/FormatData_ja_JP.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ja/FormatData_ja_JP.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/ja/FormatData_ja_JP.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/ja/FormatData_ja_JP.java
diff --git a/jdk/src/share/classes/sun/text/resources/ja/JavaTimeSupplementary_ja.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ja/JavaTimeSupplementary_ja.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/ja/JavaTimeSupplementary_ja.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/ja/JavaTimeSupplementary_ja.java
diff --git a/jdk/src/share/classes/sun/text/resources/ko/CollationData_ko.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ko/CollationData_ko.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/ko/CollationData_ko.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/ko/CollationData_ko.java
diff --git a/jdk/src/share/classes/sun/text/resources/ko/FormatData_ko.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ko/FormatData_ko.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/ko/FormatData_ko.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/ko/FormatData_ko.java
diff --git a/jdk/src/share/classes/sun/text/resources/ko/FormatData_ko_KR.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ko/FormatData_ko_KR.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/ko/FormatData_ko_KR.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/ko/FormatData_ko_KR.java
diff --git a/jdk/src/share/classes/sun/text/resources/ko/JavaTimeSupplementary_ko.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ko/JavaTimeSupplementary_ko.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/ko/JavaTimeSupplementary_ko.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/ko/JavaTimeSupplementary_ko.java
diff --git a/jdk/src/share/classes/sun/text/resources/lt/CollationData_lt.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/lt/CollationData_lt.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/lt/CollationData_lt.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/lt/CollationData_lt.java
diff --git a/jdk/src/share/classes/sun/text/resources/lt/FormatData_lt.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/lt/FormatData_lt.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/lt/FormatData_lt.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/lt/FormatData_lt.java
diff --git a/jdk/src/share/classes/sun/text/resources/lt/FormatData_lt_LT.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/lt/FormatData_lt_LT.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/lt/FormatData_lt_LT.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/lt/FormatData_lt_LT.java
diff --git a/jdk/src/share/classes/sun/text/resources/lt/JavaTimeSupplementary_lt.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/lt/JavaTimeSupplementary_lt.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/lt/JavaTimeSupplementary_lt.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/lt/JavaTimeSupplementary_lt.java
diff --git a/jdk/src/share/classes/sun/text/resources/lv/CollationData_lv.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/lv/CollationData_lv.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/lv/CollationData_lv.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/lv/CollationData_lv.java
diff --git a/jdk/src/share/classes/sun/text/resources/lv/FormatData_lv.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/lv/FormatData_lv.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/lv/FormatData_lv.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/lv/FormatData_lv.java
diff --git a/jdk/src/share/classes/sun/text/resources/lv/FormatData_lv_LV.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/lv/FormatData_lv_LV.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/lv/FormatData_lv_LV.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/lv/FormatData_lv_LV.java
diff --git a/jdk/src/share/classes/sun/text/resources/lv/JavaTimeSupplementary_lv.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/lv/JavaTimeSupplementary_lv.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/lv/JavaTimeSupplementary_lv.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/lv/JavaTimeSupplementary_lv.java
diff --git a/jdk/src/share/classes/sun/text/resources/mk/CollationData_mk.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/mk/CollationData_mk.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/mk/CollationData_mk.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/mk/CollationData_mk.java
diff --git a/jdk/src/share/classes/sun/text/resources/mk/FormatData_mk.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/mk/FormatData_mk.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/mk/FormatData_mk.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/mk/FormatData_mk.java
diff --git a/jdk/src/share/classes/sun/text/resources/mk/FormatData_mk_MK.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/mk/FormatData_mk_MK.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/mk/FormatData_mk_MK.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/mk/FormatData_mk_MK.java
diff --git a/jdk/src/share/classes/sun/text/resources/mk/JavaTimeSupplementary_mk.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/mk/JavaTimeSupplementary_mk.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/mk/JavaTimeSupplementary_mk.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/mk/JavaTimeSupplementary_mk.java
diff --git a/jdk/src/share/classes/sun/text/resources/ms/FormatData_ms.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ms/FormatData_ms.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/ms/FormatData_ms.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/ms/FormatData_ms.java
diff --git a/jdk/src/share/classes/sun/text/resources/ms/FormatData_ms_MY.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ms/FormatData_ms_MY.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/ms/FormatData_ms_MY.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/ms/FormatData_ms_MY.java
diff --git a/jdk/src/share/classes/sun/text/resources/ms/JavaTimeSupplementary_ms.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ms/JavaTimeSupplementary_ms.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/ms/JavaTimeSupplementary_ms.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/ms/JavaTimeSupplementary_ms.java
diff --git a/jdk/src/share/classes/sun/text/resources/mt/FormatData_mt.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/mt/FormatData_mt.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/mt/FormatData_mt.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/mt/FormatData_mt.java
diff --git a/jdk/src/share/classes/sun/text/resources/mt/FormatData_mt_MT.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/mt/FormatData_mt_MT.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/mt/FormatData_mt_MT.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/mt/FormatData_mt_MT.java
diff --git a/jdk/src/share/classes/sun/text/resources/mt/JavaTimeSupplementary_mt.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/mt/JavaTimeSupplementary_mt.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/mt/JavaTimeSupplementary_mt.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/mt/JavaTimeSupplementary_mt.java
diff --git a/jdk/src/share/classes/sun/text/resources/nl/FormatData_nl.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/nl/FormatData_nl.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/nl/FormatData_nl.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/nl/FormatData_nl.java
diff --git a/jdk/src/share/classes/sun/text/resources/nl/FormatData_nl_BE.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/nl/FormatData_nl_BE.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/nl/FormatData_nl_BE.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/nl/FormatData_nl_BE.java
diff --git a/jdk/src/share/classes/sun/text/resources/nl/FormatData_nl_NL.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/nl/FormatData_nl_NL.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/nl/FormatData_nl_NL.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/nl/FormatData_nl_NL.java
diff --git a/jdk/src/share/classes/sun/text/resources/nl/JavaTimeSupplementary_nl.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/nl/JavaTimeSupplementary_nl.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/nl/JavaTimeSupplementary_nl.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/nl/JavaTimeSupplementary_nl.java
diff --git a/jdk/src/share/classes/sun/text/resources/no/CollationData_no.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/no/CollationData_no.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/no/CollationData_no.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/no/CollationData_no.java
diff --git a/jdk/src/share/classes/sun/text/resources/no/FormatData_no.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/no/FormatData_no.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/no/FormatData_no.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/no/FormatData_no.java
diff --git a/jdk/src/share/classes/sun/text/resources/no/FormatData_no_NO.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/no/FormatData_no_NO.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/no/FormatData_no_NO.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/no/FormatData_no_NO.java
diff --git a/jdk/src/share/classes/sun/text/resources/no/FormatData_no_NO_NY.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/no/FormatData_no_NO_NY.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/no/FormatData_no_NO_NY.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/no/FormatData_no_NO_NY.java
diff --git a/jdk/src/share/classes/sun/text/resources/no/JavaTimeSupplementary_no.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/no/JavaTimeSupplementary_no.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/no/JavaTimeSupplementary_no.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/no/JavaTimeSupplementary_no.java
diff --git a/jdk/src/share/classes/sun/text/resources/pl/CollationData_pl.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/pl/CollationData_pl.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/pl/CollationData_pl.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/pl/CollationData_pl.java
diff --git a/jdk/src/share/classes/sun/text/resources/pl/FormatData_pl.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/pl/FormatData_pl.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/pl/FormatData_pl.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/pl/FormatData_pl.java
diff --git a/jdk/src/share/classes/sun/text/resources/pl/FormatData_pl_PL.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/pl/FormatData_pl_PL.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/pl/FormatData_pl_PL.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/pl/FormatData_pl_PL.java
diff --git a/jdk/src/share/classes/sun/text/resources/pl/JavaTimeSupplementary_pl.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/pl/JavaTimeSupplementary_pl.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/pl/JavaTimeSupplementary_pl.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/pl/JavaTimeSupplementary_pl.java
diff --git a/jdk/src/share/classes/sun/text/resources/pt/FormatData_pt.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/pt/FormatData_pt.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/pt/FormatData_pt.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/pt/FormatData_pt.java
diff --git a/jdk/src/share/classes/sun/text/resources/pt/FormatData_pt_BR.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/pt/FormatData_pt_BR.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/pt/FormatData_pt_BR.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/pt/FormatData_pt_BR.java
diff --git a/jdk/src/share/classes/sun/text/resources/pt/FormatData_pt_PT.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/pt/FormatData_pt_PT.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/pt/FormatData_pt_PT.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/pt/FormatData_pt_PT.java
diff --git a/jdk/src/share/classes/sun/text/resources/pt/JavaTimeSupplementary_pt.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/pt/JavaTimeSupplementary_pt.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/pt/JavaTimeSupplementary_pt.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/pt/JavaTimeSupplementary_pt.java
diff --git a/jdk/src/share/classes/sun/text/resources/pt/JavaTimeSupplementary_pt_PT.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/pt/JavaTimeSupplementary_pt_PT.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/pt/JavaTimeSupplementary_pt_PT.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/pt/JavaTimeSupplementary_pt_PT.java
diff --git a/jdk/src/share/classes/sun/text/resources/ro/CollationData_ro.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ro/CollationData_ro.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/ro/CollationData_ro.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/ro/CollationData_ro.java
diff --git a/jdk/src/share/classes/sun/text/resources/ro/FormatData_ro.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ro/FormatData_ro.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/ro/FormatData_ro.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/ro/FormatData_ro.java
diff --git a/jdk/src/share/classes/sun/text/resources/ro/FormatData_ro_RO.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ro/FormatData_ro_RO.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/ro/FormatData_ro_RO.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/ro/FormatData_ro_RO.java
diff --git a/jdk/src/share/classes/sun/text/resources/ro/JavaTimeSupplementary_ro.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ro/JavaTimeSupplementary_ro.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/ro/JavaTimeSupplementary_ro.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/ro/JavaTimeSupplementary_ro.java
diff --git a/jdk/src/share/classes/sun/text/resources/ru/CollationData_ru.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ru/CollationData_ru.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/ru/CollationData_ru.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/ru/CollationData_ru.java
diff --git a/jdk/src/share/classes/sun/text/resources/ru/FormatData_ru.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ru/FormatData_ru.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/ru/FormatData_ru.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/ru/FormatData_ru.java
diff --git a/jdk/src/share/classes/sun/text/resources/ru/FormatData_ru_RU.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ru/FormatData_ru_RU.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/ru/FormatData_ru_RU.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/ru/FormatData_ru_RU.java
diff --git a/jdk/src/share/classes/sun/text/resources/ru/JavaTimeSupplementary_ru.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ru/JavaTimeSupplementary_ru.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/ru/JavaTimeSupplementary_ru.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/ru/JavaTimeSupplementary_ru.java
diff --git a/jdk/src/share/classes/sun/text/resources/sk/CollationData_sk.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/sk/CollationData_sk.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/sk/CollationData_sk.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/sk/CollationData_sk.java
diff --git a/jdk/src/share/classes/sun/text/resources/sk/FormatData_sk.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/sk/FormatData_sk.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/sk/FormatData_sk.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/sk/FormatData_sk.java
diff --git a/jdk/src/share/classes/sun/text/resources/sk/FormatData_sk_SK.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/sk/FormatData_sk_SK.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/sk/FormatData_sk_SK.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/sk/FormatData_sk_SK.java
diff --git a/jdk/src/share/classes/sun/text/resources/sk/JavaTimeSupplementary_sk.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/sk/JavaTimeSupplementary_sk.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/sk/JavaTimeSupplementary_sk.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/sk/JavaTimeSupplementary_sk.java
diff --git a/jdk/src/share/classes/sun/text/resources/sl/CollationData_sl.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/sl/CollationData_sl.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/sl/CollationData_sl.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/sl/CollationData_sl.java
diff --git a/jdk/src/share/classes/sun/text/resources/sl/FormatData_sl.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/sl/FormatData_sl.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/sl/FormatData_sl.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/sl/FormatData_sl.java
diff --git a/jdk/src/share/classes/sun/text/resources/sl/FormatData_sl_SI.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/sl/FormatData_sl_SI.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/sl/FormatData_sl_SI.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/sl/FormatData_sl_SI.java
diff --git a/jdk/src/share/classes/sun/text/resources/sl/JavaTimeSupplementary_sl.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/sl/JavaTimeSupplementary_sl.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/sl/JavaTimeSupplementary_sl.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/sl/JavaTimeSupplementary_sl.java
diff --git a/jdk/src/share/classes/sun/text/resources/sq/CollationData_sq.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/sq/CollationData_sq.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/sq/CollationData_sq.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/sq/CollationData_sq.java
diff --git a/jdk/src/share/classes/sun/text/resources/sq/FormatData_sq.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/sq/FormatData_sq.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/sq/FormatData_sq.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/sq/FormatData_sq.java
diff --git a/jdk/src/share/classes/sun/text/resources/sq/FormatData_sq_AL.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/sq/FormatData_sq_AL.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/sq/FormatData_sq_AL.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/sq/FormatData_sq_AL.java
diff --git a/jdk/src/share/classes/sun/text/resources/sq/JavaTimeSupplementary_sq.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/sq/JavaTimeSupplementary_sq.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/sq/JavaTimeSupplementary_sq.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/sq/JavaTimeSupplementary_sq.java
diff --git a/jdk/src/share/classes/sun/text/resources/sr/CollationData_sr.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/sr/CollationData_sr.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/sr/CollationData_sr.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/sr/CollationData_sr.java
diff --git a/jdk/src/share/classes/sun/text/resources/sr/CollationData_sr_Latn.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/sr/CollationData_sr_Latn.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/sr/CollationData_sr_Latn.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/sr/CollationData_sr_Latn.java
diff --git a/jdk/src/share/classes/sun/text/resources/sr/FormatData_sr.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/sr/FormatData_sr.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/sr/FormatData_sr.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/sr/FormatData_sr.java
diff --git a/jdk/src/share/classes/sun/text/resources/sr/FormatData_sr_BA.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/sr/FormatData_sr_BA.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/sr/FormatData_sr_BA.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/sr/FormatData_sr_BA.java
diff --git a/jdk/src/share/classes/sun/text/resources/sr/FormatData_sr_CS.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/sr/FormatData_sr_CS.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/sr/FormatData_sr_CS.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/sr/FormatData_sr_CS.java
diff --git a/jdk/src/share/classes/sun/text/resources/sr/FormatData_sr_Latn.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/sr/FormatData_sr_Latn.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/sr/FormatData_sr_Latn.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/sr/FormatData_sr_Latn.java
diff --git a/jdk/src/share/classes/sun/text/resources/sr/FormatData_sr_Latn_ME.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/sr/FormatData_sr_Latn_ME.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/sr/FormatData_sr_Latn_ME.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/sr/FormatData_sr_Latn_ME.java
diff --git a/jdk/src/share/classes/sun/text/resources/sr/FormatData_sr_ME.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/sr/FormatData_sr_ME.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/sr/FormatData_sr_ME.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/sr/FormatData_sr_ME.java
diff --git a/jdk/src/share/classes/sun/text/resources/sr/FormatData_sr_RS.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/sr/FormatData_sr_RS.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/sr/FormatData_sr_RS.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/sr/FormatData_sr_RS.java
diff --git a/jdk/src/share/classes/sun/text/resources/sr/JavaTimeSupplementary_sr.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/sr/JavaTimeSupplementary_sr.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/sr/JavaTimeSupplementary_sr.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/sr/JavaTimeSupplementary_sr.java
diff --git a/jdk/src/share/classes/sun/text/resources/sr/JavaTimeSupplementary_sr_Latn.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/sr/JavaTimeSupplementary_sr_Latn.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/sr/JavaTimeSupplementary_sr_Latn.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/sr/JavaTimeSupplementary_sr_Latn.java
diff --git a/jdk/src/share/classes/sun/text/resources/sv/CollationData_sv.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/sv/CollationData_sv.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/sv/CollationData_sv.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/sv/CollationData_sv.java
diff --git a/jdk/src/share/classes/sun/text/resources/sv/FormatData_sv.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/sv/FormatData_sv.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/sv/FormatData_sv.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/sv/FormatData_sv.java
diff --git a/jdk/src/share/classes/sun/text/resources/sv/FormatData_sv_SE.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/sv/FormatData_sv_SE.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/sv/FormatData_sv_SE.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/sv/FormatData_sv_SE.java
diff --git a/jdk/src/share/classes/sun/text/resources/sv/JavaTimeSupplementary_sv.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/sv/JavaTimeSupplementary_sv.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/sv/JavaTimeSupplementary_sv.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/sv/JavaTimeSupplementary_sv.java
diff --git a/jdk/src/share/classes/sun/text/resources/th/BreakIteratorInfo_th.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/th/BreakIteratorInfo_th.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/th/BreakIteratorInfo_th.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/th/BreakIteratorInfo_th.java
diff --git a/jdk/src/share/classes/sun/text/resources/th/BreakIteratorRules_th.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/th/BreakIteratorRules_th.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/th/BreakIteratorRules_th.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/th/BreakIteratorRules_th.java
diff --git a/jdk/src/share/classes/sun/text/resources/th/CollationData_th.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/th/CollationData_th.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/th/CollationData_th.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/th/CollationData_th.java
diff --git a/jdk/src/share/classes/sun/text/resources/th/FormatData_th.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/th/FormatData_th.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/th/FormatData_th.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/th/FormatData_th.java
diff --git a/jdk/src/share/classes/sun/text/resources/th/FormatData_th_TH.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/th/FormatData_th_TH.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/th/FormatData_th_TH.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/th/FormatData_th_TH.java
diff --git a/jdk/src/share/classes/sun/text/resources/th/JavaTimeSupplementary_th.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/th/JavaTimeSupplementary_th.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/th/JavaTimeSupplementary_th.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/th/JavaTimeSupplementary_th.java
diff --git a/jdk/src/share/classes/sun/text/resources/th/thai_dict b/jdk/src/jdk.localedata/share/classes/sun/text/resources/th/thai_dict
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/th/thai_dict
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/th/thai_dict
diff --git a/jdk/src/share/classes/sun/text/resources/tr/CollationData_tr.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/tr/CollationData_tr.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/tr/CollationData_tr.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/tr/CollationData_tr.java
diff --git a/jdk/src/share/classes/sun/text/resources/tr/FormatData_tr.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/tr/FormatData_tr.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/tr/FormatData_tr.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/tr/FormatData_tr.java
diff --git a/jdk/src/share/classes/sun/text/resources/tr/FormatData_tr_TR.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/tr/FormatData_tr_TR.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/tr/FormatData_tr_TR.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/tr/FormatData_tr_TR.java
diff --git a/jdk/src/share/classes/sun/text/resources/tr/JavaTimeSupplementary_tr.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/tr/JavaTimeSupplementary_tr.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/tr/JavaTimeSupplementary_tr.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/tr/JavaTimeSupplementary_tr.java
diff --git a/jdk/src/share/classes/sun/text/resources/uk/CollationData_uk.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/uk/CollationData_uk.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/uk/CollationData_uk.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/uk/CollationData_uk.java
diff --git a/jdk/src/share/classes/sun/text/resources/uk/FormatData_uk.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/uk/FormatData_uk.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/uk/FormatData_uk.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/uk/FormatData_uk.java
diff --git a/jdk/src/share/classes/sun/text/resources/uk/FormatData_uk_UA.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/uk/FormatData_uk_UA.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/uk/FormatData_uk_UA.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/uk/FormatData_uk_UA.java
diff --git a/jdk/src/share/classes/sun/text/resources/uk/JavaTimeSupplementary_uk.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/uk/JavaTimeSupplementary_uk.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/uk/JavaTimeSupplementary_uk.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/uk/JavaTimeSupplementary_uk.java
diff --git a/jdk/src/share/classes/sun/text/resources/vi/CollationData_vi.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/vi/CollationData_vi.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/vi/CollationData_vi.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/vi/CollationData_vi.java
diff --git a/jdk/src/share/classes/sun/text/resources/vi/FormatData_vi.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/vi/FormatData_vi.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/vi/FormatData_vi.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/vi/FormatData_vi.java
diff --git a/jdk/src/share/classes/sun/text/resources/vi/FormatData_vi_VN.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/vi/FormatData_vi_VN.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/vi/FormatData_vi_VN.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/vi/FormatData_vi_VN.java
diff --git a/jdk/src/share/classes/sun/text/resources/vi/JavaTimeSupplementary_vi.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/vi/JavaTimeSupplementary_vi.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/vi/JavaTimeSupplementary_vi.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/vi/JavaTimeSupplementary_vi.java
diff --git a/jdk/src/share/classes/sun/text/resources/zh/CollationData_zh.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/zh/CollationData_zh.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/zh/CollationData_zh.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/zh/CollationData_zh.java
diff --git a/jdk/src/share/classes/sun/text/resources/zh/CollationData_zh_HK.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/zh/CollationData_zh_HK.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/zh/CollationData_zh_HK.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/zh/CollationData_zh_HK.java
diff --git a/jdk/src/share/classes/sun/text/resources/zh/CollationData_zh_TW.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/zh/CollationData_zh_TW.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/zh/CollationData_zh_TW.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/zh/CollationData_zh_TW.java
diff --git a/jdk/src/share/classes/sun/text/resources/zh/FormatData_zh.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/zh/FormatData_zh.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/zh/FormatData_zh.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/zh/FormatData_zh.java
diff --git a/jdk/src/share/classes/sun/text/resources/zh/FormatData_zh_CN.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/zh/FormatData_zh_CN.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/zh/FormatData_zh_CN.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/zh/FormatData_zh_CN.java
diff --git a/jdk/src/share/classes/sun/text/resources/zh/FormatData_zh_HK.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/zh/FormatData_zh_HK.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/zh/FormatData_zh_HK.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/zh/FormatData_zh_HK.java
diff --git a/jdk/src/share/classes/sun/text/resources/zh/FormatData_zh_SG.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/zh/FormatData_zh_SG.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/zh/FormatData_zh_SG.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/zh/FormatData_zh_SG.java
diff --git a/jdk/src/share/classes/sun/text/resources/zh/FormatData_zh_TW.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/zh/FormatData_zh_TW.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/zh/FormatData_zh_TW.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/zh/FormatData_zh_TW.java
diff --git a/jdk/src/share/classes/sun/text/resources/zh/JavaTimeSupplementary_zh.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/zh/JavaTimeSupplementary_zh.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/zh/JavaTimeSupplementary_zh.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/zh/JavaTimeSupplementary_zh.java
diff --git a/jdk/src/share/classes/sun/text/resources/zh/JavaTimeSupplementary_zh_TW.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/zh/JavaTimeSupplementary_zh_TW.java
similarity index 100%
rename from jdk/src/share/classes/sun/text/resources/zh/JavaTimeSupplementary_zh_TW.java
rename to jdk/src/jdk.localedata/share/classes/sun/text/resources/zh/JavaTimeSupplementary_zh_TW.java
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/LICENSE b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/LICENSE
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/LICENSE
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/LICENSE
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/dtd/ldml.dtd b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/dtd/ldml.dtd
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/dtd/ldml.dtd
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/dtd/ldml.dtd
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/dtd/ldmlSupplemental.dtd b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/dtd/ldmlSupplemental.dtd
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/dtd/ldmlSupplemental.dtd
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/dtd/ldmlSupplemental.dtd
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/aa.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/aa.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/aa.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/aa.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/aa_DJ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/aa_DJ.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/aa_DJ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/aa_DJ.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/aa_ER.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/aa_ER.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/aa_ER.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/aa_ER.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/aa_ET.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/aa_ET.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/aa_ET.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/aa_ET.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/af.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/af.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/af.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/af.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/af_NA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/af_NA.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/af_NA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/af_NA.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/af_ZA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/af_ZA.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/af_ZA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/af_ZA.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/agq.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/agq.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/agq.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/agq.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/agq_CM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/agq_CM.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/agq_CM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/agq_CM.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ak.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ak.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ak.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ak.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ak_GH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ak_GH.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ak_GH.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ak_GH.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/am.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/am.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/am.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/am.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/am_ET.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/am_ET.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/am_ET.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/am_ET.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_001.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_001.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_001.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_001.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_AE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_AE.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_AE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_AE.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_BH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_BH.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_BH.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_BH.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_DZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_DZ.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_DZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_DZ.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_EG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_EG.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_EG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_EG.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_IQ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_IQ.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_IQ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_IQ.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_JO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_JO.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_JO.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_JO.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_KW.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_KW.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_KW.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_KW.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_LB.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_LB.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_LB.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_LB.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_LY.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_LY.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_LY.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_LY.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_MA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_MA.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_MA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_MA.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_OM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_OM.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_OM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_OM.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_QA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_QA.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_QA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_QA.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_SA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_SA.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_SA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_SA.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_SD.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_SD.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_SD.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_SD.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_SY.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_SY.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_SY.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_SY.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_TN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_TN.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_TN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_TN.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_YE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_YE.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_YE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_YE.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/as.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/as.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/as.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/as.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/as_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/as_IN.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/as_IN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/as_IN.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/asa.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/asa.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/asa.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/asa.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/asa_TZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/asa_TZ.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/asa_TZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/asa_TZ.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/az.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/az.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/az.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/az.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/az_Cyrl.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/az_Cyrl.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/az_Cyrl.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/az_Cyrl.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/az_Cyrl_AZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/az_Cyrl_AZ.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/az_Cyrl_AZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/az_Cyrl_AZ.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/az_Latn.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/az_Latn.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/az_Latn.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/az_Latn.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/az_Latn_AZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/az_Latn_AZ.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/az_Latn_AZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/az_Latn_AZ.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bas.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bas.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bas.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bas.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bas_CM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bas_CM.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bas_CM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bas_CM.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/be.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/be.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/be.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/be.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/be_BY.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/be_BY.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/be_BY.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/be_BY.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bem.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bem.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bem.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bem.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bem_ZM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bem_ZM.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bem_ZM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bem_ZM.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bez.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bez.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bez.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bez.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bez_TZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bez_TZ.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bez_TZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bez_TZ.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bg.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bg.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bg.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bg.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bg_BG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bg_BG.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bg_BG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bg_BG.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bm.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bm.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bm.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bm.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bm_ML.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bm_ML.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bm_ML.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bm_ML.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bn.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bn.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bn.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bn.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bn_BD.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bn_BD.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bn_BD.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bn_BD.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bn_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bn_IN.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bn_IN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bn_IN.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bo.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bo.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bo.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bo.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bo_CN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bo_CN.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bo_CN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bo_CN.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bo_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bo_IN.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bo_IN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bo_IN.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/br.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/br.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/br.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/br.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/br_FR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/br_FR.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/br_FR.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/br_FR.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/brx.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/brx.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/brx.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/brx.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/brx_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/brx_IN.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/brx_IN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/brx_IN.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bs.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bs.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bs.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bs.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bs_BA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bs_BA.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/bs_BA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bs_BA.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/byn.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/byn.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/byn.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/byn.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/byn_ER.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/byn_ER.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/byn_ER.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/byn_ER.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ca.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ca.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ca.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ca.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ca_ES.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ca_ES.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ca_ES.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ca_ES.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/cgg.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/cgg.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/cgg.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/cgg.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/cgg_UG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/cgg_UG.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/cgg_UG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/cgg_UG.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/chr.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/chr.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/chr.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/chr.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/chr_US.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/chr_US.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/chr_US.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/chr_US.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/cs.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/cs.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/cs.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/cs.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/cs_CZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/cs_CZ.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/cs_CZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/cs_CZ.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/cy.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/cy.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/cy.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/cy.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/cy_GB.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/cy_GB.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/cy_GB.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/cy_GB.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/da.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/da.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/da.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/da.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/da_DK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/da_DK.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/da_DK.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/da_DK.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/dav.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/dav.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/dav.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/dav.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/dav_KE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/dav_KE.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/dav_KE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/dav_KE.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/de.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/de.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/de.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/de.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/de_AT.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/de_AT.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/de_AT.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/de_AT.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/de_BE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/de_BE.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/de_BE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/de_BE.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/de_CH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/de_CH.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/de_CH.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/de_CH.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/de_DE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/de_DE.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/de_DE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/de_DE.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/de_LI.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/de_LI.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/de_LI.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/de_LI.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/de_LU.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/de_LU.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/de_LU.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/de_LU.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/dje.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/dje.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/dje.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/dje.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/dje_NE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/dje_NE.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/dje_NE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/dje_NE.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/dua.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/dua.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/dua.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/dua.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/dua_CM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/dua_CM.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/dua_CM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/dua_CM.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/dyo.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/dyo.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/dyo.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/dyo.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/dyo_SN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/dyo_SN.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/dyo_SN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/dyo_SN.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/dz.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/dz.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/dz.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/dz.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/dz_BT.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/dz_BT.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/dz_BT.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/dz_BT.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ebu.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ebu.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ebu.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ebu.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ebu_KE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ebu_KE.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ebu_KE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ebu_KE.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ee.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ee.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ee.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ee.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ee_GH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ee_GH.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ee_GH.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ee_GH.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ee_TG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ee_TG.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ee_TG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ee_TG.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/el.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/el.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/el.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/el.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/el_CY.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/el_CY.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/el_CY.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/el_CY.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/el_GR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/el_GR.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/el_GR.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/el_GR.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_AS.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_AS.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_AS.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_AS.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_AU.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_AU.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_AU.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_AU.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_BB.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_BB.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_BB.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_BB.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_BE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_BE.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_BE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_BE.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_BM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_BM.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_BM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_BM.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_BW.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_BW.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_BW.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_BW.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_BZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_BZ.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_BZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_BZ.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_CA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_CA.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_CA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_CA.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_Dsrt.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_Dsrt.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_Dsrt.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_Dsrt.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_Dsrt_US.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_Dsrt_US.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_Dsrt_US.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_Dsrt_US.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_GB.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_GB.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_GB.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_GB.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_GU.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_GU.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_GU.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_GU.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_GY.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_GY.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_GY.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_GY.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_HK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_HK.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_HK.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_HK.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_IE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_IE.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_IE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_IE.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_IN.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_IN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_IN.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_JM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_JM.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_JM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_JM.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_MH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_MH.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_MH.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_MH.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_MP.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_MP.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_MP.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_MP.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_MT.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_MT.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_MT.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_MT.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_MU.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_MU.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_MU.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_MU.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_NA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_NA.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_NA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_NA.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_NZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_NZ.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_NZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_NZ.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_PH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_PH.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_PH.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_PH.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_PK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_PK.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_PK.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_PK.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_SG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_SG.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_SG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_SG.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_TT.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_TT.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_TT.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_TT.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_UM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_UM.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_UM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_UM.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_US.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_US.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_US.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_US.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_US_POSIX.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_US_POSIX.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_US_POSIX.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_US_POSIX.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_VI.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_VI.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_VI.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_VI.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_ZA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_ZA.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_ZA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_ZA.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_ZW.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_ZW.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_ZW.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_ZW.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/eo.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/eo.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/eo.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/eo.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_419.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_419.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_419.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_419.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_AR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_AR.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_AR.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_AR.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_BO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_BO.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_BO.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_BO.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_CL.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_CL.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_CL.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_CL.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_CO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_CO.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_CO.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_CO.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_CR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_CR.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_CR.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_CR.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_DO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_DO.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_DO.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_DO.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_EC.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_EC.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_EC.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_EC.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_ES.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_ES.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_ES.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_ES.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_GQ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_GQ.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_GQ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_GQ.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_GT.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_GT.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_GT.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_GT.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_HN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_HN.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_HN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_HN.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_MX.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_MX.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_MX.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_MX.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_NI.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_NI.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_NI.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_NI.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_PA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_PA.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_PA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_PA.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_PE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_PE.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_PE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_PE.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_PR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_PR.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_PR.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_PR.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_PY.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_PY.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_PY.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_PY.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_SV.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_SV.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_SV.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_SV.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_US.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_US.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_US.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_US.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_UY.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_UY.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_UY.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_UY.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_VE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_VE.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_VE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_VE.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/et.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/et.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/et.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/et.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/et_EE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/et_EE.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/et_EE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/et_EE.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/eu.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/eu.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/eu.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/eu.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/eu_ES.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/eu_ES.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/eu_ES.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/eu_ES.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ewo.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ewo.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ewo.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ewo.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ewo_CM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ewo_CM.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ewo_CM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ewo_CM.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fa.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fa.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fa.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fa.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fa_AF.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fa_AF.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fa_AF.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fa_AF.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fa_IR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fa_IR.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fa_IR.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fa_IR.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ff.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ff.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ff.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ff.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ff_SN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ff_SN.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ff_SN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ff_SN.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fi.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fi.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fi.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fi.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fi_FI.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fi_FI.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fi_FI.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fi_FI.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fil.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fil.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fil.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fil.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fil_PH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fil_PH.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fil_PH.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fil_PH.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fo.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fo.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fo.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fo.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fo_FO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fo_FO.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fo_FO.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fo_FO.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_BE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_BE.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_BE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_BE.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_BF.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_BF.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_BF.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_BF.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_BI.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_BI.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_BI.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_BI.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_BJ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_BJ.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_BJ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_BJ.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_BL.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_BL.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_BL.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_BL.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_CA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_CA.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_CA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_CA.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_CD.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_CD.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_CD.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_CD.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_CF.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_CF.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_CF.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_CF.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_CG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_CG.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_CG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_CG.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_CH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_CH.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_CH.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_CH.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_CI.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_CI.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_CI.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_CI.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_CM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_CM.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_CM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_CM.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_DJ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_DJ.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_DJ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_DJ.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_FR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_FR.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_FR.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_FR.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_GA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_GA.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_GA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_GA.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_GF.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_GF.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_GF.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_GF.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_GN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_GN.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_GN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_GN.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_GP.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_GP.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_GP.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_GP.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_GQ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_GQ.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_GQ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_GQ.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_KM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_KM.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_KM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_KM.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_LU.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_LU.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_LU.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_LU.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_MC.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_MC.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_MC.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_MC.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_MF.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_MF.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_MF.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_MF.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_MG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_MG.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_MG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_MG.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_ML.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_ML.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_ML.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_ML.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_MQ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_MQ.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_MQ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_MQ.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_NE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_NE.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_NE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_NE.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_RE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_RE.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_RE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_RE.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_RW.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_RW.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_RW.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_RW.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_SN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_SN.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_SN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_SN.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_TD.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_TD.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_TD.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_TD.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_TG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_TG.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_TG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_TG.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_YT.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_YT.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_YT.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_YT.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fur.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fur.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fur.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fur.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fur_IT.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fur_IT.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/fur_IT.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fur_IT.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ga.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ga.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ga.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ga.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ga_IE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ga_IE.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ga_IE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ga_IE.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/gd.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/gd.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/gd.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/gd.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/gd_GB.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/gd_GB.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/gd_GB.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/gd_GB.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/gl.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/gl.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/gl.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/gl.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/gl_ES.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/gl_ES.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/gl_ES.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/gl_ES.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/gsw.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/gsw.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/gsw.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/gsw.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/gsw_CH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/gsw_CH.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/gsw_CH.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/gsw_CH.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/gu.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/gu.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/gu.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/gu.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/gu_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/gu_IN.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/gu_IN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/gu_IN.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/guz.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/guz.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/guz.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/guz.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/guz_KE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/guz_KE.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/guz_KE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/guz_KE.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/gv.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/gv.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/gv.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/gv.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/gv_GB.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/gv_GB.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/gv_GB.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/gv_GB.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ha.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ha.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ha.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ha.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ha_Latn.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ha_Latn.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ha_Latn.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ha_Latn.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ha_Latn_GH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ha_Latn_GH.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ha_Latn_GH.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ha_Latn_GH.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ha_Latn_NE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ha_Latn_NE.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ha_Latn_NE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ha_Latn_NE.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ha_Latn_NG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ha_Latn_NG.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ha_Latn_NG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ha_Latn_NG.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/haw.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/haw.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/haw.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/haw.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/haw_US.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/haw_US.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/haw_US.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/haw_US.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/he.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/he.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/he.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/he.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/he_IL.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/he_IL.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/he_IL.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/he_IL.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/hi.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/hi.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/hi.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/hi.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/hi_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/hi_IN.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/hi_IN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/hi_IN.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/hr.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/hr.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/hr.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/hr.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/hr_HR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/hr_HR.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/hr_HR.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/hr_HR.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/hu.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/hu.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/hu.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/hu.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/hu_HU.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/hu_HU.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/hu_HU.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/hu_HU.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/hy.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/hy.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/hy.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/hy.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/hy_AM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/hy_AM.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/hy_AM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/hy_AM.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ia.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ia.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ia.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ia.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/id.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/id.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/id.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/id.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/id_ID.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/id_ID.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/id_ID.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/id_ID.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ig.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ig.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ig.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ig.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ig_NG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ig_NG.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ig_NG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ig_NG.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ii.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ii.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ii.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ii.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ii_CN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ii_CN.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ii_CN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ii_CN.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/is.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/is.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/is.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/is.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/is_IS.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/is_IS.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/is_IS.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/is_IS.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/it.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/it.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/it.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/it.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/it_CH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/it_CH.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/it_CH.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/it_CH.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/it_IT.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/it_IT.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/it_IT.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/it_IT.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ja.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ja.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ja.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ja.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ja_JP.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ja_JP.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ja_JP.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ja_JP.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/jmc.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/jmc.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/jmc.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/jmc.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/jmc_TZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/jmc_TZ.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/jmc_TZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/jmc_TZ.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ka.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ka.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ka.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ka.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ka_GE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ka_GE.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ka_GE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ka_GE.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kab.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kab.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kab.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kab.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kab_DZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kab_DZ.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kab_DZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kab_DZ.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kam.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kam.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kam.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kam.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kam_KE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kam_KE.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kam_KE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kam_KE.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kde.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kde.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kde.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kde.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kde_TZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kde_TZ.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kde_TZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kde_TZ.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kea.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kea.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kea.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kea.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kea_CV.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kea_CV.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kea_CV.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kea_CV.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/khq.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/khq.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/khq.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/khq.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/khq_ML.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/khq_ML.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/khq_ML.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/khq_ML.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ki.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ki.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ki.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ki.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ki_KE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ki_KE.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ki_KE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ki_KE.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kk.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kk.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kk.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kk.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kk_Cyrl.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kk_Cyrl.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kk_Cyrl.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kk_Cyrl.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kk_Cyrl_KZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kk_Cyrl_KZ.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kk_Cyrl_KZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kk_Cyrl_KZ.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kl.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kl.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kl.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kl.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kl_GL.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kl_GL.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kl_GL.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kl_GL.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kln.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kln.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kln.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kln.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kln_KE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kln_KE.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kln_KE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kln_KE.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/km.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/km.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/km.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/km.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/km_KH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/km_KH.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/km_KH.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/km_KH.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kn.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kn.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kn.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kn.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kn_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kn_IN.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kn_IN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kn_IN.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ko.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ko.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ko.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ko.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ko_KR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ko_KR.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ko_KR.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ko_KR.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kok.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kok.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kok.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kok.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kok_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kok_IN.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kok_IN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kok_IN.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ksb.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ksb.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ksb.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ksb.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ksb_TZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ksb_TZ.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ksb_TZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ksb_TZ.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ksf.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ksf.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ksf.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ksf.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ksf_CM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ksf_CM.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ksf_CM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ksf_CM.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ksh.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ksh.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ksh.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ksh.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ksh_DE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ksh_DE.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ksh_DE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ksh_DE.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kw.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kw.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kw.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kw.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kw_GB.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kw_GB.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/kw_GB.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kw_GB.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/lag.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lag.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/lag.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lag.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/lag_TZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lag_TZ.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/lag_TZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lag_TZ.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/lg.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lg.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/lg.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lg.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/lg_UG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lg_UG.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/lg_UG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lg_UG.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ln.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ln.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ln.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ln.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ln_CD.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ln_CD.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ln_CD.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ln_CD.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ln_CG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ln_CG.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ln_CG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ln_CG.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/lo.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lo.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/lo.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lo.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/lo_LA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lo_LA.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/lo_LA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lo_LA.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/lt.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lt.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/lt.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lt.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/lt_LT.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lt_LT.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/lt_LT.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lt_LT.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/lu.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lu.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/lu.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lu.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/lu_CD.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lu_CD.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/lu_CD.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lu_CD.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/luo.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/luo.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/luo.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/luo.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/luo_KE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/luo_KE.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/luo_KE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/luo_KE.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/luy.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/luy.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/luy.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/luy.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/luy_KE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/luy_KE.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/luy_KE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/luy_KE.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/lv.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lv.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/lv.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lv.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/lv_LV.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lv_LV.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/lv_LV.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lv_LV.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mas.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mas.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mas.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mas.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mas_KE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mas_KE.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mas_KE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mas_KE.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mas_TZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mas_TZ.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mas_TZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mas_TZ.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mer.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mer.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mer.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mer.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mer_KE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mer_KE.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mer_KE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mer_KE.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mfe.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mfe.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mfe.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mfe.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mfe_MU.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mfe_MU.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mfe_MU.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mfe_MU.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mg.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mg.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mg.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mg.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mg_MG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mg_MG.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mg_MG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mg_MG.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mgh.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mgh.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mgh.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mgh.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mgh_MZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mgh_MZ.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mgh_MZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mgh_MZ.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mk.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mk.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mk.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mk.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mk_MK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mk_MK.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mk_MK.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mk_MK.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ml.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ml.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ml.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ml.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ml_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ml_IN.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ml_IN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ml_IN.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mr.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mr.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mr.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mr.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mr_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mr_IN.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mr_IN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mr_IN.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ms.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ms.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ms.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ms.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ms_BN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ms_BN.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ms_BN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ms_BN.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ms_MY.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ms_MY.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ms_MY.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ms_MY.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mt.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mt.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mt.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mt.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mt_MT.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mt_MT.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mt_MT.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mt_MT.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mua.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mua.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mua.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mua.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mua_CM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mua_CM.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/mua_CM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mua_CM.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/my.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/my.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/my.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/my.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/my_MM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/my_MM.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/my_MM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/my_MM.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/naq.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/naq.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/naq.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/naq.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/naq_NA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/naq_NA.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/naq_NA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/naq_NA.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nb.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nb.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nb.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nb.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nb_NO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nb_NO.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nb_NO.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nb_NO.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nd.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nd.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nd.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nd.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nd_ZW.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nd_ZW.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nd_ZW.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nd_ZW.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ne.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ne.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ne.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ne.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ne_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ne_IN.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ne_IN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ne_IN.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ne_NP.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ne_NP.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ne_NP.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ne_NP.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nl.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nl.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nl.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nl.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nl_AW.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nl_AW.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nl_AW.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nl_AW.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nl_BE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nl_BE.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nl_BE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nl_BE.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nl_CW.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nl_CW.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nl_CW.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nl_CW.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nl_NL.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nl_NL.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nl_NL.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nl_NL.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nl_SX.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nl_SX.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nl_SX.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nl_SX.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nmg.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nmg.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nmg.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nmg.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nmg_CM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nmg_CM.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nmg_CM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nmg_CM.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nn.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nn.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nn.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nn.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nn_NO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nn_NO.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nn_NO.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nn_NO.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nr.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nr.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nr.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nr.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nr_ZA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nr_ZA.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nr_ZA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nr_ZA.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nso.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nso.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nso.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nso.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nso_ZA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nso_ZA.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nso_ZA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nso_ZA.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nus.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nus.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nus.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nus.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nus_SD.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nus_SD.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nus_SD.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nus_SD.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nyn.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nyn.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nyn.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nyn.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nyn_UG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nyn_UG.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/nyn_UG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nyn_UG.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/om.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/om.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/om.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/om.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/om_ET.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/om_ET.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/om_ET.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/om_ET.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/om_KE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/om_KE.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/om_KE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/om_KE.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/or.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/or.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/or.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/or.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/or_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/or_IN.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/or_IN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/or_IN.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/pa.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pa.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/pa.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pa.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/pa_Arab.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pa_Arab.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/pa_Arab.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pa_Arab.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/pa_Arab_PK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pa_Arab_PK.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/pa_Arab_PK.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pa_Arab_PK.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/pa_Guru.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pa_Guru.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/pa_Guru.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pa_Guru.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/pa_Guru_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pa_Guru_IN.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/pa_Guru_IN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pa_Guru_IN.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/pl.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pl.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/pl.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pl.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/pl_PL.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pl_PL.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/pl_PL.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pl_PL.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ps.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ps.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ps.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ps.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ps_AF.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ps_AF.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ps_AF.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ps_AF.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/pt.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pt.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/pt.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pt.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/pt_AO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pt_AO.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/pt_AO.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pt_AO.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/pt_BR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pt_BR.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/pt_BR.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pt_BR.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/pt_GW.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pt_GW.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/pt_GW.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pt_GW.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/pt_MZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pt_MZ.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/pt_MZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pt_MZ.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/pt_PT.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pt_PT.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/pt_PT.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pt_PT.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/pt_ST.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pt_ST.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/pt_ST.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pt_ST.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/rm.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/rm.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/rm.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/rm.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/rm_CH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/rm_CH.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/rm_CH.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/rm_CH.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/rn.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/rn.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/rn.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/rn.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/rn_BI.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/rn_BI.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/rn_BI.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/rn_BI.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ro.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ro.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ro.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ro.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ro_MD.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ro_MD.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ro_MD.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ro_MD.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ro_RO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ro_RO.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ro_RO.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ro_RO.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/rof.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/rof.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/rof.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/rof.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/rof_TZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/rof_TZ.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/rof_TZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/rof_TZ.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/root.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/root.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/root.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/root.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ru.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ru.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ru.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ru.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ru_MD.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ru_MD.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ru_MD.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ru_MD.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ru_RU.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ru_RU.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ru_RU.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ru_RU.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ru_UA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ru_UA.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ru_UA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ru_UA.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/rw.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/rw.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/rw.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/rw.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/rw_RW.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/rw_RW.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/rw_RW.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/rw_RW.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/rwk.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/rwk.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/rwk.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/rwk.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/rwk_TZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/rwk_TZ.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/rwk_TZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/rwk_TZ.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sah.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sah.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sah.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sah.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sah_RU.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sah_RU.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sah_RU.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sah_RU.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/saq.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/saq.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/saq.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/saq.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/saq_KE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/saq_KE.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/saq_KE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/saq_KE.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sbp.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sbp.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sbp.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sbp.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sbp_TZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sbp_TZ.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sbp_TZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sbp_TZ.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/se.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/se.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/se.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/se.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/se_FI.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/se_FI.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/se_FI.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/se_FI.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/se_NO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/se_NO.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/se_NO.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/se_NO.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/seh.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/seh.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/seh.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/seh.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/seh_MZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/seh_MZ.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/seh_MZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/seh_MZ.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ses.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ses.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ses.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ses.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ses_ML.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ses_ML.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ses_ML.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ses_ML.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sg.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sg.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sg.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sg.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sg_CF.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sg_CF.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sg_CF.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sg_CF.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/shi.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/shi.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/shi.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/shi.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/shi_Latn.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/shi_Latn.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/shi_Latn.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/shi_Latn.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/shi_Latn_MA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/shi_Latn_MA.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/shi_Latn_MA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/shi_Latn_MA.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/shi_Tfng.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/shi_Tfng.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/shi_Tfng.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/shi_Tfng.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/shi_Tfng_MA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/shi_Tfng_MA.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/shi_Tfng_MA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/shi_Tfng_MA.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/si.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/si.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/si.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/si.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/si_LK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/si_LK.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/si_LK.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/si_LK.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sk.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sk.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sk.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sk.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sk_SK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sk_SK.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sk_SK.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sk_SK.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sl.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sl.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sl.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sl.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sl_SI.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sl_SI.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sl_SI.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sl_SI.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sn.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sn.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sn.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sn.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sn_ZW.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sn_ZW.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sn_ZW.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sn_ZW.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/so.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/so.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/so.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/so.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/so_DJ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/so_DJ.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/so_DJ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/so_DJ.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/so_ET.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/so_ET.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/so_ET.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/so_ET.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/so_KE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/so_KE.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/so_KE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/so_KE.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/so_SO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/so_SO.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/so_SO.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/so_SO.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sq.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sq.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sq.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sq.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sq_AL.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sq_AL.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sq_AL.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sq_AL.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Cyrl.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Cyrl.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Cyrl.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Cyrl.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Cyrl_BA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Cyrl_BA.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Cyrl_BA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Cyrl_BA.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Cyrl_ME.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Cyrl_ME.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Cyrl_ME.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Cyrl_ME.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Cyrl_RS.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Cyrl_RS.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Cyrl_RS.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Cyrl_RS.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Latn.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Latn.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Latn.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Latn.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Latn_BA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Latn_BA.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Latn_BA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Latn_BA.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Latn_ME.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Latn_ME.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Latn_ME.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Latn_ME.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Latn_RS.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Latn_RS.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Latn_RS.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Latn_RS.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ss.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ss.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ss.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ss.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ss_SZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ss_SZ.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ss_SZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ss_SZ.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ss_ZA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ss_ZA.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ss_ZA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ss_ZA.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ssy.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ssy.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ssy.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ssy.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ssy_ER.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ssy_ER.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ssy_ER.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ssy_ER.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/st.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/st.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/st.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/st.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/st_LS.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/st_LS.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/st_LS.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/st_LS.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/st_ZA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/st_ZA.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/st_ZA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/st_ZA.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sv.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sv.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sv.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sv.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sv_FI.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sv_FI.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sv_FI.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sv_FI.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sv_SE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sv_SE.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sv_SE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sv_SE.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sw.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sw.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sw.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sw.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sw_KE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sw_KE.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sw_KE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sw_KE.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sw_TZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sw_TZ.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/sw_TZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sw_TZ.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/swc.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/swc.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/swc.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/swc.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/swc_CD.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/swc_CD.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/swc_CD.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/swc_CD.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ta.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ta.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ta.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ta.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ta_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ta_IN.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ta_IN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ta_IN.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ta_LK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ta_LK.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ta_LK.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ta_LK.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/te.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/te.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/te.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/te.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/te_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/te_IN.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/te_IN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/te_IN.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/teo.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/teo.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/teo.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/teo.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/teo_KE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/teo_KE.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/teo_KE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/teo_KE.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/teo_UG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/teo_UG.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/teo_UG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/teo_UG.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/tg.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tg.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/tg.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tg.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/tg_Cyrl.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tg_Cyrl.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/tg_Cyrl.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tg_Cyrl.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/tg_Cyrl_TJ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tg_Cyrl_TJ.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/tg_Cyrl_TJ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tg_Cyrl_TJ.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/th.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/th.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/th.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/th.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/th_TH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/th_TH.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/th_TH.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/th_TH.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ti.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ti.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ti.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ti.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ti_ER.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ti_ER.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ti_ER.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ti_ER.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ti_ET.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ti_ET.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ti_ET.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ti_ET.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/tig.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tig.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/tig.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tig.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/tig_ER.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tig_ER.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/tig_ER.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tig_ER.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/tn.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tn.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/tn.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tn.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/tn_ZA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tn_ZA.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/tn_ZA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tn_ZA.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/to.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/to.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/to.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/to.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/to_TO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/to_TO.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/to_TO.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/to_TO.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/tr.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tr.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/tr.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tr.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/tr_TR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tr_TR.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/tr_TR.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tr_TR.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ts.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ts.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ts.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ts.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ts_ZA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ts_ZA.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ts_ZA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ts_ZA.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/twq.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/twq.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/twq.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/twq.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/twq_NE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/twq_NE.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/twq_NE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/twq_NE.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/tzm.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tzm.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/tzm.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tzm.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/tzm_Latn.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tzm_Latn.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/tzm_Latn.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tzm_Latn.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/tzm_Latn_MA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tzm_Latn_MA.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/tzm_Latn_MA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tzm_Latn_MA.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/uk.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/uk.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/uk.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/uk.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/uk_UA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/uk_UA.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/uk_UA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/uk_UA.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ur.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ur.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ur.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ur.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ur_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ur_IN.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ur_IN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ur_IN.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ur_PK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ur_PK.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ur_PK.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ur_PK.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/uz.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/uz.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/uz.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/uz.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/uz_Arab.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/uz_Arab.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/uz_Arab.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/uz_Arab.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/uz_Arab_AF.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/uz_Arab_AF.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/uz_Arab_AF.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/uz_Arab_AF.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/uz_Cyrl.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/uz_Cyrl.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/uz_Cyrl.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/uz_Cyrl.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/uz_Cyrl_UZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/uz_Cyrl_UZ.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/uz_Cyrl_UZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/uz_Cyrl_UZ.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/uz_Latn.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/uz_Latn.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/uz_Latn.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/uz_Latn.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/uz_Latn_UZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/uz_Latn_UZ.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/uz_Latn_UZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/uz_Latn_UZ.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/vai.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/vai.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/vai.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/vai.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/vai_Latn.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/vai_Latn.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/vai_Latn.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/vai_Latn.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/vai_Latn_LR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/vai_Latn_LR.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/vai_Latn_LR.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/vai_Latn_LR.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/vai_Vaii.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/vai_Vaii.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/vai_Vaii.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/vai_Vaii.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/vai_Vaii_LR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/vai_Vaii_LR.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/vai_Vaii_LR.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/vai_Vaii_LR.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ve.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ve.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ve.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ve.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ve_ZA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ve_ZA.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ve_ZA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ve_ZA.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/vi.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/vi.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/vi.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/vi.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/vi_VN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/vi_VN.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/vi_VN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/vi_VN.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/vun.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/vun.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/vun.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/vun.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/vun_TZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/vun_TZ.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/vun_TZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/vun_TZ.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/wae.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/wae.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/wae.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/wae.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/wae_CH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/wae_CH.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/wae_CH.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/wae_CH.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/wal.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/wal.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/wal.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/wal.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/wal_ET.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/wal_ET.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/wal_ET.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/wal_ET.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/xh.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/xh.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/xh.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/xh.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/xh_ZA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/xh_ZA.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/xh_ZA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/xh_ZA.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/xog.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/xog.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/xog.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/xog.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/xog_UG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/xog_UG.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/xog_UG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/xog_UG.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/yav.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/yav.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/yav.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/yav.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/yav_CM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/yav_CM.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/yav_CM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/yav_CM.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/yo.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/yo.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/yo.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/yo.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/yo_NG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/yo_NG.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/yo_NG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/yo_NG.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hans.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hans.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hans.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hans.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hans_CN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hans_CN.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hans_CN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hans_CN.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hans_HK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hans_HK.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hans_HK.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hans_HK.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hans_MO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hans_MO.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hans_MO.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hans_MO.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hans_SG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hans_SG.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hans_SG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hans_SG.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hant.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hant.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hant.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hant.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hant_HK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hant_HK.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hant_HK.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hant_HK.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hant_MO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hant_MO.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hant_MO.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hant_MO.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hant_TW.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hant_TW.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hant_TW.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hant_TW.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/zu.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zu.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/zu.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zu.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/zu_ZA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zu_ZA.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/zu_ZA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zu_ZA.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/supplemental/metaZones.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/supplemental/metaZones.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/supplemental/metaZones.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/supplemental/metaZones.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/supplemental/numberingSystems.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/supplemental/numberingSystems.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/supplemental/numberingSystems.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/supplemental/numberingSystems.xml
diff --git a/jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/supplemental/supplementalData.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/supplemental/supplementalData.xml
similarity index 100%
rename from jdk/src/share/classes/sun/util/cldr/resources/21_0_1/common/supplemental/supplementalData.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/supplemental/supplementalData.xml
diff --git a/jdk/src/share/classes/sun/util/resources/ar/CalendarData_ar.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CalendarData_ar.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ar/CalendarData_ar.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CalendarData_ar.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ar/CurrencyNames_ar_AE.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_AE.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ar/CurrencyNames_ar_AE.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_AE.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ar/CurrencyNames_ar_BH.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_BH.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ar/CurrencyNames_ar_BH.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_BH.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ar/CurrencyNames_ar_DZ.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_DZ.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ar/CurrencyNames_ar_DZ.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_DZ.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ar/CurrencyNames_ar_EG.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_EG.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ar/CurrencyNames_ar_EG.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_EG.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ar/CurrencyNames_ar_IQ.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_IQ.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ar/CurrencyNames_ar_IQ.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_IQ.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ar/CurrencyNames_ar_JO.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_JO.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ar/CurrencyNames_ar_JO.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_JO.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ar/CurrencyNames_ar_KW.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_KW.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ar/CurrencyNames_ar_KW.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_KW.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ar/CurrencyNames_ar_LB.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_LB.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ar/CurrencyNames_ar_LB.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_LB.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ar/CurrencyNames_ar_LY.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_LY.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ar/CurrencyNames_ar_LY.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_LY.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ar/CurrencyNames_ar_MA.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_MA.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ar/CurrencyNames_ar_MA.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_MA.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ar/CurrencyNames_ar_OM.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_OM.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ar/CurrencyNames_ar_OM.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_OM.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ar/CurrencyNames_ar_QA.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_QA.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ar/CurrencyNames_ar_QA.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_QA.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ar/CurrencyNames_ar_SA.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_SA.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ar/CurrencyNames_ar_SA.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_SA.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ar/CurrencyNames_ar_SD.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_SD.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ar/CurrencyNames_ar_SD.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_SD.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ar/CurrencyNames_ar_SY.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_SY.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ar/CurrencyNames_ar_SY.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_SY.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ar/CurrencyNames_ar_TN.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_TN.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ar/CurrencyNames_ar_TN.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_TN.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ar/CurrencyNames_ar_YE.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_YE.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ar/CurrencyNames_ar_YE.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_YE.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ar/LocaleNames_ar.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/LocaleNames_ar.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ar/LocaleNames_ar.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/LocaleNames_ar.properties
diff --git a/jdk/src/share/classes/sun/util/resources/be/CalendarData_be.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/be/CalendarData_be.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/be/CalendarData_be.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/be/CalendarData_be.properties
diff --git a/jdk/src/share/classes/sun/util/resources/be/CurrencyNames_be_BY.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/be/CurrencyNames_be_BY.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/be/CurrencyNames_be_BY.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/be/CurrencyNames_be_BY.properties
diff --git a/jdk/src/share/classes/sun/util/resources/be/LocaleNames_be.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/be/LocaleNames_be.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/be/LocaleNames_be.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/be/LocaleNames_be.properties
diff --git a/jdk/src/share/classes/sun/util/resources/bg/CalendarData_bg.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/bg/CalendarData_bg.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/bg/CalendarData_bg.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/bg/CalendarData_bg.properties
diff --git a/jdk/src/share/classes/sun/util/resources/bg/CurrencyNames_bg_BG.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/bg/CurrencyNames_bg_BG.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/bg/CurrencyNames_bg_BG.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/bg/CurrencyNames_bg_BG.properties
diff --git a/jdk/src/share/classes/sun/util/resources/bg/LocaleNames_bg.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/bg/LocaleNames_bg.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/bg/LocaleNames_bg.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/bg/LocaleNames_bg.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ca/CalendarData_ca.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ca/CalendarData_ca.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ca/CalendarData_ca.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ca/CalendarData_ca.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ca/CurrencyNames_ca_ES.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ca/CurrencyNames_ca_ES.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ca/CurrencyNames_ca_ES.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ca/CurrencyNames_ca_ES.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ca/LocaleNames_ca.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ca/LocaleNames_ca.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ca/LocaleNames_ca.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ca/LocaleNames_ca.properties
diff --git a/jdk/src/share/classes/sun/util/resources/cs/CalendarData_cs.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/cs/CalendarData_cs.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/cs/CalendarData_cs.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/cs/CalendarData_cs.properties
diff --git a/jdk/src/share/classes/sun/util/resources/cs/CurrencyNames_cs_CZ.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/cs/CurrencyNames_cs_CZ.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/cs/CurrencyNames_cs_CZ.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/cs/CurrencyNames_cs_CZ.properties
diff --git a/jdk/src/share/classes/sun/util/resources/cs/LocaleNames_cs.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/cs/LocaleNames_cs.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/cs/LocaleNames_cs.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/cs/LocaleNames_cs.properties
diff --git a/jdk/src/share/classes/sun/util/resources/da/CalendarData_da.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/da/CalendarData_da.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/da/CalendarData_da.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/da/CalendarData_da.properties
diff --git a/jdk/src/share/classes/sun/util/resources/da/CurrencyNames_da_DK.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/da/CurrencyNames_da_DK.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/da/CurrencyNames_da_DK.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/da/CurrencyNames_da_DK.properties
diff --git a/jdk/src/share/classes/sun/util/resources/da/LocaleNames_da.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/da/LocaleNames_da.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/da/LocaleNames_da.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/da/LocaleNames_da.properties
diff --git a/jdk/src/share/classes/sun/util/resources/de/CalendarData_de.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/de/CalendarData_de.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/de/CalendarData_de.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/de/CalendarData_de.properties
diff --git a/jdk/src/share/classes/sun/util/resources/de/CurrencyNames_de.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/de/CurrencyNames_de.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/de/CurrencyNames_de.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/de/CurrencyNames_de.properties
diff --git a/jdk/src/share/classes/sun/util/resources/de/CurrencyNames_de_AT.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/de/CurrencyNames_de_AT.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/de/CurrencyNames_de_AT.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/de/CurrencyNames_de_AT.properties
diff --git a/jdk/src/share/classes/sun/util/resources/de/CurrencyNames_de_CH.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/de/CurrencyNames_de_CH.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/de/CurrencyNames_de_CH.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/de/CurrencyNames_de_CH.properties
diff --git a/jdk/src/share/classes/sun/util/resources/de/CurrencyNames_de_DE.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/de/CurrencyNames_de_DE.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/de/CurrencyNames_de_DE.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/de/CurrencyNames_de_DE.properties
diff --git a/jdk/src/share/classes/sun/util/resources/de/CurrencyNames_de_GR.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/de/CurrencyNames_de_GR.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/de/CurrencyNames_de_GR.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/de/CurrencyNames_de_GR.properties
diff --git a/jdk/src/share/classes/sun/util/resources/de/CurrencyNames_de_LU.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/de/CurrencyNames_de_LU.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/de/CurrencyNames_de_LU.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/de/CurrencyNames_de_LU.properties
diff --git a/jdk/src/share/classes/sun/util/resources/de/LocaleNames_de.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/de/LocaleNames_de.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/de/LocaleNames_de.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/de/LocaleNames_de.properties
diff --git a/jdk/src/share/classes/sun/util/resources/de/TimeZoneNames_de.java b/jdk/src/jdk.localedata/share/classes/sun/util/resources/de/TimeZoneNames_de.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/de/TimeZoneNames_de.java
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/de/TimeZoneNames_de.java
diff --git a/jdk/src/share/classes/sun/util/resources/el/CalendarData_el.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/el/CalendarData_el.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/el/CalendarData_el.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/el/CalendarData_el.properties
diff --git a/jdk/src/share/classes/sun/util/resources/el/CalendarData_el_CY.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/el/CalendarData_el_CY.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/el/CalendarData_el_CY.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/el/CalendarData_el_CY.properties
diff --git a/jdk/src/share/classes/sun/util/resources/el/CurrencyNames_el_CY.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/el/CurrencyNames_el_CY.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/el/CurrencyNames_el_CY.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/el/CurrencyNames_el_CY.properties
diff --git a/jdk/src/share/classes/sun/util/resources/el/CurrencyNames_el_GR.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/el/CurrencyNames_el_GR.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/el/CurrencyNames_el_GR.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/el/CurrencyNames_el_GR.properties
diff --git a/jdk/src/share/classes/sun/util/resources/el/LocaleNames_el.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/el/LocaleNames_el.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/el/LocaleNames_el.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/el/LocaleNames_el.properties
diff --git a/jdk/src/share/classes/sun/util/resources/el/LocaleNames_el_CY.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/el/LocaleNames_el_CY.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/el/LocaleNames_el_CY.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/el/LocaleNames_el_CY.properties
diff --git a/jdk/src/share/classes/sun/util/resources/es/CalendarData_es.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CalendarData_es.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/es/CalendarData_es.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CalendarData_es.properties
diff --git a/jdk/src/share/classes/sun/util/resources/es/CalendarData_es_ES.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CalendarData_es_ES.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/es/CalendarData_es_ES.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CalendarData_es_ES.properties
diff --git a/jdk/src/share/classes/sun/util/resources/es/CalendarData_es_US.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CalendarData_es_US.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/es/CalendarData_es_US.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CalendarData_es_US.properties
diff --git a/jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es.properties
diff --git a/jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_AR.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_AR.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_AR.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_AR.properties
diff --git a/jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_BO.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_BO.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_BO.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_BO.properties
diff --git a/jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_CL.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_CL.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_CL.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_CL.properties
diff --git a/jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_CO.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_CO.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_CO.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_CO.properties
diff --git a/jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_CR.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_CR.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_CR.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_CR.properties
diff --git a/jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_CU.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_CU.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_CU.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_CU.properties
diff --git a/jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_DO.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_DO.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_DO.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_DO.properties
diff --git a/jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_EC.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_EC.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_EC.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_EC.properties
diff --git a/jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_ES.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_ES.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_ES.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_ES.properties
diff --git a/jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_GT.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_GT.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_GT.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_GT.properties
diff --git a/jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_HN.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_HN.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_HN.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_HN.properties
diff --git a/jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_MX.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_MX.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_MX.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_MX.properties
diff --git a/jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_NI.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_NI.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_NI.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_NI.properties
diff --git a/jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_PA.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_PA.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_PA.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_PA.properties
diff --git a/jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_PE.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_PE.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_PE.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_PE.properties
diff --git a/jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_PR.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_PR.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_PR.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_PR.properties
diff --git a/jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_PY.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_PY.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_PY.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_PY.properties
diff --git a/jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_SV.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_SV.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_SV.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_SV.properties
diff --git a/jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_US.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_US.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_US.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_US.properties
diff --git a/jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_UY.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_UY.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_UY.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_UY.properties
diff --git a/jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_VE.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_VE.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/es/CurrencyNames_es_VE.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_VE.properties
diff --git a/jdk/src/share/classes/sun/util/resources/es/LocaleNames_es.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/es/LocaleNames_es.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/es/LocaleNames_es.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/es/LocaleNames_es.properties
diff --git a/jdk/src/share/classes/sun/util/resources/es/LocaleNames_es_US.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/es/LocaleNames_es_US.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/es/LocaleNames_es_US.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/es/LocaleNames_es_US.properties
diff --git a/jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java b/jdk/src/jdk.localedata/share/classes/sun/util/resources/es/TimeZoneNames_es.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/es/TimeZoneNames_es.java
diff --git a/jdk/src/share/classes/sun/util/resources/et/CalendarData_et.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/et/CalendarData_et.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/et/CalendarData_et.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/et/CalendarData_et.properties
diff --git a/jdk/src/share/classes/sun/util/resources/et/CurrencyNames_et_EE.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/et/CurrencyNames_et_EE.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/et/CurrencyNames_et_EE.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/et/CurrencyNames_et_EE.properties
diff --git a/jdk/src/share/classes/sun/util/resources/et/LocaleNames_et.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/et/LocaleNames_et.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/et/LocaleNames_et.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/et/LocaleNames_et.properties
diff --git a/jdk/src/share/classes/sun/util/resources/fi/CalendarData_fi.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/fi/CalendarData_fi.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/fi/CalendarData_fi.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/fi/CalendarData_fi.properties
diff --git a/jdk/src/share/classes/sun/util/resources/fi/CurrencyNames_fi_FI.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/fi/CurrencyNames_fi_FI.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/fi/CurrencyNames_fi_FI.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/fi/CurrencyNames_fi_FI.properties
diff --git a/jdk/src/share/classes/sun/util/resources/fi/LocaleNames_fi.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/fi/LocaleNames_fi.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/fi/LocaleNames_fi.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/fi/LocaleNames_fi.properties
diff --git a/jdk/src/share/classes/sun/util/resources/fr/CalendarData_fr.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/fr/CalendarData_fr.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/fr/CalendarData_fr.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/fr/CalendarData_fr.properties
diff --git a/jdk/src/share/classes/sun/util/resources/fr/CalendarData_fr_CA.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/fr/CalendarData_fr_CA.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/fr/CalendarData_fr_CA.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/fr/CalendarData_fr_CA.properties
diff --git a/jdk/src/share/classes/sun/util/resources/fr/CurrencyNames_fr.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/fr/CurrencyNames_fr.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/fr/CurrencyNames_fr.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/fr/CurrencyNames_fr.properties
diff --git a/jdk/src/share/classes/sun/util/resources/fr/CurrencyNames_fr_BE.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/fr/CurrencyNames_fr_BE.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/fr/CurrencyNames_fr_BE.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/fr/CurrencyNames_fr_BE.properties
diff --git a/jdk/src/share/classes/sun/util/resources/fr/CurrencyNames_fr_CA.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/fr/CurrencyNames_fr_CA.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/fr/CurrencyNames_fr_CA.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/fr/CurrencyNames_fr_CA.properties
diff --git a/jdk/src/share/classes/sun/util/resources/fr/CurrencyNames_fr_CH.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/fr/CurrencyNames_fr_CH.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/fr/CurrencyNames_fr_CH.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/fr/CurrencyNames_fr_CH.properties
diff --git a/jdk/src/share/classes/sun/util/resources/fr/CurrencyNames_fr_FR.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/fr/CurrencyNames_fr_FR.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/fr/CurrencyNames_fr_FR.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/fr/CurrencyNames_fr_FR.properties
diff --git a/jdk/src/share/classes/sun/util/resources/fr/CurrencyNames_fr_LU.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/fr/CurrencyNames_fr_LU.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/fr/CurrencyNames_fr_LU.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/fr/CurrencyNames_fr_LU.properties
diff --git a/jdk/src/share/classes/sun/util/resources/fr/LocaleNames_fr.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/fr/LocaleNames_fr.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/fr/LocaleNames_fr.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/fr/LocaleNames_fr.properties
diff --git a/jdk/src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java b/jdk/src/jdk.localedata/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java
diff --git a/jdk/src/share/classes/sun/util/resources/ga/CurrencyNames_ga_IE.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ga/CurrencyNames_ga_IE.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ga/CurrencyNames_ga_IE.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ga/CurrencyNames_ga_IE.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ga/LocaleNames_ga.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ga/LocaleNames_ga.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ga/LocaleNames_ga.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ga/LocaleNames_ga.properties
diff --git a/jdk/src/share/classes/sun/util/resources/hi/CalendarData_hi.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/hi/CalendarData_hi.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/hi/CalendarData_hi.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/hi/CalendarData_hi.properties
diff --git a/jdk/src/share/classes/sun/util/resources/hi/CurrencyNames_hi_IN.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/hi/CurrencyNames_hi_IN.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/hi/CurrencyNames_hi_IN.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/hi/CurrencyNames_hi_IN.properties
diff --git a/jdk/src/share/classes/sun/util/resources/hi/LocaleNames_hi.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/hi/LocaleNames_hi.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/hi/LocaleNames_hi.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/hi/LocaleNames_hi.properties
diff --git a/jdk/src/share/classes/sun/util/resources/hi/TimeZoneNames_hi.java b/jdk/src/jdk.localedata/share/classes/sun/util/resources/hi/TimeZoneNames_hi.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/hi/TimeZoneNames_hi.java
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/hi/TimeZoneNames_hi.java
diff --git a/jdk/src/share/classes/sun/util/resources/hr/CalendarData_hr.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/hr/CalendarData_hr.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/hr/CalendarData_hr.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/hr/CalendarData_hr.properties
diff --git a/jdk/src/share/classes/sun/util/resources/hr/CurrencyNames_hr_HR.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/hr/CurrencyNames_hr_HR.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/hr/CurrencyNames_hr_HR.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/hr/CurrencyNames_hr_HR.properties
diff --git a/jdk/src/share/classes/sun/util/resources/hr/LocaleNames_hr.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/hr/LocaleNames_hr.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/hr/LocaleNames_hr.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/hr/LocaleNames_hr.properties
diff --git a/jdk/src/share/classes/sun/util/resources/hu/CalendarData_hu.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/hu/CalendarData_hu.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/hu/CalendarData_hu.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/hu/CalendarData_hu.properties
diff --git a/jdk/src/share/classes/sun/util/resources/hu/CurrencyNames_hu_HU.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/hu/CurrencyNames_hu_HU.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/hu/CurrencyNames_hu_HU.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/hu/CurrencyNames_hu_HU.properties
diff --git a/jdk/src/share/classes/sun/util/resources/hu/LocaleNames_hu.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/hu/LocaleNames_hu.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/hu/LocaleNames_hu.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/hu/LocaleNames_hu.properties
diff --git a/jdk/src/share/classes/sun/util/resources/in/CalendarData_in_ID.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/in/CalendarData_in_ID.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/in/CalendarData_in_ID.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/in/CalendarData_in_ID.properties
diff --git a/jdk/src/share/classes/sun/util/resources/in/CurrencyNames_in_ID.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/in/CurrencyNames_in_ID.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/in/CurrencyNames_in_ID.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/in/CurrencyNames_in_ID.properties
diff --git a/jdk/src/share/classes/sun/util/resources/in/LocaleNames_in.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/in/LocaleNames_in.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/in/LocaleNames_in.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/in/LocaleNames_in.properties
diff --git a/jdk/src/share/classes/sun/util/resources/is/CalendarData_is.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/is/CalendarData_is.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/is/CalendarData_is.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/is/CalendarData_is.properties
diff --git a/jdk/src/share/classes/sun/util/resources/is/CurrencyNames_is_IS.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/is/CurrencyNames_is_IS.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/is/CurrencyNames_is_IS.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/is/CurrencyNames_is_IS.properties
diff --git a/jdk/src/share/classes/sun/util/resources/is/LocaleNames_is.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/is/LocaleNames_is.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/is/LocaleNames_is.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/is/LocaleNames_is.properties
diff --git a/jdk/src/share/classes/sun/util/resources/it/CalendarData_it.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/it/CalendarData_it.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/it/CalendarData_it.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/it/CalendarData_it.properties
diff --git a/jdk/src/share/classes/sun/util/resources/it/CurrencyNames_it.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/it/CurrencyNames_it.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/it/CurrencyNames_it.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/it/CurrencyNames_it.properties
diff --git a/jdk/src/share/classes/sun/util/resources/it/CurrencyNames_it_CH.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/it/CurrencyNames_it_CH.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/it/CurrencyNames_it_CH.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/it/CurrencyNames_it_CH.properties
diff --git a/jdk/src/share/classes/sun/util/resources/it/CurrencyNames_it_IT.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/it/CurrencyNames_it_IT.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/it/CurrencyNames_it_IT.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/it/CurrencyNames_it_IT.properties
diff --git a/jdk/src/share/classes/sun/util/resources/it/LocaleNames_it.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/it/LocaleNames_it.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/it/LocaleNames_it.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/it/LocaleNames_it.properties
diff --git a/jdk/src/share/classes/sun/util/resources/it/TimeZoneNames_it.java b/jdk/src/jdk.localedata/share/classes/sun/util/resources/it/TimeZoneNames_it.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/it/TimeZoneNames_it.java
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/it/TimeZoneNames_it.java
diff --git a/jdk/src/share/classes/sun/util/resources/iw/CalendarData_iw.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/iw/CalendarData_iw.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/iw/CalendarData_iw.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/iw/CalendarData_iw.properties
diff --git a/jdk/src/share/classes/sun/util/resources/iw/CurrencyNames_iw_IL.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/iw/CurrencyNames_iw_IL.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/iw/CurrencyNames_iw_IL.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/iw/CurrencyNames_iw_IL.properties
diff --git a/jdk/src/share/classes/sun/util/resources/iw/LocaleNames_iw.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/iw/LocaleNames_iw.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/iw/LocaleNames_iw.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/iw/LocaleNames_iw.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ja/CalendarData_ja.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ja/CalendarData_ja.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ja/CalendarData_ja.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ja/CalendarData_ja.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ja/CurrencyNames_ja.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ja/CurrencyNames_ja.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ja/CurrencyNames_ja.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ja/CurrencyNames_ja.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ja/CurrencyNames_ja_JP.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ja/CurrencyNames_ja_JP.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ja/CurrencyNames_ja_JP.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ja/CurrencyNames_ja_JP.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ja/LocaleNames_ja.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ja/LocaleNames_ja.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ja/LocaleNames_ja.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ja/LocaleNames_ja.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java
diff --git a/jdk/src/share/classes/sun/util/resources/ko/CalendarData_ko.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ko/CalendarData_ko.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ko/CalendarData_ko.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ko/CalendarData_ko.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ko/CurrencyNames_ko.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ko/CurrencyNames_ko.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ko/CurrencyNames_ko.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ko/CurrencyNames_ko.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ko/CurrencyNames_ko_KR.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ko/CurrencyNames_ko_KR.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ko/CurrencyNames_ko_KR.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ko/CurrencyNames_ko_KR.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ko/LocaleNames_ko.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ko/LocaleNames_ko.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ko/LocaleNames_ko.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ko/LocaleNames_ko.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java
diff --git a/jdk/src/share/classes/sun/util/resources/lt/CalendarData_lt.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/lt/CalendarData_lt.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/lt/CalendarData_lt.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/lt/CalendarData_lt.properties
diff --git a/jdk/src/share/classes/sun/util/resources/lt/CurrencyNames_lt_LT.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/lt/CurrencyNames_lt_LT.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/lt/CurrencyNames_lt_LT.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/lt/CurrencyNames_lt_LT.properties
diff --git a/jdk/src/share/classes/sun/util/resources/lt/LocaleNames_lt.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/lt/LocaleNames_lt.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/lt/LocaleNames_lt.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/lt/LocaleNames_lt.properties
diff --git a/jdk/src/share/classes/sun/util/resources/lv/CalendarData_lv.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/lv/CalendarData_lv.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/lv/CalendarData_lv.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/lv/CalendarData_lv.properties
diff --git a/jdk/src/share/classes/sun/util/resources/lv/CurrencyNames_lv_LV.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/lv/CurrencyNames_lv_LV.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/lv/CurrencyNames_lv_LV.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/lv/CurrencyNames_lv_LV.properties
diff --git a/jdk/src/share/classes/sun/util/resources/lv/LocaleNames_lv.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/lv/LocaleNames_lv.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/lv/LocaleNames_lv.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/lv/LocaleNames_lv.properties
diff --git a/jdk/src/share/classes/sun/util/resources/mk/CalendarData_mk.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/mk/CalendarData_mk.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/mk/CalendarData_mk.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/mk/CalendarData_mk.properties
diff --git a/jdk/src/share/classes/sun/util/resources/mk/CurrencyNames_mk_MK.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/mk/CurrencyNames_mk_MK.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/mk/CurrencyNames_mk_MK.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/mk/CurrencyNames_mk_MK.properties
diff --git a/jdk/src/share/classes/sun/util/resources/mk/LocaleNames_mk.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/mk/LocaleNames_mk.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/mk/LocaleNames_mk.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/mk/LocaleNames_mk.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ms/CalendarData_ms_MY.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ms/CalendarData_ms_MY.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ms/CalendarData_ms_MY.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ms/CalendarData_ms_MY.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ms/CurrencyNames_ms_MY.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ms/CurrencyNames_ms_MY.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ms/CurrencyNames_ms_MY.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ms/CurrencyNames_ms_MY.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ms/LocaleNames_ms.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ms/LocaleNames_ms.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ms/LocaleNames_ms.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ms/LocaleNames_ms.properties
diff --git a/jdk/src/share/classes/sun/util/resources/mt/CalendarData_mt.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/mt/CalendarData_mt.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/mt/CalendarData_mt.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/mt/CalendarData_mt.properties
diff --git a/jdk/src/share/classes/sun/util/resources/mt/CalendarData_mt_MT.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/mt/CalendarData_mt_MT.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/mt/CalendarData_mt_MT.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/mt/CalendarData_mt_MT.properties
diff --git a/jdk/src/share/classes/sun/util/resources/mt/CurrencyNames_mt_MT.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/mt/CurrencyNames_mt_MT.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/mt/CurrencyNames_mt_MT.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/mt/CurrencyNames_mt_MT.properties
diff --git a/jdk/src/share/classes/sun/util/resources/mt/LocaleNames_mt.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/mt/LocaleNames_mt.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/mt/LocaleNames_mt.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/mt/LocaleNames_mt.properties
diff --git a/jdk/src/share/classes/sun/util/resources/nl/CalendarData_nl.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/nl/CalendarData_nl.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/nl/CalendarData_nl.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/nl/CalendarData_nl.properties
diff --git a/jdk/src/share/classes/sun/util/resources/nl/CurrencyNames_nl_BE.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/nl/CurrencyNames_nl_BE.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/nl/CurrencyNames_nl_BE.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/nl/CurrencyNames_nl_BE.properties
diff --git a/jdk/src/share/classes/sun/util/resources/nl/CurrencyNames_nl_NL.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/nl/CurrencyNames_nl_NL.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/nl/CurrencyNames_nl_NL.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/nl/CurrencyNames_nl_NL.properties
diff --git a/jdk/src/share/classes/sun/util/resources/nl/LocaleNames_nl.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/nl/LocaleNames_nl.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/nl/LocaleNames_nl.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/nl/LocaleNames_nl.properties
diff --git a/jdk/src/share/classes/sun/util/resources/no/CalendarData_no.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/no/CalendarData_no.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/no/CalendarData_no.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/no/CalendarData_no.properties
diff --git a/jdk/src/share/classes/sun/util/resources/no/CurrencyNames_no_NO.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/no/CurrencyNames_no_NO.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/no/CurrencyNames_no_NO.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/no/CurrencyNames_no_NO.properties
diff --git a/jdk/src/share/classes/sun/util/resources/no/LocaleNames_no.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/no/LocaleNames_no.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/no/LocaleNames_no.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/no/LocaleNames_no.properties
diff --git a/jdk/src/share/classes/sun/util/resources/no/LocaleNames_no_NO_NY.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/no/LocaleNames_no_NO_NY.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/no/LocaleNames_no_NO_NY.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/no/LocaleNames_no_NO_NY.properties
diff --git a/jdk/src/share/classes/sun/util/resources/pl/CalendarData_pl.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/pl/CalendarData_pl.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/pl/CalendarData_pl.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/pl/CalendarData_pl.properties
diff --git a/jdk/src/share/classes/sun/util/resources/pl/CurrencyNames_pl_PL.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/pl/CurrencyNames_pl_PL.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/pl/CurrencyNames_pl_PL.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/pl/CurrencyNames_pl_PL.properties
diff --git a/jdk/src/share/classes/sun/util/resources/pl/LocaleNames_pl.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/pl/LocaleNames_pl.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/pl/LocaleNames_pl.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/pl/LocaleNames_pl.properties
diff --git a/jdk/src/share/classes/sun/util/resources/pt/CalendarData_pt.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/pt/CalendarData_pt.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/pt/CalendarData_pt.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/pt/CalendarData_pt.properties
diff --git a/jdk/src/share/classes/sun/util/resources/pt/CalendarData_pt_BR.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/pt/CalendarData_pt_BR.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/pt/CalendarData_pt_BR.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/pt/CalendarData_pt_BR.properties
diff --git a/jdk/src/share/classes/sun/util/resources/pt/CalendarData_pt_PT.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/pt/CalendarData_pt_PT.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/pt/CalendarData_pt_PT.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/pt/CalendarData_pt_PT.properties
diff --git a/jdk/src/share/classes/sun/util/resources/pt/CurrencyNames_pt.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/pt/CurrencyNames_pt.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/pt/CurrencyNames_pt.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/pt/CurrencyNames_pt.properties
diff --git a/jdk/src/share/classes/sun/util/resources/pt/CurrencyNames_pt_BR.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/pt/CurrencyNames_pt_BR.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/pt/CurrencyNames_pt_BR.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/pt/CurrencyNames_pt_BR.properties
diff --git a/jdk/src/share/classes/sun/util/resources/pt/CurrencyNames_pt_PT.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/pt/CurrencyNames_pt_PT.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/pt/CurrencyNames_pt_PT.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/pt/CurrencyNames_pt_PT.properties
diff --git a/jdk/src/share/classes/sun/util/resources/pt/LocaleNames_pt.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/pt/LocaleNames_pt.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/pt/LocaleNames_pt.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/pt/LocaleNames_pt.properties
diff --git a/jdk/src/share/classes/sun/util/resources/pt/LocaleNames_pt_BR.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/pt/LocaleNames_pt_BR.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/pt/LocaleNames_pt_BR.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/pt/LocaleNames_pt_BR.properties
diff --git a/jdk/src/share/classes/sun/util/resources/pt/LocaleNames_pt_PT.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/pt/LocaleNames_pt_PT.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/pt/LocaleNames_pt_PT.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/pt/LocaleNames_pt_PT.properties
diff --git a/jdk/src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java b/jdk/src/jdk.localedata/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java
diff --git a/jdk/src/share/classes/sun/util/resources/ro/CalendarData_ro.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ro/CalendarData_ro.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ro/CalendarData_ro.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ro/CalendarData_ro.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ro/CurrencyNames_ro_RO.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ro/CurrencyNames_ro_RO.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ro/CurrencyNames_ro_RO.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ro/CurrencyNames_ro_RO.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ro/LocaleNames_ro.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ro/LocaleNames_ro.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ro/LocaleNames_ro.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ro/LocaleNames_ro.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ru/CalendarData_ru.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ru/CalendarData_ru.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ru/CalendarData_ru.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ru/CalendarData_ru.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ru/CurrencyNames_ru_RU.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ru/CurrencyNames_ru_RU.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ru/CurrencyNames_ru_RU.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ru/CurrencyNames_ru_RU.properties
diff --git a/jdk/src/share/classes/sun/util/resources/ru/LocaleNames_ru.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ru/LocaleNames_ru.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/ru/LocaleNames_ru.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/ru/LocaleNames_ru.properties
diff --git a/jdk/src/share/classes/sun/util/resources/sk/CalendarData_sk.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/sk/CalendarData_sk.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/sk/CalendarData_sk.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/sk/CalendarData_sk.properties
diff --git a/jdk/src/share/classes/sun/util/resources/sk/CurrencyNames_sk_SK.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/sk/CurrencyNames_sk_SK.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/sk/CurrencyNames_sk_SK.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/sk/CurrencyNames_sk_SK.properties
diff --git a/jdk/src/share/classes/sun/util/resources/sk/LocaleNames_sk.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/sk/LocaleNames_sk.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/sk/LocaleNames_sk.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/sk/LocaleNames_sk.properties
diff --git a/jdk/src/share/classes/sun/util/resources/sl/CalendarData_sl.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/sl/CalendarData_sl.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/sl/CalendarData_sl.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/sl/CalendarData_sl.properties
diff --git a/jdk/src/share/classes/sun/util/resources/sl/CurrencyNames_sl_SI.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/sl/CurrencyNames_sl_SI.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/sl/CurrencyNames_sl_SI.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/sl/CurrencyNames_sl_SI.properties
diff --git a/jdk/src/share/classes/sun/util/resources/sl/LocaleNames_sl.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/sl/LocaleNames_sl.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/sl/LocaleNames_sl.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/sl/LocaleNames_sl.properties
diff --git a/jdk/src/share/classes/sun/util/resources/sq/CalendarData_sq.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/sq/CalendarData_sq.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/sq/CalendarData_sq.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/sq/CalendarData_sq.properties
diff --git a/jdk/src/share/classes/sun/util/resources/sq/CurrencyNames_sq_AL.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/sq/CurrencyNames_sq_AL.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/sq/CurrencyNames_sq_AL.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/sq/CurrencyNames_sq_AL.properties
diff --git a/jdk/src/share/classes/sun/util/resources/sq/LocaleNames_sq.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/sq/LocaleNames_sq.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/sq/LocaleNames_sq.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/sq/LocaleNames_sq.properties
diff --git a/jdk/src/share/classes/sun/util/resources/sr/CalendarData_sr.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/CalendarData_sr.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/sr/CalendarData_sr.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/CalendarData_sr.properties
diff --git a/jdk/src/share/classes/sun/util/resources/sr/CalendarData_sr_Latn_BA.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/CalendarData_sr_Latn_BA.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/sr/CalendarData_sr_Latn_BA.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/CalendarData_sr_Latn_BA.properties
diff --git a/jdk/src/share/classes/sun/util/resources/sr/CalendarData_sr_Latn_ME.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/CalendarData_sr_Latn_ME.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/sr/CalendarData_sr_Latn_ME.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/CalendarData_sr_Latn_ME.properties
diff --git a/jdk/src/share/classes/sun/util/resources/sr/CalendarData_sr_Latn_RS.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/CalendarData_sr_Latn_RS.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/sr/CalendarData_sr_Latn_RS.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/CalendarData_sr_Latn_RS.properties
diff --git a/jdk/src/share/classes/sun/util/resources/sr/CurrencyNames_sr_BA.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/CurrencyNames_sr_BA.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/sr/CurrencyNames_sr_BA.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/CurrencyNames_sr_BA.properties
diff --git a/jdk/src/share/classes/sun/util/resources/sr/CurrencyNames_sr_CS.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/CurrencyNames_sr_CS.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/sr/CurrencyNames_sr_CS.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/CurrencyNames_sr_CS.properties
diff --git a/jdk/src/share/classes/sun/util/resources/sr/CurrencyNames_sr_Latn_BA.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/CurrencyNames_sr_Latn_BA.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/sr/CurrencyNames_sr_Latn_BA.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/CurrencyNames_sr_Latn_BA.properties
diff --git a/jdk/src/share/classes/sun/util/resources/sr/CurrencyNames_sr_Latn_ME.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/CurrencyNames_sr_Latn_ME.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/sr/CurrencyNames_sr_Latn_ME.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/CurrencyNames_sr_Latn_ME.properties
diff --git a/jdk/src/share/classes/sun/util/resources/sr/CurrencyNames_sr_Latn_RS.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/CurrencyNames_sr_Latn_RS.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/sr/CurrencyNames_sr_Latn_RS.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/CurrencyNames_sr_Latn_RS.properties
diff --git a/jdk/src/share/classes/sun/util/resources/sr/CurrencyNames_sr_ME.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/CurrencyNames_sr_ME.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/sr/CurrencyNames_sr_ME.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/CurrencyNames_sr_ME.properties
diff --git a/jdk/src/share/classes/sun/util/resources/sr/CurrencyNames_sr_RS.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/CurrencyNames_sr_RS.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/sr/CurrencyNames_sr_RS.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/CurrencyNames_sr_RS.properties
diff --git a/jdk/src/share/classes/sun/util/resources/sr/LocaleNames_sr.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/LocaleNames_sr.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/sr/LocaleNames_sr.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/LocaleNames_sr.properties
diff --git a/jdk/src/share/classes/sun/util/resources/sr/LocaleNames_sr_Latn.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/LocaleNames_sr_Latn.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/sr/LocaleNames_sr_Latn.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/LocaleNames_sr_Latn.properties
diff --git a/jdk/src/share/classes/sun/util/resources/sv/CalendarData_sv.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/sv/CalendarData_sv.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/sv/CalendarData_sv.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/sv/CalendarData_sv.properties
diff --git a/jdk/src/share/classes/sun/util/resources/sv/CurrencyNames_sv.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/sv/CurrencyNames_sv.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/sv/CurrencyNames_sv.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/sv/CurrencyNames_sv.properties
diff --git a/jdk/src/share/classes/sun/util/resources/sv/CurrencyNames_sv_SE.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/sv/CurrencyNames_sv_SE.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/sv/CurrencyNames_sv_SE.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/sv/CurrencyNames_sv_SE.properties
diff --git a/jdk/src/share/classes/sun/util/resources/sv/LocaleNames_sv.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/sv/LocaleNames_sv.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/sv/LocaleNames_sv.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/sv/LocaleNames_sv.properties
diff --git a/jdk/src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java b/jdk/src/jdk.localedata/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java
diff --git a/jdk/src/share/classes/sun/util/resources/th/CalendarData_th.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/th/CalendarData_th.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/th/CalendarData_th.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/th/CalendarData_th.properties
diff --git a/jdk/src/share/classes/sun/util/resources/th/CurrencyNames_th_TH.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/th/CurrencyNames_th_TH.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/th/CurrencyNames_th_TH.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/th/CurrencyNames_th_TH.properties
diff --git a/jdk/src/share/classes/sun/util/resources/th/LocaleNames_th.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/th/LocaleNames_th.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/th/LocaleNames_th.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/th/LocaleNames_th.properties
diff --git a/jdk/src/share/classes/sun/util/resources/tr/CalendarData_tr.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/tr/CalendarData_tr.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/tr/CalendarData_tr.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/tr/CalendarData_tr.properties
diff --git a/jdk/src/share/classes/sun/util/resources/tr/CurrencyNames_tr_TR.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/tr/CurrencyNames_tr_TR.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/tr/CurrencyNames_tr_TR.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/tr/CurrencyNames_tr_TR.properties
diff --git a/jdk/src/share/classes/sun/util/resources/tr/LocaleNames_tr.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/tr/LocaleNames_tr.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/tr/LocaleNames_tr.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/tr/LocaleNames_tr.properties
diff --git a/jdk/src/share/classes/sun/util/resources/uk/CalendarData_uk.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/uk/CalendarData_uk.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/uk/CalendarData_uk.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/uk/CalendarData_uk.properties
diff --git a/jdk/src/share/classes/sun/util/resources/uk/CurrencyNames_uk_UA.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/uk/CurrencyNames_uk_UA.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/uk/CurrencyNames_uk_UA.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/uk/CurrencyNames_uk_UA.properties
diff --git a/jdk/src/share/classes/sun/util/resources/uk/LocaleNames_uk.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/uk/LocaleNames_uk.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/uk/LocaleNames_uk.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/uk/LocaleNames_uk.properties
diff --git a/jdk/src/share/classes/sun/util/resources/vi/CalendarData_vi.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/vi/CalendarData_vi.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/vi/CalendarData_vi.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/vi/CalendarData_vi.properties
diff --git a/jdk/src/share/classes/sun/util/resources/vi/CurrencyNames_vi_VN.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/vi/CurrencyNames_vi_VN.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/vi/CurrencyNames_vi_VN.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/vi/CurrencyNames_vi_VN.properties
diff --git a/jdk/src/share/classes/sun/util/resources/vi/LocaleNames_vi.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/vi/LocaleNames_vi.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/vi/LocaleNames_vi.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/vi/LocaleNames_vi.properties
diff --git a/jdk/src/share/classes/sun/util/resources/zh/CalendarData_zh.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/CalendarData_zh.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/zh/CalendarData_zh.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/CalendarData_zh.properties
diff --git a/jdk/src/share/classes/sun/util/resources/zh/CurrencyNames_zh_CN.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/CurrencyNames_zh_CN.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/zh/CurrencyNames_zh_CN.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/CurrencyNames_zh_CN.properties
diff --git a/jdk/src/share/classes/sun/util/resources/zh/CurrencyNames_zh_HK.java b/jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/CurrencyNames_zh_HK.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/zh/CurrencyNames_zh_HK.java
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/CurrencyNames_zh_HK.java
diff --git a/jdk/src/share/classes/sun/util/resources/zh/CurrencyNames_zh_SG.java b/jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/CurrencyNames_zh_SG.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/zh/CurrencyNames_zh_SG.java
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/CurrencyNames_zh_SG.java
diff --git a/jdk/src/share/classes/sun/util/resources/zh/CurrencyNames_zh_TW.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/CurrencyNames_zh_TW.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/zh/CurrencyNames_zh_TW.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/CurrencyNames_zh_TW.properties
diff --git a/jdk/src/share/classes/sun/util/resources/zh/LocaleNames_zh.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/LocaleNames_zh.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/zh/LocaleNames_zh.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/LocaleNames_zh.properties
diff --git a/jdk/src/share/classes/sun/util/resources/zh/LocaleNames_zh_HK.java b/jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/LocaleNames_zh_HK.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/zh/LocaleNames_zh_HK.java
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/LocaleNames_zh_HK.java
diff --git a/jdk/src/share/classes/sun/util/resources/zh/LocaleNames_zh_SG.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/LocaleNames_zh_SG.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/zh/LocaleNames_zh_SG.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/LocaleNames_zh_SG.properties
diff --git a/jdk/src/share/classes/sun/util/resources/zh/LocaleNames_zh_TW.properties b/jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/LocaleNames_zh_TW.properties
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/zh/LocaleNames_zh_TW.properties
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/LocaleNames_zh_TW.properties
diff --git a/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java b/jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java
diff --git a/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_HK.java b/jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/TimeZoneNames_zh_HK.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_HK.java
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/TimeZoneNames_zh_HK.java
diff --git a/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java b/jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java
similarity index 100%
rename from jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java
rename to jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java
diff --git a/jdk/src/share/classes/sun/net/spi/nameservice/dns/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor b/jdk/src/jdk.naming.dns/share/classes/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
similarity index 100%
rename from jdk/src/share/classes/sun/net/spi/nameservice/dns/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
rename to jdk/src/jdk.naming.dns/share/classes/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
diff --git a/jdk/src/share/classes/com/sun/jndi/dns/DnsClient.java b/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsClient.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/dns/DnsClient.java
rename to jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsClient.java
diff --git a/jdk/src/share/classes/com/sun/jndi/dns/DnsContext.java b/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsContext.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/dns/DnsContext.java
rename to jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsContext.java
diff --git a/jdk/src/share/classes/com/sun/jndi/dns/DnsContextFactory.java b/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsContextFactory.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/dns/DnsContextFactory.java
rename to jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsContextFactory.java
diff --git a/jdk/src/share/classes/com/sun/jndi/dns/DnsName.java b/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsName.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/dns/DnsName.java
rename to jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsName.java
diff --git a/jdk/src/share/classes/com/sun/jndi/dns/DnsNameParser.java b/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsNameParser.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/dns/DnsNameParser.java
rename to jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsNameParser.java
diff --git a/jdk/src/share/classes/com/sun/jndi/dns/DnsUrl.java b/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsUrl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/dns/DnsUrl.java
rename to jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsUrl.java
diff --git a/jdk/src/share/classes/com/sun/jndi/dns/Header.java b/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/Header.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/dns/Header.java
rename to jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/Header.java
diff --git a/jdk/src/share/classes/com/sun/jndi/dns/NameNode.java b/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/NameNode.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/dns/NameNode.java
rename to jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/NameNode.java
diff --git a/jdk/src/share/classes/com/sun/jndi/dns/Resolver.java b/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/Resolver.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/dns/Resolver.java
rename to jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/Resolver.java
diff --git a/jdk/src/share/classes/com/sun/jndi/dns/ResourceRecord.java b/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/ResourceRecord.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/dns/ResourceRecord.java
rename to jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/ResourceRecord.java
diff --git a/jdk/src/share/classes/com/sun/jndi/dns/ResourceRecords.java b/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/ResourceRecords.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/dns/ResourceRecords.java
rename to jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/ResourceRecords.java
diff --git a/jdk/src/share/classes/com/sun/jndi/dns/ZoneNode.java b/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/ZoneNode.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/dns/ZoneNode.java
rename to jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/ZoneNode.java
diff --git a/jdk/src/share/classes/com/sun/jndi/url/dns/dnsURLContext.java b/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/url/dns/dnsURLContext.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/url/dns/dnsURLContext.java
rename to jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/url/dns/dnsURLContext.java
diff --git a/jdk/src/share/classes/com/sun/jndi/url/dns/dnsURLContextFactory.java b/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/url/dns/dnsURLContextFactory.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/url/dns/dnsURLContextFactory.java
rename to jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/url/dns/dnsURLContextFactory.java
diff --git a/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java b/jdk/src/jdk.naming.dns/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java
rename to jdk/src/jdk.naming.dns/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java
diff --git a/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameServiceDescriptor.java b/jdk/src/jdk.naming.dns/share/classes/sun/net/spi/nameservice/dns/DNSNameServiceDescriptor.java
similarity index 100%
rename from jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameServiceDescriptor.java
rename to jdk/src/jdk.naming.dns/share/classes/sun/net/spi/nameservice/dns/DNSNameServiceDescriptor.java
diff --git a/jdk/src/share/classes/com/sun/jndi/rmi/registry/ReferenceWrapper.java b/jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/ReferenceWrapper.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/rmi/registry/ReferenceWrapper.java
rename to jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/ReferenceWrapper.java
diff --git a/jdk/src/share/classes/com/sun/jndi/rmi/registry/RegistryContext.java b/jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RegistryContext.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/rmi/registry/RegistryContext.java
rename to jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RegistryContext.java
diff --git a/jdk/src/share/classes/com/sun/jndi/rmi/registry/RegistryContextFactory.java b/jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RegistryContextFactory.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/rmi/registry/RegistryContextFactory.java
rename to jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RegistryContextFactory.java
diff --git a/jdk/src/share/classes/com/sun/jndi/rmi/registry/RemoteReference.java b/jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RemoteReference.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/rmi/registry/RemoteReference.java
rename to jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RemoteReference.java
diff --git a/jdk/src/share/classes/com/sun/jndi/url/rmi/rmiURLContext.java b/jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/url/rmi/rmiURLContext.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/url/rmi/rmiURLContext.java
rename to jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/url/rmi/rmiURLContext.java
diff --git a/jdk/src/share/classes/com/sun/jndi/url/rmi/rmiURLContextFactory.java b/jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/url/rmi/rmiURLContextFactory.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jndi/url/rmi/rmiURLContextFactory.java
rename to jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/url/rmi/rmiURLContextFactory.java
diff --git a/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java b/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/BatchEnvironment.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java
rename to jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/BatchEnvironment.java
diff --git a/jdk/src/share/classes/sun/rmi/rmic/Constants.java b/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/Constants.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/rmic/Constants.java
rename to jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/Constants.java
diff --git a/jdk/src/share/classes/sun/rmi/rmic/Generator.java b/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/Generator.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/rmic/Generator.java
rename to jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/Generator.java
diff --git a/jdk/src/share/classes/sun/rmi/rmic/IndentingWriter.java b/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/IndentingWriter.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/rmic/IndentingWriter.java
rename to jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/IndentingWriter.java
diff --git a/jdk/src/share/classes/sun/rmi/rmic/Main.java b/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/Main.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/rmic/Main.java
rename to jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/Main.java
diff --git a/jdk/src/share/classes/sun/rmi/rmic/Names.java b/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/Names.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/rmic/Names.java
rename to jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/Names.java
diff --git a/jdk/src/share/classes/sun/rmi/rmic/RMIConstants.java b/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/RMIConstants.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/rmic/RMIConstants.java
rename to jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/RMIConstants.java
diff --git a/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java b/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/RMIGenerator.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java
rename to jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/RMIGenerator.java
diff --git a/jdk/src/share/classes/sun/rmi/rmic/RemoteClass.java b/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/RemoteClass.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/rmic/RemoteClass.java
rename to jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/RemoteClass.java
diff --git a/jdk/src/share/classes/sun/rmi/rmic/Util.java b/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/Util.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/rmic/Util.java
rename to jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/Util.java
diff --git a/jdk/src/share/classes/sun/rmi/rmic/newrmic/BatchEnvironment.java b/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/BatchEnvironment.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/rmic/newrmic/BatchEnvironment.java
rename to jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/BatchEnvironment.java
diff --git a/jdk/src/share/classes/sun/rmi/rmic/newrmic/Constants.java b/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/Constants.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/rmic/newrmic/Constants.java
rename to jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/Constants.java
diff --git a/jdk/src/share/classes/sun/rmi/rmic/newrmic/Generator.java b/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/Generator.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/rmic/newrmic/Generator.java
rename to jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/Generator.java
diff --git a/jdk/src/share/classes/sun/rmi/rmic/newrmic/IndentingWriter.java b/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/IndentingWriter.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/rmic/newrmic/IndentingWriter.java
rename to jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/IndentingWriter.java
diff --git a/jdk/src/share/classes/sun/rmi/rmic/newrmic/Main.java b/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/Main.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/rmic/newrmic/Main.java
rename to jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/Main.java
diff --git a/jdk/src/share/classes/sun/rmi/rmic/newrmic/Resources.java b/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/Resources.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/rmic/newrmic/Resources.java
rename to jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/Resources.java
diff --git a/jdk/src/share/classes/sun/rmi/rmic/newrmic/jrmp/Constants.java b/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/Constants.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/rmic/newrmic/jrmp/Constants.java
rename to jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/Constants.java
diff --git a/jdk/src/share/classes/sun/rmi/rmic/newrmic/jrmp/JrmpGenerator.java b/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/JrmpGenerator.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/rmic/newrmic/jrmp/JrmpGenerator.java
rename to jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/JrmpGenerator.java
diff --git a/jdk/src/share/classes/sun/rmi/rmic/newrmic/jrmp/RemoteClass.java b/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/RemoteClass.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/rmic/newrmic/jrmp/RemoteClass.java
rename to jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/RemoteClass.java
diff --git a/jdk/src/share/classes/sun/rmi/rmic/newrmic/jrmp/StubSkeletonWriter.java b/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/StubSkeletonWriter.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/rmic/newrmic/jrmp/StubSkeletonWriter.java
rename to jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/StubSkeletonWriter.java
diff --git a/jdk/src/share/classes/sun/rmi/rmic/newrmic/jrmp/Util.java b/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/Util.java
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/rmic/newrmic/jrmp/Util.java
rename to jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/Util.java
diff --git a/jdk/src/share/classes/sun/rmi/rmic/resources/rmic.properties b/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/resources/rmic.properties
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/rmic/resources/rmic.properties
rename to jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/resources/rmic.properties
diff --git a/jdk/src/share/classes/sun/rmi/rmic/resources/rmic_ja.properties b/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/resources/rmic_ja.properties
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/rmic/resources/rmic_ja.properties
rename to jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/resources/rmic_ja.properties
diff --git a/jdk/src/share/classes/sun/rmi/rmic/resources/rmic_zh_CN.properties b/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/resources/rmic_zh_CN.properties
similarity index 100%
rename from jdk/src/share/classes/sun/rmi/rmic/resources/rmic_zh_CN.properties
rename to jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/resources/rmic_zh_CN.properties
diff --git a/jdk/src/share/classes/sun/tools/asm/ArrayData.java b/jdk/src/jdk.rmic/share/classes/sun/tools/asm/ArrayData.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/asm/ArrayData.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/asm/ArrayData.java
diff --git a/jdk/src/share/classes/sun/tools/asm/Assembler.java b/jdk/src/jdk.rmic/share/classes/sun/tools/asm/Assembler.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/asm/Assembler.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/asm/Assembler.java
diff --git a/jdk/src/share/classes/sun/tools/asm/CatchData.java b/jdk/src/jdk.rmic/share/classes/sun/tools/asm/CatchData.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/asm/CatchData.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/asm/CatchData.java
diff --git a/jdk/src/share/classes/sun/tools/asm/ClassConstantData.java b/jdk/src/jdk.rmic/share/classes/sun/tools/asm/ClassConstantData.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/asm/ClassConstantData.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/asm/ClassConstantData.java
diff --git a/jdk/src/share/classes/sun/tools/asm/ConstantPool.java b/jdk/src/jdk.rmic/share/classes/sun/tools/asm/ConstantPool.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/asm/ConstantPool.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/asm/ConstantPool.java
diff --git a/jdk/src/share/classes/sun/tools/asm/ConstantPoolData.java b/jdk/src/jdk.rmic/share/classes/sun/tools/asm/ConstantPoolData.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/asm/ConstantPoolData.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/asm/ConstantPoolData.java
diff --git a/jdk/src/share/classes/sun/tools/asm/Cover.java b/jdk/src/jdk.rmic/share/classes/sun/tools/asm/Cover.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/asm/Cover.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/asm/Cover.java
diff --git a/jdk/src/share/classes/sun/tools/asm/FieldConstantData.java b/jdk/src/jdk.rmic/share/classes/sun/tools/asm/FieldConstantData.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/asm/FieldConstantData.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/asm/FieldConstantData.java
diff --git a/jdk/src/share/classes/sun/tools/asm/Instruction.java b/jdk/src/jdk.rmic/share/classes/sun/tools/asm/Instruction.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/asm/Instruction.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/asm/Instruction.java
diff --git a/jdk/src/share/classes/sun/tools/asm/Label.java b/jdk/src/jdk.rmic/share/classes/sun/tools/asm/Label.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/asm/Label.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/asm/Label.java
diff --git a/jdk/src/share/classes/sun/tools/asm/LocalVariable.java b/jdk/src/jdk.rmic/share/classes/sun/tools/asm/LocalVariable.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/asm/LocalVariable.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/asm/LocalVariable.java
diff --git a/jdk/src/share/classes/sun/tools/asm/LocalVariableTable.java b/jdk/src/jdk.rmic/share/classes/sun/tools/asm/LocalVariableTable.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/asm/LocalVariableTable.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/asm/LocalVariableTable.java
diff --git a/jdk/src/share/classes/sun/tools/asm/NameAndTypeConstantData.java b/jdk/src/jdk.rmic/share/classes/sun/tools/asm/NameAndTypeConstantData.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/asm/NameAndTypeConstantData.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/asm/NameAndTypeConstantData.java
diff --git a/jdk/src/share/classes/sun/tools/asm/NameAndTypeData.java b/jdk/src/jdk.rmic/share/classes/sun/tools/asm/NameAndTypeData.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/asm/NameAndTypeData.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/asm/NameAndTypeData.java
diff --git a/jdk/src/share/classes/sun/tools/asm/NumberConstantData.java b/jdk/src/jdk.rmic/share/classes/sun/tools/asm/NumberConstantData.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/asm/NumberConstantData.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/asm/NumberConstantData.java
diff --git a/jdk/src/share/classes/sun/tools/asm/StringConstantData.java b/jdk/src/jdk.rmic/share/classes/sun/tools/asm/StringConstantData.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/asm/StringConstantData.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/asm/StringConstantData.java
diff --git a/jdk/src/share/classes/sun/tools/asm/StringExpressionConstantData.java b/jdk/src/jdk.rmic/share/classes/sun/tools/asm/StringExpressionConstantData.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/asm/StringExpressionConstantData.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/asm/StringExpressionConstantData.java
diff --git a/jdk/src/share/classes/sun/tools/asm/SwitchData.java b/jdk/src/jdk.rmic/share/classes/sun/tools/asm/SwitchData.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/asm/SwitchData.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/asm/SwitchData.java
diff --git a/jdk/src/share/classes/sun/tools/asm/TryData.java b/jdk/src/jdk.rmic/share/classes/sun/tools/asm/TryData.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/asm/TryData.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/asm/TryData.java
diff --git a/jdk/src/share/classes/sun/tools/java/AmbiguousClass.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/AmbiguousClass.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/java/AmbiguousClass.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/java/AmbiguousClass.java
diff --git a/jdk/src/share/classes/sun/tools/java/AmbiguousMember.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/AmbiguousMember.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/java/AmbiguousMember.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/java/AmbiguousMember.java
diff --git a/jdk/src/share/classes/sun/tools/java/ArrayType.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/ArrayType.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/java/ArrayType.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/java/ArrayType.java
diff --git a/jdk/src/share/classes/sun/tools/java/BinaryAttribute.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/BinaryAttribute.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/java/BinaryAttribute.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/java/BinaryAttribute.java
diff --git a/jdk/src/share/classes/sun/tools/java/BinaryClass.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/BinaryClass.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/java/BinaryClass.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/java/BinaryClass.java
diff --git a/jdk/src/share/classes/sun/tools/java/BinaryCode.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/BinaryCode.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/java/BinaryCode.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/java/BinaryCode.java
diff --git a/jdk/src/share/classes/sun/tools/java/BinaryConstantPool.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/BinaryConstantPool.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/java/BinaryConstantPool.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/java/BinaryConstantPool.java
diff --git a/jdk/src/share/classes/sun/tools/java/BinaryExceptionHandler.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/BinaryExceptionHandler.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/java/BinaryExceptionHandler.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/java/BinaryExceptionHandler.java
diff --git a/jdk/src/share/classes/sun/tools/java/BinaryMember.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/BinaryMember.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/java/BinaryMember.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/java/BinaryMember.java
diff --git a/jdk/src/share/classes/sun/tools/java/ClassDeclaration.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/ClassDeclaration.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/java/ClassDeclaration.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/java/ClassDeclaration.java
diff --git a/jdk/src/share/classes/sun/tools/java/ClassDefinition.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/ClassDefinition.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/java/ClassDefinition.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/java/ClassDefinition.java
diff --git a/jdk/src/share/classes/sun/tools/java/ClassFile.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/ClassFile.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/java/ClassFile.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/java/ClassFile.java
diff --git a/jdk/src/share/classes/sun/tools/java/ClassNotFound.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/ClassNotFound.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/java/ClassNotFound.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/java/ClassNotFound.java
diff --git a/jdk/src/share/classes/sun/tools/java/ClassPath.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/ClassPath.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/java/ClassPath.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/java/ClassPath.java
diff --git a/jdk/src/share/classes/sun/tools/java/ClassType.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/ClassType.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/java/ClassType.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/java/ClassType.java
diff --git a/jdk/src/share/classes/sun/tools/java/CompilerError.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/CompilerError.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/java/CompilerError.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/java/CompilerError.java
diff --git a/jdk/src/share/classes/sun/tools/java/Constants.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/Constants.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/java/Constants.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/java/Constants.java
diff --git a/jdk/src/share/classes/sun/tools/java/Environment.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/Environment.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/java/Environment.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/java/Environment.java
diff --git a/jdk/src/share/classes/sun/tools/java/Identifier.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/Identifier.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/java/Identifier.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/java/Identifier.java
diff --git a/jdk/src/share/classes/sun/tools/java/IdentifierToken.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/IdentifierToken.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/java/IdentifierToken.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/java/IdentifierToken.java
diff --git a/jdk/src/share/classes/sun/tools/java/Imports.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/Imports.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/java/Imports.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/java/Imports.java
diff --git a/jdk/src/share/classes/sun/tools/java/MemberDefinition.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/MemberDefinition.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/java/MemberDefinition.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/java/MemberDefinition.java
diff --git a/jdk/src/share/classes/sun/tools/java/MethodSet.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/MethodSet.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/java/MethodSet.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/java/MethodSet.java
diff --git a/jdk/src/share/classes/sun/tools/java/MethodType.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/MethodType.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/java/MethodType.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/java/MethodType.java
diff --git a/jdk/src/share/classes/sun/tools/java/Package.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/Package.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/java/Package.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/java/Package.java
diff --git a/jdk/src/share/classes/sun/tools/java/Parser.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/Parser.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/java/Parser.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/java/Parser.java
diff --git a/jdk/src/share/classes/sun/tools/java/ParserActions.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/ParserActions.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/java/ParserActions.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/java/ParserActions.java
diff --git a/jdk/src/share/classes/sun/tools/java/RuntimeConstants.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/RuntimeConstants.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/java/RuntimeConstants.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/java/RuntimeConstants.java
diff --git a/jdk/src/share/classes/sun/tools/java/Scanner.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/Scanner.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/java/Scanner.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/java/Scanner.java
diff --git a/jdk/src/share/classes/sun/tools/java/ScannerInputReader.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/ScannerInputReader.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/java/ScannerInputReader.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/java/ScannerInputReader.java
diff --git a/jdk/src/share/classes/sun/tools/java/SyntaxError.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/SyntaxError.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/java/SyntaxError.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/java/SyntaxError.java
diff --git a/jdk/src/share/classes/sun/tools/java/Type.java b/jdk/src/jdk.rmic/share/classes/sun/tools/java/Type.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/java/Type.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/java/Type.java
diff --git a/jdk/src/share/classes/sun/tools/javac/BatchEnvironment.java b/jdk/src/jdk.rmic/share/classes/sun/tools/javac/BatchEnvironment.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/javac/BatchEnvironment.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/javac/BatchEnvironment.java
diff --git a/jdk/src/share/classes/sun/tools/javac/BatchParser.java b/jdk/src/jdk.rmic/share/classes/sun/tools/javac/BatchParser.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/javac/BatchParser.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/javac/BatchParser.java
diff --git a/jdk/src/share/classes/sun/tools/javac/CompilerMember.java b/jdk/src/jdk.rmic/share/classes/sun/tools/javac/CompilerMember.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/javac/CompilerMember.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/javac/CompilerMember.java
diff --git a/jdk/src/share/classes/sun/tools/javac/ErrorConsumer.java b/jdk/src/jdk.rmic/share/classes/sun/tools/javac/ErrorConsumer.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/javac/ErrorConsumer.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/javac/ErrorConsumer.java
diff --git a/jdk/src/share/classes/sun/tools/javac/ErrorMessage.java b/jdk/src/jdk.rmic/share/classes/sun/tools/javac/ErrorMessage.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/javac/ErrorMessage.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/javac/ErrorMessage.java
diff --git a/jdk/src/share/classes/sun/tools/javac/Main.java b/jdk/src/jdk.rmic/share/classes/sun/tools/javac/Main.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/javac/Main.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/javac/Main.java
diff --git a/jdk/src/share/classes/sun/tools/javac/SourceClass.java b/jdk/src/jdk.rmic/share/classes/sun/tools/javac/SourceClass.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/javac/SourceClass.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/javac/SourceClass.java
diff --git a/jdk/src/share/classes/sun/tools/javac/SourceMember.java b/jdk/src/jdk.rmic/share/classes/sun/tools/javac/SourceMember.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/javac/SourceMember.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/javac/SourceMember.java
diff --git a/jdk/src/share/classes/sun/tools/javac/resources/javac.properties b/jdk/src/jdk.rmic/share/classes/sun/tools/javac/resources/javac.properties
similarity index 100%
rename from jdk/src/share/classes/sun/tools/javac/resources/javac.properties
rename to jdk/src/jdk.rmic/share/classes/sun/tools/javac/resources/javac.properties
diff --git a/jdk/src/share/classes/sun/tools/javac/resources/javac_ja.properties b/jdk/src/jdk.rmic/share/classes/sun/tools/javac/resources/javac_ja.properties
similarity index 100%
rename from jdk/src/share/classes/sun/tools/javac/resources/javac_ja.properties
rename to jdk/src/jdk.rmic/share/classes/sun/tools/javac/resources/javac_ja.properties
diff --git a/jdk/src/share/classes/sun/tools/javac/resources/javac_zh_CN.properties b/jdk/src/jdk.rmic/share/classes/sun/tools/javac/resources/javac_zh_CN.properties
similarity index 100%
rename from jdk/src/share/classes/sun/tools/javac/resources/javac_zh_CN.properties
rename to jdk/src/jdk.rmic/share/classes/sun/tools/javac/resources/javac_zh_CN.properties
diff --git a/jdk/src/share/classes/sun/tools/tree/AddExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/AddExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/AddExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/AddExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/AndExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/AndExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/AndExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/AndExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/ArrayAccessExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/ArrayAccessExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/ArrayAccessExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/ArrayAccessExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/ArrayExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/ArrayExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/ArrayExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/ArrayExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/AssignAddExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignAddExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/AssignAddExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignAddExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/AssignBitAndExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignBitAndExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/AssignBitAndExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignBitAndExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/AssignBitOrExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignBitOrExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/AssignBitOrExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignBitOrExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/AssignBitXorExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignBitXorExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/AssignBitXorExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignBitXorExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/AssignDivideExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignDivideExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/AssignDivideExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignDivideExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/AssignExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/AssignExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/AssignMultiplyExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignMultiplyExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/AssignMultiplyExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignMultiplyExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/AssignOpExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignOpExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/AssignOpExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignOpExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/AssignRemainderExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignRemainderExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/AssignRemainderExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignRemainderExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/AssignShiftLeftExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignShiftLeftExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/AssignShiftLeftExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignShiftLeftExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/AssignShiftRightExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignShiftRightExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/AssignShiftRightExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignShiftRightExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/AssignSubtractExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignSubtractExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/AssignSubtractExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignSubtractExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/AssignUnsignedShiftRightExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignUnsignedShiftRightExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/AssignUnsignedShiftRightExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignUnsignedShiftRightExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/BinaryArithmeticExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/BinaryArithmeticExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/BinaryArithmeticExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/BinaryArithmeticExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/BinaryAssignExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/BinaryAssignExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/BinaryAssignExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/BinaryAssignExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/BinaryBitExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/BinaryBitExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/BinaryBitExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/BinaryBitExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/BinaryCompareExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/BinaryCompareExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/BinaryCompareExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/BinaryCompareExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/BinaryEqualityExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/BinaryEqualityExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/BinaryEqualityExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/BinaryEqualityExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/BinaryExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/BinaryExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/BinaryExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/BinaryExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/BinaryLogicalExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/BinaryLogicalExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/BinaryLogicalExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/BinaryLogicalExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/BinaryShiftExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/BinaryShiftExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/BinaryShiftExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/BinaryShiftExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/BitAndExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/BitAndExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/BitAndExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/BitAndExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/BitNotExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/BitNotExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/BitNotExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/BitNotExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/BitOrExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/BitOrExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/BitOrExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/BitOrExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/BitXorExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/BitXorExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/BitXorExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/BitXorExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/BooleanExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/BooleanExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/BooleanExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/BooleanExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/BreakStatement.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/BreakStatement.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/BreakStatement.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/BreakStatement.java
diff --git a/jdk/src/share/classes/sun/tools/tree/ByteExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/ByteExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/ByteExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/ByteExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/CaseStatement.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/CaseStatement.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/CaseStatement.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/CaseStatement.java
diff --git a/jdk/src/share/classes/sun/tools/tree/CastExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/CastExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/CastExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/CastExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/CatchStatement.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/CatchStatement.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/CatchStatement.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/CatchStatement.java
diff --git a/jdk/src/share/classes/sun/tools/tree/CharExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/CharExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/CharExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/CharExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/CheckContext.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/CheckContext.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/CheckContext.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/CheckContext.java
diff --git a/jdk/src/share/classes/sun/tools/tree/CodeContext.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/CodeContext.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/CodeContext.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/CodeContext.java
diff --git a/jdk/src/share/classes/sun/tools/tree/CommaExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/CommaExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/CommaExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/CommaExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/CompoundStatement.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/CompoundStatement.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/CompoundStatement.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/CompoundStatement.java
diff --git a/jdk/src/share/classes/sun/tools/tree/ConditionVars.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/ConditionVars.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/ConditionVars.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/ConditionVars.java
diff --git a/jdk/src/share/classes/sun/tools/tree/ConditionalExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/ConditionalExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/ConditionalExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/ConditionalExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/ConstantExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/ConstantExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/ConstantExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/ConstantExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/Context.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/Context.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/Context.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/Context.java
diff --git a/jdk/src/share/classes/sun/tools/tree/ContinueStatement.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/ContinueStatement.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/ContinueStatement.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/ContinueStatement.java
diff --git a/jdk/src/share/classes/sun/tools/tree/ConvertExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/ConvertExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/ConvertExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/ConvertExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/DeclarationStatement.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/DeclarationStatement.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/DeclarationStatement.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/DeclarationStatement.java
diff --git a/jdk/src/share/classes/sun/tools/tree/DivRemExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/DivRemExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/DivRemExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/DivRemExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/DivideExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/DivideExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/DivideExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/DivideExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/DoStatement.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/DoStatement.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/DoStatement.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/DoStatement.java
diff --git a/jdk/src/share/classes/sun/tools/tree/DoubleExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/DoubleExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/DoubleExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/DoubleExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/EqualExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/EqualExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/EqualExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/EqualExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/ExprExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/ExprExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/ExprExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/ExprExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/Expression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/Expression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/Expression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/Expression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/ExpressionStatement.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/ExpressionStatement.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/ExpressionStatement.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/ExpressionStatement.java
diff --git a/jdk/src/share/classes/sun/tools/tree/FieldExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/FieldExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/FieldExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/FieldExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/FieldUpdater.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/FieldUpdater.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/FieldUpdater.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/FieldUpdater.java
diff --git a/jdk/src/share/classes/sun/tools/tree/FinallyStatement.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/FinallyStatement.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/FinallyStatement.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/FinallyStatement.java
diff --git a/jdk/src/share/classes/sun/tools/tree/FloatExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/FloatExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/FloatExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/FloatExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/ForStatement.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/ForStatement.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/ForStatement.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/ForStatement.java
diff --git a/jdk/src/share/classes/sun/tools/tree/GreaterExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/GreaterExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/GreaterExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/GreaterExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/GreaterOrEqualExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/GreaterOrEqualExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/GreaterOrEqualExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/GreaterOrEqualExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/IdentifierExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/IdentifierExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/IdentifierExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/IdentifierExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/IfStatement.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/IfStatement.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/IfStatement.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/IfStatement.java
diff --git a/jdk/src/share/classes/sun/tools/tree/IncDecExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/IncDecExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/IncDecExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/IncDecExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/InlineMethodExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/InlineMethodExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/InlineMethodExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/InlineMethodExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/InlineNewInstanceExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/InlineNewInstanceExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/InlineNewInstanceExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/InlineNewInstanceExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/InlineReturnStatement.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/InlineReturnStatement.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/InlineReturnStatement.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/InlineReturnStatement.java
diff --git a/jdk/src/share/classes/sun/tools/tree/InstanceOfExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/InstanceOfExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/InstanceOfExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/InstanceOfExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/IntExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/IntExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/IntExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/IntExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/IntegerExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/IntegerExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/IntegerExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/IntegerExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/LengthExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/LengthExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/LengthExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/LengthExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/LessExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/LessExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/LessExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/LessExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/LessOrEqualExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/LessOrEqualExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/LessOrEqualExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/LessOrEqualExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/LocalMember.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/LocalMember.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/LocalMember.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/LocalMember.java
diff --git a/jdk/src/share/classes/sun/tools/tree/LongExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/LongExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/LongExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/LongExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/MethodExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/MethodExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/MethodExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/MethodExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/MultiplyExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/MultiplyExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/MultiplyExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/MultiplyExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/NaryExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/NaryExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/NaryExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/NaryExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/NegativeExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/NegativeExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/NegativeExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/NegativeExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/NewArrayExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/NewArrayExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/NewArrayExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/NewArrayExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/NewInstanceExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/NewInstanceExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/NewInstanceExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/NewInstanceExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/Node.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/Node.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/Node.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/Node.java
diff --git a/jdk/src/share/classes/sun/tools/tree/NotEqualExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/NotEqualExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/NotEqualExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/NotEqualExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/NotExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/NotExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/NotExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/NotExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/NullExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/NullExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/NullExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/NullExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/OrExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/OrExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/OrExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/OrExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/PositiveExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/PositiveExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/PositiveExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/PositiveExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/PostDecExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/PostDecExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/PostDecExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/PostDecExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/PostIncExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/PostIncExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/PostIncExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/PostIncExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/PreDecExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/PreDecExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/PreDecExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/PreDecExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/PreIncExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/PreIncExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/PreIncExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/PreIncExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/RemainderExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/RemainderExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/RemainderExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/RemainderExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/ReturnStatement.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/ReturnStatement.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/ReturnStatement.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/ReturnStatement.java
diff --git a/jdk/src/share/classes/sun/tools/tree/ShiftLeftExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/ShiftLeftExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/ShiftLeftExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/ShiftLeftExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/ShiftRightExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/ShiftRightExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/ShiftRightExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/ShiftRightExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/ShortExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/ShortExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/ShortExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/ShortExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/Statement.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/Statement.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/Statement.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/Statement.java
diff --git a/jdk/src/share/classes/sun/tools/tree/StringExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/StringExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/StringExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/StringExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/SubtractExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/SubtractExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/SubtractExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/SubtractExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/SuperExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/SuperExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/SuperExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/SuperExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/SwitchStatement.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/SwitchStatement.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/SwitchStatement.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/SwitchStatement.java
diff --git a/jdk/src/share/classes/sun/tools/tree/SynchronizedStatement.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/SynchronizedStatement.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/SynchronizedStatement.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/SynchronizedStatement.java
diff --git a/jdk/src/share/classes/sun/tools/tree/ThisExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/ThisExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/ThisExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/ThisExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/ThrowStatement.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/ThrowStatement.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/ThrowStatement.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/ThrowStatement.java
diff --git a/jdk/src/share/classes/sun/tools/tree/TryStatement.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/TryStatement.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/TryStatement.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/TryStatement.java
diff --git a/jdk/src/share/classes/sun/tools/tree/TypeExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/TypeExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/TypeExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/TypeExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/UnaryExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/UnaryExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/UnaryExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/UnaryExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/UnsignedShiftRightExpression.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/UnsignedShiftRightExpression.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/UnsignedShiftRightExpression.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/UnsignedShiftRightExpression.java
diff --git a/jdk/src/share/classes/sun/tools/tree/UplevelReference.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/UplevelReference.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/UplevelReference.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/UplevelReference.java
diff --git a/jdk/src/share/classes/sun/tools/tree/VarDeclarationStatement.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/VarDeclarationStatement.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/VarDeclarationStatement.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/VarDeclarationStatement.java
diff --git a/jdk/src/share/classes/sun/tools/tree/Vset.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/Vset.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/Vset.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/Vset.java
diff --git a/jdk/src/share/classes/sun/tools/tree/WhileStatement.java b/jdk/src/jdk.rmic/share/classes/sun/tools/tree/WhileStatement.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/tree/WhileStatement.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/tree/WhileStatement.java
diff --git a/jdk/src/share/classes/sun/tools/util/CommandLine.java b/jdk/src/jdk.rmic/share/classes/sun/tools/util/CommandLine.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/util/CommandLine.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/util/CommandLine.java
diff --git a/jdk/src/share/classes/sun/tools/util/ModifierFilter.java b/jdk/src/jdk.rmic/share/classes/sun/tools/util/ModifierFilter.java
similarity index 100%
rename from jdk/src/share/classes/sun/tools/util/ModifierFilter.java
rename to jdk/src/jdk.rmic/share/classes/sun/tools/util/ModifierFilter.java
diff --git a/jdk/src/share/classes/com/sun/tracing/Probe.java b/jdk/src/jdk.runtime/share/classes/com/sun/tracing/Probe.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tracing/Probe.java
rename to jdk/src/jdk.runtime/share/classes/com/sun/tracing/Probe.java
diff --git a/jdk/src/share/classes/com/sun/tracing/ProbeName.java b/jdk/src/jdk.runtime/share/classes/com/sun/tracing/ProbeName.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tracing/ProbeName.java
rename to jdk/src/jdk.runtime/share/classes/com/sun/tracing/ProbeName.java
diff --git a/jdk/src/share/classes/com/sun/tracing/Provider.java b/jdk/src/jdk.runtime/share/classes/com/sun/tracing/Provider.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tracing/Provider.java
rename to jdk/src/jdk.runtime/share/classes/com/sun/tracing/Provider.java
diff --git a/jdk/src/share/classes/com/sun/tracing/ProviderFactory.java b/jdk/src/jdk.runtime/share/classes/com/sun/tracing/ProviderFactory.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tracing/ProviderFactory.java
rename to jdk/src/jdk.runtime/share/classes/com/sun/tracing/ProviderFactory.java
diff --git a/jdk/src/share/classes/com/sun/tracing/ProviderName.java b/jdk/src/jdk.runtime/share/classes/com/sun/tracing/ProviderName.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tracing/ProviderName.java
rename to jdk/src/jdk.runtime/share/classes/com/sun/tracing/ProviderName.java
diff --git a/jdk/src/share/classes/com/sun/tracing/dtrace/ArgsAttributes.java b/jdk/src/jdk.runtime/share/classes/com/sun/tracing/dtrace/ArgsAttributes.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tracing/dtrace/ArgsAttributes.java
rename to jdk/src/jdk.runtime/share/classes/com/sun/tracing/dtrace/ArgsAttributes.java
diff --git a/jdk/src/share/classes/com/sun/tracing/dtrace/Attributes.java b/jdk/src/jdk.runtime/share/classes/com/sun/tracing/dtrace/Attributes.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tracing/dtrace/Attributes.java
rename to jdk/src/jdk.runtime/share/classes/com/sun/tracing/dtrace/Attributes.java
diff --git a/jdk/src/share/classes/com/sun/tracing/dtrace/DependencyClass.java b/jdk/src/jdk.runtime/share/classes/com/sun/tracing/dtrace/DependencyClass.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tracing/dtrace/DependencyClass.java
rename to jdk/src/jdk.runtime/share/classes/com/sun/tracing/dtrace/DependencyClass.java
diff --git a/jdk/src/share/classes/com/sun/tracing/dtrace/FunctionAttributes.java b/jdk/src/jdk.runtime/share/classes/com/sun/tracing/dtrace/FunctionAttributes.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tracing/dtrace/FunctionAttributes.java
rename to jdk/src/jdk.runtime/share/classes/com/sun/tracing/dtrace/FunctionAttributes.java
diff --git a/jdk/src/share/classes/com/sun/tracing/dtrace/FunctionName.java b/jdk/src/jdk.runtime/share/classes/com/sun/tracing/dtrace/FunctionName.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tracing/dtrace/FunctionName.java
rename to jdk/src/jdk.runtime/share/classes/com/sun/tracing/dtrace/FunctionName.java
diff --git a/jdk/src/share/classes/com/sun/tracing/dtrace/ModuleAttributes.java b/jdk/src/jdk.runtime/share/classes/com/sun/tracing/dtrace/ModuleAttributes.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tracing/dtrace/ModuleAttributes.java
rename to jdk/src/jdk.runtime/share/classes/com/sun/tracing/dtrace/ModuleAttributes.java
diff --git a/jdk/src/share/classes/com/sun/tracing/dtrace/ModuleName.java b/jdk/src/jdk.runtime/share/classes/com/sun/tracing/dtrace/ModuleName.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tracing/dtrace/ModuleName.java
rename to jdk/src/jdk.runtime/share/classes/com/sun/tracing/dtrace/ModuleName.java
diff --git a/jdk/src/share/classes/com/sun/tracing/dtrace/NameAttributes.java b/jdk/src/jdk.runtime/share/classes/com/sun/tracing/dtrace/NameAttributes.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tracing/dtrace/NameAttributes.java
rename to jdk/src/jdk.runtime/share/classes/com/sun/tracing/dtrace/NameAttributes.java
diff --git a/jdk/src/share/classes/com/sun/tracing/dtrace/ProviderAttributes.java b/jdk/src/jdk.runtime/share/classes/com/sun/tracing/dtrace/ProviderAttributes.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tracing/dtrace/ProviderAttributes.java
rename to jdk/src/jdk.runtime/share/classes/com/sun/tracing/dtrace/ProviderAttributes.java
diff --git a/jdk/src/share/classes/com/sun/tracing/dtrace/StabilityLevel.java b/jdk/src/jdk.runtime/share/classes/com/sun/tracing/dtrace/StabilityLevel.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tracing/dtrace/StabilityLevel.java
rename to jdk/src/jdk.runtime/share/classes/com/sun/tracing/dtrace/StabilityLevel.java
diff --git a/jdk/src/share/classes/com/sun/tracing/dtrace/package-info.java b/jdk/src/jdk.runtime/share/classes/com/sun/tracing/dtrace/package-info.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tracing/dtrace/package-info.java
rename to jdk/src/jdk.runtime/share/classes/com/sun/tracing/dtrace/package-info.java
diff --git a/jdk/src/share/classes/com/sun/tracing/package-info.java b/jdk/src/jdk.runtime/share/classes/com/sun/tracing/package-info.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/tracing/package-info.java
rename to jdk/src/jdk.runtime/share/classes/com/sun/tracing/package-info.java
diff --git a/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java b/jdk/src/jdk.runtime/share/classes/sun/security/tools/policytool/PolicyTool.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java
rename to jdk/src/jdk.runtime/share/classes/sun/security/tools/policytool/PolicyTool.java
diff --git a/jdk/src/share/classes/sun/security/tools/policytool/Resources.java b/jdk/src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/tools/policytool/Resources.java
rename to jdk/src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources.java
diff --git a/jdk/src/share/classes/sun/security/tools/policytool/Resources_de.java b/jdk/src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources_de.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/tools/policytool/Resources_de.java
rename to jdk/src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources_de.java
diff --git a/jdk/src/share/classes/sun/security/tools/policytool/Resources_es.java b/jdk/src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources_es.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/tools/policytool/Resources_es.java
rename to jdk/src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources_es.java
diff --git a/jdk/src/share/classes/sun/security/tools/policytool/Resources_fr.java b/jdk/src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources_fr.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/tools/policytool/Resources_fr.java
rename to jdk/src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources_fr.java
diff --git a/jdk/src/share/classes/sun/security/tools/policytool/Resources_it.java b/jdk/src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources_it.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/tools/policytool/Resources_it.java
rename to jdk/src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources_it.java
diff --git a/jdk/src/share/classes/sun/security/tools/policytool/Resources_ja.java b/jdk/src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources_ja.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/tools/policytool/Resources_ja.java
rename to jdk/src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources_ja.java
diff --git a/jdk/src/share/classes/sun/security/tools/policytool/Resources_ko.java b/jdk/src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources_ko.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/tools/policytool/Resources_ko.java
rename to jdk/src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources_ko.java
diff --git a/jdk/src/share/classes/sun/security/tools/policytool/Resources_pt_BR.java b/jdk/src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources_pt_BR.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/tools/policytool/Resources_pt_BR.java
rename to jdk/src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources_pt_BR.java
diff --git a/jdk/src/share/classes/sun/security/tools/policytool/Resources_sv.java b/jdk/src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources_sv.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/tools/policytool/Resources_sv.java
rename to jdk/src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources_sv.java
diff --git a/jdk/src/share/classes/sun/security/tools/policytool/Resources_zh_CN.java b/jdk/src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources_zh_CN.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/tools/policytool/Resources_zh_CN.java
rename to jdk/src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources_zh_CN.java
diff --git a/jdk/src/share/classes/sun/security/tools/policytool/Resources_zh_HK.java b/jdk/src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources_zh_HK.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/tools/policytool/Resources_zh_HK.java
rename to jdk/src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources_zh_HK.java
diff --git a/jdk/src/share/classes/sun/security/tools/policytool/Resources_zh_TW.java b/jdk/src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources_zh_TW.java
similarity index 100%
rename from jdk/src/share/classes/sun/security/tools/policytool/Resources_zh_TW.java
rename to jdk/src/jdk.runtime/share/classes/sun/security/tools/policytool/Resources_zh_TW.java
diff --git a/jdk/src/share/classes/sun/tracing/MultiplexProviderFactory.java b/jdk/src/jdk.runtime/share/classes/sun/tracing/MultiplexProviderFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/tracing/MultiplexProviderFactory.java
rename to jdk/src/jdk.runtime/share/classes/sun/tracing/MultiplexProviderFactory.java
diff --git a/jdk/src/share/classes/sun/tracing/NullProviderFactory.java b/jdk/src/jdk.runtime/share/classes/sun/tracing/NullProviderFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/tracing/NullProviderFactory.java
rename to jdk/src/jdk.runtime/share/classes/sun/tracing/NullProviderFactory.java
diff --git a/jdk/src/share/classes/sun/tracing/PrintStreamProviderFactory.java b/jdk/src/jdk.runtime/share/classes/sun/tracing/PrintStreamProviderFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/tracing/PrintStreamProviderFactory.java
rename to jdk/src/jdk.runtime/share/classes/sun/tracing/PrintStreamProviderFactory.java
diff --git a/jdk/src/share/classes/sun/tracing/ProbeSkeleton.java b/jdk/src/jdk.runtime/share/classes/sun/tracing/ProbeSkeleton.java
similarity index 100%
rename from jdk/src/share/classes/sun/tracing/ProbeSkeleton.java
rename to jdk/src/jdk.runtime/share/classes/sun/tracing/ProbeSkeleton.java
diff --git a/jdk/src/share/classes/sun/tracing/ProviderSkeleton.java b/jdk/src/jdk.runtime/share/classes/sun/tracing/ProviderSkeleton.java
similarity index 100%
rename from jdk/src/share/classes/sun/tracing/ProviderSkeleton.java
rename to jdk/src/jdk.runtime/share/classes/sun/tracing/ProviderSkeleton.java
diff --git a/jdk/src/share/classes/sun/tracing/dtrace/Activation.java b/jdk/src/jdk.runtime/share/classes/sun/tracing/dtrace/Activation.java
similarity index 100%
rename from jdk/src/share/classes/sun/tracing/dtrace/Activation.java
rename to jdk/src/jdk.runtime/share/classes/sun/tracing/dtrace/Activation.java
diff --git a/jdk/src/share/classes/sun/tracing/dtrace/DTraceProbe.java b/jdk/src/jdk.runtime/share/classes/sun/tracing/dtrace/DTraceProbe.java
similarity index 100%
rename from jdk/src/share/classes/sun/tracing/dtrace/DTraceProbe.java
rename to jdk/src/jdk.runtime/share/classes/sun/tracing/dtrace/DTraceProbe.java
diff --git a/jdk/src/share/classes/sun/tracing/dtrace/DTraceProvider.java b/jdk/src/jdk.runtime/share/classes/sun/tracing/dtrace/DTraceProvider.java
similarity index 100%
rename from jdk/src/share/classes/sun/tracing/dtrace/DTraceProvider.java
rename to jdk/src/jdk.runtime/share/classes/sun/tracing/dtrace/DTraceProvider.java
diff --git a/jdk/src/share/classes/sun/tracing/dtrace/DTraceProviderFactory.java b/jdk/src/jdk.runtime/share/classes/sun/tracing/dtrace/DTraceProviderFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/tracing/dtrace/DTraceProviderFactory.java
rename to jdk/src/jdk.runtime/share/classes/sun/tracing/dtrace/DTraceProviderFactory.java
diff --git a/jdk/src/share/classes/sun/tracing/dtrace/JVM.java b/jdk/src/jdk.runtime/share/classes/sun/tracing/dtrace/JVM.java
similarity index 100%
rename from jdk/src/share/classes/sun/tracing/dtrace/JVM.java
rename to jdk/src/jdk.runtime/share/classes/sun/tracing/dtrace/JVM.java
diff --git a/jdk/src/share/classes/sun/tracing/package-info.java b/jdk/src/jdk.runtime/share/classes/sun/tracing/package-info.java
similarity index 100%
rename from jdk/src/share/classes/sun/tracing/package-info.java
rename to jdk/src/jdk.runtime/share/classes/sun/tracing/package-info.java
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/bands.cpp b/jdk/src/jdk.runtime/share/native/common-unpack/bands.cpp
similarity index 100%
rename from jdk/src/share/native/com/sun/java/util/jar/pack/bands.cpp
rename to jdk/src/jdk.runtime/share/native/common-unpack/bands.cpp
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/bands.h b/jdk/src/jdk.runtime/share/native/common-unpack/bands.h
similarity index 100%
rename from jdk/src/share/native/com/sun/java/util/jar/pack/bands.h
rename to jdk/src/jdk.runtime/share/native/common-unpack/bands.h
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.cpp b/jdk/src/jdk.runtime/share/native/common-unpack/bytes.cpp
similarity index 100%
rename from jdk/src/share/native/com/sun/java/util/jar/pack/bytes.cpp
rename to jdk/src/jdk.runtime/share/native/common-unpack/bytes.cpp
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h b/jdk/src/jdk.runtime/share/native/common-unpack/bytes.h
similarity index 100%
rename from jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
rename to jdk/src/jdk.runtime/share/native/common-unpack/bytes.h
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/coding.cpp b/jdk/src/jdk.runtime/share/native/common-unpack/coding.cpp
similarity index 100%
rename from jdk/src/share/native/com/sun/java/util/jar/pack/coding.cpp
rename to jdk/src/jdk.runtime/share/native/common-unpack/coding.cpp
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/coding.h b/jdk/src/jdk.runtime/share/native/common-unpack/coding.h
similarity index 100%
rename from jdk/src/share/native/com/sun/java/util/jar/pack/coding.h
rename to jdk/src/jdk.runtime/share/native/common-unpack/coding.h
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/constants.h b/jdk/src/jdk.runtime/share/native/common-unpack/constants.h
similarity index 100%
rename from jdk/src/share/native/com/sun/java/util/jar/pack/constants.h
rename to jdk/src/jdk.runtime/share/native/common-unpack/constants.h
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h b/jdk/src/jdk.runtime/share/native/common-unpack/defines.h
similarity index 100%
rename from jdk/src/share/native/com/sun/java/util/jar/pack/defines.h
rename to jdk/src/jdk.runtime/share/native/common-unpack/defines.h
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp b/jdk/src/jdk.runtime/share/native/common-unpack/unpack.cpp
similarity index 100%
rename from jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
rename to jdk/src/jdk.runtime/share/native/common-unpack/unpack.cpp
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h b/jdk/src/jdk.runtime/share/native/common-unpack/unpack.h
similarity index 100%
rename from jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
rename to jdk/src/jdk.runtime/share/native/common-unpack/unpack.h
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp b/jdk/src/jdk.runtime/share/native/common-unpack/utils.cpp
similarity index 100%
rename from jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
rename to jdk/src/jdk.runtime/share/native/common-unpack/utils.cpp
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/utils.h b/jdk/src/jdk.runtime/share/native/common-unpack/utils.h
similarity index 100%
rename from jdk/src/share/native/com/sun/java/util/jar/pack/utils.h
rename to jdk/src/jdk.runtime/share/native/common-unpack/utils.h
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp b/jdk/src/jdk.runtime/share/native/common-unpack/zip.cpp
similarity index 100%
rename from jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
rename to jdk/src/jdk.runtime/share/native/common-unpack/zip.cpp
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h b/jdk/src/jdk.runtime/share/native/common-unpack/zip.h
similarity index 100%
rename from jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
rename to jdk/src/jdk.runtime/share/native/common-unpack/zip.h
diff --git a/jdk/src/share/native/sun/tracing/dtrace/JVM.c b/jdk/src/jdk.runtime/share/native/libjsdt/JVM.c
similarity index 100%
rename from jdk/src/share/native/sun/tracing/dtrace/JVM.c
rename to jdk/src/jdk.runtime/share/native/libjsdt/JVM.c
diff --git a/jdk/src/share/native/sun/tracing/dtrace/jvm_symbols.h b/jdk/src/jdk.runtime/share/native/libjsdt/jvm_symbols.h
similarity index 100%
rename from jdk/src/share/native/sun/tracing/dtrace/jvm_symbols.h
rename to jdk/src/jdk.runtime/share/native/libjsdt/jvm_symbols.h
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp b/jdk/src/jdk.runtime/share/native/libunpack/jni.cpp
similarity index 100%
rename from jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
rename to jdk/src/jdk.runtime/share/native/libunpack/jni.cpp
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp b/jdk/src/jdk.runtime/share/native/unpack200/main.cpp
similarity index 100%
rename from jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
rename to jdk/src/jdk.runtime/share/native/unpack200/main.cpp
diff --git a/jdk/src/solaris/native/sun/tracing/dtrace/jvm_symbols_md.c b/jdk/src/jdk.runtime/unix/native/libjsdt/jvm_symbols_md.c
similarity index 100%
rename from jdk/src/solaris/native/sun/tracing/dtrace/jvm_symbols_md.c
rename to jdk/src/jdk.runtime/unix/native/libjsdt/jvm_symbols_md.c
diff --git a/jdk/src/windows/native/sun/tracing/dtrace/jvm_symbols_md.c b/jdk/src/jdk.runtime/windows/native/libjsdt/jvm_symbols_md.c
similarity index 100%
rename from jdk/src/windows/native/sun/tracing/dtrace/jvm_symbols_md.c
rename to jdk/src/jdk.runtime/windows/native/libjsdt/jvm_symbols_md.c
diff --git a/jdk/src/windows/resource/unpack200_proto.exe.manifest b/jdk/src/jdk.runtime/windows/native/unpack200/unpack200_proto.exe.manifest
similarity index 100%
rename from jdk/src/windows/resource/unpack200_proto.exe.manifest
rename to jdk/src/jdk.runtime/windows/native/unpack200/unpack200_proto.exe.manifest
diff --git a/jdk/src/aix/classes/sun/nio/ch/sctp/SctpChannelImpl.java b/jdk/src/jdk.sctp/aix/classes/sun/nio/ch/sctp/SctpChannelImpl.java
similarity index 100%
rename from jdk/src/aix/classes/sun/nio/ch/sctp/SctpChannelImpl.java
rename to jdk/src/jdk.sctp/aix/classes/sun/nio/ch/sctp/SctpChannelImpl.java
diff --git a/jdk/src/aix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java b/jdk/src/jdk.sctp/aix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java
similarity index 100%
rename from jdk/src/aix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java
rename to jdk/src/jdk.sctp/aix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java
diff --git a/jdk/src/aix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java b/jdk/src/jdk.sctp/aix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java
similarity index 100%
rename from jdk/src/aix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java
rename to jdk/src/jdk.sctp/aix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java
diff --git a/jdk/src/macosx/classes/sun/nio/ch/sctp/SctpChannelImpl.java b/jdk/src/jdk.sctp/macosx/classes/sun/nio/ch/sctp/SctpChannelImpl.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/nio/ch/sctp/SctpChannelImpl.java
rename to jdk/src/jdk.sctp/macosx/classes/sun/nio/ch/sctp/SctpChannelImpl.java
diff --git a/jdk/src/macosx/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java b/jdk/src/jdk.sctp/macosx/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java
rename to jdk/src/jdk.sctp/macosx/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java
diff --git a/jdk/src/macosx/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java b/jdk/src/jdk.sctp/macosx/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java
similarity index 100%
rename from jdk/src/macosx/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java
rename to jdk/src/jdk.sctp/macosx/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/AbstractNotificationHandler.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/AbstractNotificationHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/nio/sctp/AbstractNotificationHandler.java
rename to jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/AbstractNotificationHandler.java
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/Association.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/Association.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/nio/sctp/Association.java
rename to jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/Association.java
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/AssociationChangeNotification.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/AssociationChangeNotification.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/nio/sctp/AssociationChangeNotification.java
rename to jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/AssociationChangeNotification.java
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/HandlerResult.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/HandlerResult.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/nio/sctp/HandlerResult.java
rename to jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/HandlerResult.java
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/IllegalReceiveException.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/IllegalReceiveException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/nio/sctp/IllegalReceiveException.java
rename to jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/IllegalReceiveException.java
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/IllegalUnbindException.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/IllegalUnbindException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/nio/sctp/IllegalUnbindException.java
rename to jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/IllegalUnbindException.java
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/InvalidStreamException.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/InvalidStreamException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/nio/sctp/InvalidStreamException.java
rename to jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/InvalidStreamException.java
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/MessageInfo.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/MessageInfo.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/nio/sctp/MessageInfo.java
rename to jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/MessageInfo.java
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/Notification.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/Notification.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/nio/sctp/Notification.java
rename to jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/Notification.java
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/NotificationHandler.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/NotificationHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/nio/sctp/NotificationHandler.java
rename to jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/NotificationHandler.java
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/PeerAddressChangeNotification.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/PeerAddressChangeNotification.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/nio/sctp/PeerAddressChangeNotification.java
rename to jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/PeerAddressChangeNotification.java
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/SctpChannel.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpChannel.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/nio/sctp/SctpChannel.java
rename to jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpChannel.java
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/SctpMultiChannel.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpMultiChannel.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/nio/sctp/SctpMultiChannel.java
rename to jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpMultiChannel.java
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/SctpServerChannel.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpServerChannel.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/nio/sctp/SctpServerChannel.java
rename to jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpServerChannel.java
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/SctpSocketOption.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpSocketOption.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/nio/sctp/SctpSocketOption.java
rename to jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpSocketOption.java
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/SctpStandardSocketOptions.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpStandardSocketOptions.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/nio/sctp/SctpStandardSocketOptions.java
rename to jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpStandardSocketOptions.java
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/SendFailedNotification.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SendFailedNotification.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/nio/sctp/SendFailedNotification.java
rename to jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SendFailedNotification.java
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/ShutdownNotification.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/ShutdownNotification.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/nio/sctp/ShutdownNotification.java
rename to jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/ShutdownNotification.java
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/package-info.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/package-info.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/nio/sctp/package-info.java
rename to jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/package-info.java
diff --git a/jdk/src/share/classes/sun/nio/ch/sctp/MessageInfoImpl.java b/jdk/src/jdk.sctp/share/classes/sun/nio/ch/sctp/MessageInfoImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/sctp/MessageInfoImpl.java
rename to jdk/src/jdk.sctp/share/classes/sun/nio/ch/sctp/MessageInfoImpl.java
diff --git a/jdk/src/share/classes/sun/nio/ch/sctp/SctpStdSocketOption.java b/jdk/src/jdk.sctp/share/classes/sun/nio/ch/sctp/SctpStdSocketOption.java
similarity index 100%
rename from jdk/src/share/classes/sun/nio/ch/sctp/SctpStdSocketOption.java
rename to jdk/src/jdk.sctp/share/classes/sun/nio/ch/sctp/SctpStdSocketOption.java
diff --git a/jdk/src/solaris/classes/sun/nio/ch/sctp/AssociationChange.java b/jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationChange.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/ch/sctp/AssociationChange.java
rename to jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationChange.java
diff --git a/jdk/src/solaris/classes/sun/nio/ch/sctp/AssociationImpl.java b/jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationImpl.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/ch/sctp/AssociationImpl.java
rename to jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationImpl.java
diff --git a/jdk/src/solaris/classes/sun/nio/ch/sctp/PeerAddrChange.java b/jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/PeerAddrChange.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/ch/sctp/PeerAddrChange.java
rename to jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/PeerAddrChange.java
diff --git a/jdk/src/solaris/classes/sun/nio/ch/sctp/ResultContainer.java b/jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/ResultContainer.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/ch/sctp/ResultContainer.java
rename to jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/ResultContainer.java
diff --git a/jdk/src/solaris/classes/sun/nio/ch/sctp/SctpChannelImpl.java b/jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/ch/sctp/SctpChannelImpl.java
rename to jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java
diff --git a/jdk/src/solaris/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java b/jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java
rename to jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java
diff --git a/jdk/src/solaris/classes/sun/nio/ch/sctp/SctpNet.java b/jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNet.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/ch/sctp/SctpNet.java
rename to jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNet.java
diff --git a/jdk/src/solaris/classes/sun/nio/ch/sctp/SctpNotification.java b/jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNotification.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/ch/sctp/SctpNotification.java
rename to jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNotification.java
diff --git a/jdk/src/solaris/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java b/jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java
rename to jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java
diff --git a/jdk/src/solaris/classes/sun/nio/ch/sctp/SendFailed.java b/jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SendFailed.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/ch/sctp/SendFailed.java
rename to jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SendFailed.java
diff --git a/jdk/src/solaris/classes/sun/nio/ch/sctp/Shutdown.java b/jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/Shutdown.java
similarity index 100%
rename from jdk/src/solaris/classes/sun/nio/ch/sctp/Shutdown.java
rename to jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/Shutdown.java
diff --git a/jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h b/jdk/src/jdk.sctp/unix/native/libsctp/Sctp.h
similarity index 100%
rename from jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h
rename to jdk/src/jdk.sctp/unix/native/libsctp/Sctp.h
diff --git a/jdk/src/solaris/native/sun/nio/ch/sctp/SctpChannelImpl.c b/jdk/src/jdk.sctp/unix/native/libsctp/SctpChannelImpl.c
similarity index 100%
rename from jdk/src/solaris/native/sun/nio/ch/sctp/SctpChannelImpl.c
rename to jdk/src/jdk.sctp/unix/native/libsctp/SctpChannelImpl.c
diff --git a/jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c b/jdk/src/jdk.sctp/unix/native/libsctp/SctpNet.c
similarity index 100%
rename from jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c
rename to jdk/src/jdk.sctp/unix/native/libsctp/SctpNet.c
diff --git a/jdk/src/solaris/native/sun/nio/ch/sctp/SctpServerChannelImpl.c b/jdk/src/jdk.sctp/unix/native/libsctp/SctpServerChannelImpl.c
similarity index 100%
rename from jdk/src/solaris/native/sun/nio/ch/sctp/SctpServerChannelImpl.c
rename to jdk/src/jdk.sctp/unix/native/libsctp/SctpServerChannelImpl.c
diff --git a/jdk/src/windows/classes/sun/nio/ch/sctp/SctpChannelImpl.java b/jdk/src/jdk.sctp/windows/classes/sun/nio/ch/sctp/SctpChannelImpl.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/ch/sctp/SctpChannelImpl.java
rename to jdk/src/jdk.sctp/windows/classes/sun/nio/ch/sctp/SctpChannelImpl.java
diff --git a/jdk/src/windows/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java b/jdk/src/jdk.sctp/windows/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java
rename to jdk/src/jdk.sctp/windows/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java
diff --git a/jdk/src/windows/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java b/jdk/src/jdk.sctp/windows/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java
similarity index 100%
rename from jdk/src/windows/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java
rename to jdk/src/jdk.sctp/windows/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/LdapPrincipal.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/LdapPrincipal.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/LdapPrincipal.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/LdapPrincipal.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/NTDomainPrincipal.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTDomainPrincipal.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/NTDomainPrincipal.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTDomainPrincipal.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/NTNumericCredential.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTNumericCredential.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/NTNumericCredential.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTNumericCredential.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/NTSid.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSid.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/NTSid.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSid.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/NTSidDomainPrincipal.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidDomainPrincipal.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/NTSidDomainPrincipal.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidDomainPrincipal.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/NTSidGroupPrincipal.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidGroupPrincipal.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/NTSidGroupPrincipal.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidGroupPrincipal.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/NTSidPrimaryGroupPrincipal.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidPrimaryGroupPrincipal.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/NTSidPrimaryGroupPrincipal.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidPrimaryGroupPrincipal.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/NTSidUserPrincipal.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidUserPrincipal.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/NTSidUserPrincipal.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidUserPrincipal.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/NTUserPrincipal.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTUserPrincipal.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/NTUserPrincipal.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTUserPrincipal.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/PolicyFile.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/PolicyFile.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/PolicyFile.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/PrincipalComparator.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/PrincipalComparator.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/PrincipalComparator.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/PrincipalComparator.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/SolarisNumericGroupPrincipal.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisNumericGroupPrincipal.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/SolarisNumericGroupPrincipal.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisNumericGroupPrincipal.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/SolarisNumericUserPrincipal.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisNumericUserPrincipal.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/SolarisNumericUserPrincipal.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisNumericUserPrincipal.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/SolarisPrincipal.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisPrincipal.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/SolarisPrincipal.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisPrincipal.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/UnixNumericGroupPrincipal.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixNumericGroupPrincipal.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/UnixNumericGroupPrincipal.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixNumericGroupPrincipal.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/UnixNumericUserPrincipal.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixNumericUserPrincipal.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/UnixNumericUserPrincipal.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixNumericUserPrincipal.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/UnixPrincipal.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixPrincipal.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/UnixPrincipal.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixPrincipal.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/UserPrincipal.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/UserPrincipal.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/UserPrincipal.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/UserPrincipal.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/X500Principal.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/X500Principal.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/X500Principal.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/X500Principal.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/callback/TextCallbackHandler.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/callback/TextCallbackHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/callback/TextCallbackHandler.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/callback/TextCallbackHandler.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/callback/package-info.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/callback/package-info.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/callback/package-info.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/callback/package-info.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/login/ConfigFile.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/login/ConfigFile.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/login/package-info.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/login/package-info.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/login/package-info.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/login/package-info.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/module/Crypt.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/Crypt.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/module/Crypt.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/Crypt.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/JndiLoginModule.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/JndiLoginModule.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/Krb5LoginModule.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/Krb5LoginModule.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/module/LdapLoginModule.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/LdapLoginModule.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/module/LdapLoginModule.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/LdapLoginModule.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/module/NTLoginModule.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTLoginModule.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/module/NTLoginModule.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTLoginModule.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/module/NTSystem.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTSystem.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/module/NTSystem.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTSystem.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/SolarisLoginModule.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/SolarisLoginModule.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/module/SolarisSystem.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/SolarisSystem.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/module/SolarisSystem.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/SolarisSystem.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixLoginModule.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixLoginModule.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/module/UnixSystem.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixSystem.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/module/UnixSystem.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixSystem.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/module/package-info.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/package-info.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/module/package-info.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/package-info.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/package-info.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/package-info.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/package-info.java
rename to jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/package-info.java
diff --git a/jdk/src/share/classes/com/sun/security/auth/jaas-overview.html b/jdk/src/jdk.security.auth/share/classes/jaas-overview.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/security/auth/jaas-overview.html
rename to jdk/src/jdk.security.auth/share/classes/jaas-overview.html
diff --git a/jdk/src/solaris/native/com/sun/security/auth/module/Solaris.c b/jdk/src/jdk.security.auth/unix/native/libjaas/Solaris.c
similarity index 100%
rename from jdk/src/solaris/native/com/sun/security/auth/module/Solaris.c
rename to jdk/src/jdk.security.auth/unix/native/libjaas/Solaris.c
diff --git a/jdk/src/solaris/native/com/sun/security/auth/module/Unix.c b/jdk/src/jdk.security.auth/unix/native/libjaas/Unix.c
similarity index 100%
rename from jdk/src/solaris/native/com/sun/security/auth/module/Unix.c
rename to jdk/src/jdk.security.auth/unix/native/libjaas/Unix.c
diff --git a/jdk/src/windows/native/com/sun/security/auth/module/nt.c b/jdk/src/jdk.security.auth/windows/native/libjaas/nt.c
similarity index 100%
rename from jdk/src/windows/native/com/sun/security/auth/module/nt.c
rename to jdk/src/jdk.security.auth/windows/native/libjaas/nt.c
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/BerDecoder.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/BerDecoder.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/BerDecoder.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/BerDecoder.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/BerEncoder.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/BerEncoder.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/BerEncoder.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/BerEncoder.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/BerException.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/BerException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/BerException.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/BerException.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/EnumRowStatus.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/EnumRowStatus.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/EnumRowStatus.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/EnumRowStatus.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/Enumerated.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/Enumerated.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/Enumerated.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/Enumerated.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/ASCII_CharStream.README b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/ASCII_CharStream.README
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/ASCII_CharStream.README
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/ASCII_CharStream.README
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/ASCII_CharStream.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/ASCII_CharStream.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/ASCII_CharStream.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/ASCII_CharStream.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/AclEntryImpl.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/AclEntryImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/AclEntryImpl.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/AclEntryImpl.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/AclImpl.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/AclImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/AclImpl.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/AclImpl.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/GroupImpl.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/GroupImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/GroupImpl.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/GroupImpl.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/Host.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/Host.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/Host.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/Host.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMAccess.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMAccess.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMAccess.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMAccess.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMAclBlock.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMAclBlock.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMAclBlock.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMAclBlock.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMAclItem.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMAclItem.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMAclItem.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMAclItem.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMCommunities.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMCommunities.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMCommunities.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMCommunities.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMCommunity.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMCommunity.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMCommunity.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMCommunity.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMEnterprise.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMEnterprise.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMEnterprise.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMEnterprise.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMHost.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMHost.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMHost.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMHost.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMHostInform.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMHostInform.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMHostInform.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMHostInform.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMHostName.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMHostName.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMHostName.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMHostName.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMHostTrap.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMHostTrap.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMHostTrap.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMHostTrap.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMInformBlock.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMInformBlock.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMInformBlock.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMInformBlock.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMInformCommunity.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMInformCommunity.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMInformCommunity.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMInformCommunity.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMInformInterestedHost.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMInformInterestedHost.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMInformInterestedHost.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMInformInterestedHost.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMInformItem.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMInformItem.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMInformItem.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMInformItem.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMIpAddress.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMIpAddress.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMIpAddress.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMIpAddress.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMIpMask.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMIpMask.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMIpMask.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMIpMask.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMIpV6Address.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMIpV6Address.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMIpV6Address.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMIpV6Address.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMManagers.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMManagers.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMManagers.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMManagers.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMNetMask.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMNetMask.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMNetMask.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMNetMask.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMNetMaskV6.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMNetMaskV6.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMNetMaskV6.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMNetMaskV6.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMSecurityDefs.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMSecurityDefs.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMSecurityDefs.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMSecurityDefs.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapBlock.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapBlock.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapBlock.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapBlock.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapCommunity.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapCommunity.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapCommunity.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapCommunity.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapInterestedHost.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapInterestedHost.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapInterestedHost.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapInterestedHost.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapItem.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapItem.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapItem.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapItem.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapNum.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapNum.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapNum.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapNum.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JJTParserState.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JJTParserState.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/JJTParserState.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/JJTParserState.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/NetMaskImpl.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/NetMaskImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/NetMaskImpl.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/NetMaskImpl.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/Node.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/Node.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/Node.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/Node.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/OwnerImpl.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/OwnerImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/OwnerImpl.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/OwnerImpl.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/ParseError.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/ParseError.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/ParseError.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/ParseError.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/ParseException.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/ParseException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/ParseException.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/ParseException.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/Parser.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/Parser.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jjt b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jjt
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jjt
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jjt
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/ParserConstants.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/ParserConstants.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/ParserConstants.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/ParserConstants.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/ParserTokenManager.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/ParserTokenManager.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/ParserTokenManager.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/ParserTokenManager.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/ParserTreeConstants.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/ParserTreeConstants.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/ParserTreeConstants.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/ParserTreeConstants.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/PermissionImpl.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/PermissionImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/PermissionImpl.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/PermissionImpl.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/PrincipalImpl.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/PrincipalImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/PrincipalImpl.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/PrincipalImpl.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/README.update b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/README.update
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/README.update
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/README.update
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/SimpleNode.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/SimpleNode.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/SimpleNode.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/SimpleNode.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/SnmpAcl.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/SnmpAcl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/SnmpAcl.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/SnmpAcl.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/Token.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/Token.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/Token.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/Token.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/TokenMgrError.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/TokenMgrError.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/TokenMgrError.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/TokenMgrError.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/package.html b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/package.html
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/package.html
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/InetAddressAcl.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/InetAddressAcl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/InetAddressAcl.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/InetAddressAcl.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/ServiceName.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/ServiceName.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/ServiceName.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/ServiceName.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpAckPdu.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpAckPdu.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpAckPdu.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpAckPdu.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpBadSecurityLevelException.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpBadSecurityLevelException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpBadSecurityLevelException.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpBadSecurityLevelException.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpCounter.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpCounter.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpCounter.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpCounter.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpCounter64.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpCounter64.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpCounter64.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpCounter64.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpEngine.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpEngine.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpEngine.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpEngine.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpEngineFactory.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpEngineFactory.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpEngineFactory.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpEngineFactory.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpEngineId.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpEngineId.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpEngineId.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpEngineId.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpEngineParameters.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpEngineParameters.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpEngineParameters.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpEngineParameters.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpGauge.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpGauge.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpGauge.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpGauge.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpInt.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpInt.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpInt.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpInt.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpIpAddress.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpIpAddress.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpIpAddress.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpIpAddress.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpMessage.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpMessage.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpMessage.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpMessage.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpMsg.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpMsg.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpMsg.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpMsg.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpNull.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpNull.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpNull.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpNull.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpOpaque.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpOpaque.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpOpaque.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpOpaque.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpParams.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpParams.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpParams.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpParams.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPdu.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpPdu.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpPdu.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpPdu.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduBulk.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpPduBulk.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduBulk.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpPduBulk.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduBulkType.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpPduBulkType.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduBulkType.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpPduBulkType.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduFactory.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpPduFactory.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduFactory.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpPduFactory.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduFactoryBER.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpPduFactoryBER.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduFactoryBER.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpPduFactoryBER.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduRequest.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpPduRequest.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduRequest.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpPduRequest.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduRequestType.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpPduRequestType.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduRequestType.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpPduRequestType.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpScopedPduBulk.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpScopedPduBulk.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpScopedPduBulk.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpScopedPduBulk.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpScopedPduPacket.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpScopedPduPacket.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpScopedPduPacket.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpScopedPduPacket.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpScopedPduRequest.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpScopedPduRequest.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpScopedPduRequest.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpScopedPduRequest.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpSecurityException.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpSecurityException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpSecurityException.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpSecurityException.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpSecurityParameters.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpSecurityParameters.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpSecurityParameters.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpSecurityParameters.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpStatusException.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpStatusException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpStatusException.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpStatusException.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpString.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpString.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpString.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpString.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpStringFixed.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpStringFixed.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpStringFixed.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpStringFixed.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpTooBigException.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpTooBigException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpTooBigException.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpTooBigException.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpUnknownAccContrModelException.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpUnknownAccContrModelException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpUnknownAccContrModelException.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpUnknownAccContrModelException.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpUnknownModelException.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpUnknownModelException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpUnknownModelException.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpUnknownModelException.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpUnknownModelLcdException.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpUnknownModelLcdException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpUnknownModelLcdException.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpUnknownModelLcdException.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpUnknownMsgProcModelException.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpUnknownMsgProcModelException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpUnknownMsgProcModelException.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpUnknownMsgProcModelException.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpUnknownSecModelException.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpUnknownSecModelException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpUnknownSecModelException.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpUnknownSecModelException.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpUnknownSubSystemException.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpUnknownSubSystemException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpUnknownSubSystemException.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpUnknownSubSystemException.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpUnsignedInt.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpUnsignedInt.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpUnsignedInt.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpUnsignedInt.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpUsmKeyHandler.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpUsmKeyHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpUsmKeyHandler.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpUsmKeyHandler.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpV3Message.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpV3Message.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpV3Message.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpV3Message.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpValue.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpValue.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/SnmpValue.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/SnmpValue.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/ThreadContext.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/ThreadContext.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/ThreadContext.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/ThreadContext.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/UserAcl.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/UserAcl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/UserAcl.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/UserAcl.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/agent/AcmChecker.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/AcmChecker.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/agent/AcmChecker.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/AcmChecker.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/agent/LongList.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/LongList.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/agent/LongList.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/LongList.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpEntryOid.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpEntryOid.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpEntryOid.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpEntryOid.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpErrorHandlerAgent.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpErrorHandlerAgent.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpErrorHandlerAgent.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpErrorHandlerAgent.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpGenericMetaServer.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpGenericMetaServer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpGenericMetaServer.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpGenericMetaServer.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpGenericObjectServer.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpGenericObjectServer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpGenericObjectServer.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpGenericObjectServer.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpIndex.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpIndex.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpIndex.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpIndex.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMib.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpMib.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMib.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpMib.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibAgent.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpMibAgent.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibAgent.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpMibAgent.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibAgentMBean.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpMibAgentMBean.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibAgentMBean.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpMibAgentMBean.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibEntry.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpMibEntry.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibEntry.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpMibEntry.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibGroup.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpMibGroup.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibGroup.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpMibGroup.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibHandler.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpMibHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibHandler.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpMibHandler.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibNode.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpMibNode.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibNode.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpMibNode.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibOid.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpMibOid.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibOid.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpMibOid.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibRequest.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpMibRequest.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibRequest.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpMibRequest.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibRequestImpl.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpMibRequestImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibRequestImpl.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpMibRequestImpl.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibSubRequest.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpMibSubRequest.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibSubRequest.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpMibSubRequest.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibTable.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpMibTable.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibTable.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpMibTable.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpRequestTree.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpRequestTree.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpRequestTree.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpRequestTree.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpStandardMetaServer.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpStandardMetaServer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpStandardMetaServer.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpStandardMetaServer.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpStandardObjectServer.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpStandardObjectServer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpStandardObjectServer.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpStandardObjectServer.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpTableCallbackHandler.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpTableCallbackHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpTableCallbackHandler.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpTableCallbackHandler.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpTableEntryFactory.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpTableEntryFactory.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpTableEntryFactory.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpTableEntryFactory.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpTableEntryNotification.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpTableEntryNotification.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpTableEntryNotification.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpTableEntryNotification.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpTableSupport.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpTableSupport.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpTableSupport.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpTableSupport.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpUserDataFactory.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpUserDataFactory.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpUserDataFactory.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/SnmpUserDataFactory.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/agent/package.html b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/agent/package.html
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/agent/package.html
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/daemon/ClientHandler.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/daemon/ClientHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/daemon/ClientHandler.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/daemon/ClientHandler.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/daemon/CommunicationException.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/daemon/CommunicationException.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/daemon/CommunicationException.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/daemon/CommunicationException.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/daemon/CommunicatorServer.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/daemon/CommunicatorServer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/daemon/CommunicatorServer.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/daemon/CommunicatorServer.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/daemon/CommunicatorServerMBean.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/daemon/CommunicatorServerMBean.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/daemon/CommunicatorServerMBean.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/daemon/CommunicatorServerMBean.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/daemon/SnmpAdaptorServer.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/daemon/SnmpAdaptorServer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/daemon/SnmpAdaptorServer.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/daemon/SnmpAdaptorServer.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/daemon/SnmpAdaptorServerMBean.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/daemon/SnmpAdaptorServerMBean.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/daemon/SnmpAdaptorServerMBean.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/daemon/SnmpAdaptorServerMBean.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/daemon/SnmpInformHandler.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/daemon/SnmpInformHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/daemon/SnmpInformHandler.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/daemon/SnmpInformHandler.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/daemon/SnmpMibTree.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/daemon/SnmpMibTree.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/daemon/SnmpMibTree.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/daemon/SnmpMibTree.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/daemon/SnmpRequestHandler.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/daemon/SnmpRequestHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/daemon/SnmpRequestHandler.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/daemon/SnmpRequestHandler.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/daemon/SnmpSubBulkRequestHandler.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/daemon/SnmpSubBulkRequestHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/daemon/SnmpSubBulkRequestHandler.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/daemon/SnmpSubBulkRequestHandler.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/daemon/SnmpSubNextRequestHandler.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/daemon/SnmpSubNextRequestHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/daemon/SnmpSubNextRequestHandler.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/daemon/SnmpSubNextRequestHandler.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/daemon/SnmpSubRequestHandler.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/daemon/SnmpSubRequestHandler.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/daemon/SnmpSubRequestHandler.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/daemon/SnmpSubRequestHandler.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/daemon/package.html b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/daemon/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/daemon/package.html
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/daemon/package.html
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/defaults/DefaultPaths.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/defaults/DefaultPaths.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/defaults/DefaultPaths.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/defaults/DefaultPaths.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/defaults/SnmpProperties.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/defaults/SnmpProperties.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/defaults/SnmpProperties.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/defaults/SnmpProperties.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/defaults/package.html b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/defaults/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/defaults/package.html
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/defaults/package.html
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/internal/SnmpAccessControlModel.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/SnmpAccessControlModel.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/internal/SnmpAccessControlModel.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/SnmpAccessControlModel.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/internal/SnmpAccessControlSubSystem.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/SnmpAccessControlSubSystem.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/internal/SnmpAccessControlSubSystem.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/SnmpAccessControlSubSystem.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/internal/SnmpDecryptedPdu.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/SnmpDecryptedPdu.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/internal/SnmpDecryptedPdu.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/SnmpDecryptedPdu.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/internal/SnmpEngineImpl.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/SnmpEngineImpl.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/internal/SnmpEngineImpl.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/SnmpEngineImpl.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/internal/SnmpIncomingRequest.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/SnmpIncomingRequest.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/internal/SnmpIncomingRequest.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/SnmpIncomingRequest.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/internal/SnmpIncomingResponse.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/SnmpIncomingResponse.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/internal/SnmpIncomingResponse.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/SnmpIncomingResponse.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/internal/SnmpLcd.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/SnmpLcd.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/internal/SnmpLcd.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/SnmpLcd.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/internal/SnmpModel.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/SnmpModel.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/internal/SnmpModel.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/SnmpModel.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/internal/SnmpModelLcd.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/SnmpModelLcd.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/internal/SnmpModelLcd.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/SnmpModelLcd.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/internal/SnmpMsgProcessingModel.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/SnmpMsgProcessingModel.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/internal/SnmpMsgProcessingModel.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/SnmpMsgProcessingModel.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/internal/SnmpMsgProcessingSubSystem.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/SnmpMsgProcessingSubSystem.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/internal/SnmpMsgProcessingSubSystem.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/SnmpMsgProcessingSubSystem.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/internal/SnmpOutgoingRequest.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/SnmpOutgoingRequest.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/internal/SnmpOutgoingRequest.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/SnmpOutgoingRequest.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/internal/SnmpSecurityCache.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/SnmpSecurityCache.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/internal/SnmpSecurityCache.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/SnmpSecurityCache.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/internal/SnmpSecurityModel.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/SnmpSecurityModel.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/internal/SnmpSecurityModel.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/SnmpSecurityModel.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/internal/SnmpSecuritySubSystem.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/SnmpSecuritySubSystem.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/internal/SnmpSecuritySubSystem.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/SnmpSecuritySubSystem.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/internal/SnmpSubSystem.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/SnmpSubSystem.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/internal/SnmpSubSystem.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/SnmpSubSystem.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/internal/SnmpTools.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/SnmpTools.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/internal/SnmpTools.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/SnmpTools.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/internal/package.html b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/internal/package.html
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/internal/package.html
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/mpm/SnmpMsgTranslator.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/mpm/SnmpMsgTranslator.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/mpm/SnmpMsgTranslator.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/mpm/SnmpMsgTranslator.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/mpm/package.html b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/mpm/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/mpm/package.html
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/mpm/package.html
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/package.html b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/package.html
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/package.html
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/tasks/Task.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/tasks/Task.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/tasks/Task.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/tasks/Task.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/tasks/TaskServer.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/tasks/TaskServer.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/tasks/TaskServer.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/tasks/TaskServer.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/tasks/ThreadService.java b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/tasks/ThreadService.java
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/tasks/ThreadService.java
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/tasks/ThreadService.java
diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/tasks/package.html b/jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/tasks/package.html
similarity index 100%
rename from jdk/src/share/classes/com/sun/jmx/snmp/tasks/package.html
rename to jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp/tasks/package.html
diff --git a/jdk/src/share/classes/sun/management/snmp/AdaptorBootstrap.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/AdaptorBootstrap.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/AdaptorBootstrap.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/AdaptorBootstrap.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvminstr/JVM_MANAGEMENT_MIB_IMPL.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JVM_MANAGEMENT_MIB_IMPL.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvminstr/JVM_MANAGEMENT_MIB_IMPL.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JVM_MANAGEMENT_MIB_IMPL.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvminstr/JvmClassLoadingImpl.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmClassLoadingImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvminstr/JvmClassLoadingImpl.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmClassLoadingImpl.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvminstr/JvmCompilationImpl.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmCompilationImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvminstr/JvmCompilationImpl.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmCompilationImpl.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvminstr/JvmMemGCEntryImpl.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmMemGCEntryImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvminstr/JvmMemGCEntryImpl.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmMemGCEntryImpl.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvminstr/JvmMemGCTableMetaImpl.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmMemGCTableMetaImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvminstr/JvmMemGCTableMetaImpl.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmMemGCTableMetaImpl.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvminstr/JvmMemManagerEntryImpl.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmMemManagerEntryImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvminstr/JvmMemManagerEntryImpl.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmMemManagerEntryImpl.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvminstr/JvmMemManagerTableMetaImpl.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmMemManagerTableMetaImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvminstr/JvmMemManagerTableMetaImpl.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmMemManagerTableMetaImpl.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvminstr/JvmMemMgrPoolRelEntryImpl.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmMemMgrPoolRelEntryImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvminstr/JvmMemMgrPoolRelEntryImpl.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmMemMgrPoolRelEntryImpl.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvminstr/JvmMemMgrPoolRelTableMetaImpl.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmMemMgrPoolRelTableMetaImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvminstr/JvmMemMgrPoolRelTableMetaImpl.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmMemMgrPoolRelTableMetaImpl.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvminstr/JvmMemPoolEntryImpl.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmMemPoolEntryImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvminstr/JvmMemPoolEntryImpl.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmMemPoolEntryImpl.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvminstr/JvmMemPoolTableMetaImpl.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmMemPoolTableMetaImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvminstr/JvmMemPoolTableMetaImpl.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmMemPoolTableMetaImpl.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvminstr/JvmMemoryImpl.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmMemoryImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvminstr/JvmMemoryImpl.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmMemoryImpl.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvminstr/JvmMemoryMetaImpl.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmMemoryMetaImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvminstr/JvmMemoryMetaImpl.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmMemoryMetaImpl.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvminstr/JvmOSImpl.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmOSImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvminstr/JvmOSImpl.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmOSImpl.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvminstr/JvmRTBootClassPathEntryImpl.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmRTBootClassPathEntryImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvminstr/JvmRTBootClassPathEntryImpl.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmRTBootClassPathEntryImpl.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvminstr/JvmRTBootClassPathTableMetaImpl.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmRTBootClassPathTableMetaImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvminstr/JvmRTBootClassPathTableMetaImpl.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmRTBootClassPathTableMetaImpl.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvminstr/JvmRTClassPathEntryImpl.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmRTClassPathEntryImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvminstr/JvmRTClassPathEntryImpl.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmRTClassPathEntryImpl.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvminstr/JvmRTClassPathTableMetaImpl.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmRTClassPathTableMetaImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvminstr/JvmRTClassPathTableMetaImpl.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmRTClassPathTableMetaImpl.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvminstr/JvmRTInputArgsEntryImpl.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmRTInputArgsEntryImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvminstr/JvmRTInputArgsEntryImpl.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmRTInputArgsEntryImpl.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvminstr/JvmRTInputArgsTableMetaImpl.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmRTInputArgsTableMetaImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvminstr/JvmRTInputArgsTableMetaImpl.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmRTInputArgsTableMetaImpl.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvminstr/JvmRTLibraryPathEntryImpl.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmRTLibraryPathEntryImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvminstr/JvmRTLibraryPathEntryImpl.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmRTLibraryPathEntryImpl.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvminstr/JvmRTLibraryPathTableMetaImpl.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmRTLibraryPathTableMetaImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvminstr/JvmRTLibraryPathTableMetaImpl.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmRTLibraryPathTableMetaImpl.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvminstr/JvmRuntimeImpl.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmRuntimeImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvminstr/JvmRuntimeImpl.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmRuntimeImpl.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvminstr/JvmRuntimeMetaImpl.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmRuntimeMetaImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvminstr/JvmRuntimeMetaImpl.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmRuntimeMetaImpl.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvminstr/JvmThreadInstanceEntryImpl.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmThreadInstanceEntryImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvminstr/JvmThreadInstanceEntryImpl.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmThreadInstanceEntryImpl.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvminstr/JvmThreadInstanceTableMetaImpl.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmThreadInstanceTableMetaImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvminstr/JvmThreadInstanceTableMetaImpl.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmThreadInstanceTableMetaImpl.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvminstr/JvmThreadingImpl.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmThreadingImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvminstr/JvmThreadingImpl.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmThreadingImpl.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvminstr/JvmThreadingMetaImpl.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmThreadingMetaImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvminstr/JvmThreadingMetaImpl.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/JvmThreadingMetaImpl.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvminstr/NotificationTarget.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/NotificationTarget.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvminstr/NotificationTarget.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/NotificationTarget.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvminstr/NotificationTargetImpl.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/NotificationTargetImpl.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvminstr/NotificationTargetImpl.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/NotificationTargetImpl.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvminstr/README b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/README
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvminstr/README
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/README
diff --git a/jdk/src/share/classes/sun/management/snmp/jvminstr/package.html b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/package.html
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvminstr/package.html
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvminstr/package.html
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/EnumJvmClassesVerboseLevel.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/EnumJvmClassesVerboseLevel.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/EnumJvmClassesVerboseLevel.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/EnumJvmClassesVerboseLevel.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/EnumJvmJITCompilerTimeMonitoring.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/EnumJvmJITCompilerTimeMonitoring.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/EnumJvmJITCompilerTimeMonitoring.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/EnumJvmJITCompilerTimeMonitoring.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemManagerState.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/EnumJvmMemManagerState.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemManagerState.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/EnumJvmMemManagerState.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolCollectThreshdSupport.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolCollectThreshdSupport.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolCollectThreshdSupport.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolCollectThreshdSupport.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolState.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolState.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolState.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolState.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolThreshdSupport.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolThreshdSupport.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolThreshdSupport.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolThreshdSupport.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolType.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolType.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolType.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolType.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemoryGCCall.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/EnumJvmMemoryGCCall.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemoryGCCall.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/EnumJvmMemoryGCCall.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemoryGCVerboseLevel.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/EnumJvmMemoryGCVerboseLevel.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemoryGCVerboseLevel.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/EnumJvmMemoryGCVerboseLevel.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/EnumJvmRTBootClassPathSupport.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/EnumJvmRTBootClassPathSupport.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/EnumJvmRTBootClassPathSupport.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/EnumJvmRTBootClassPathSupport.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/EnumJvmThreadContentionMonitoring.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/EnumJvmThreadContentionMonitoring.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/EnumJvmThreadContentionMonitoring.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/EnumJvmThreadContentionMonitoring.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/EnumJvmThreadCpuTimeMonitoring.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/EnumJvmThreadCpuTimeMonitoring.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/EnumJvmThreadCpuTimeMonitoring.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/EnumJvmThreadCpuTimeMonitoring.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JVM_MANAGEMENT_MIB.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JVM_MANAGEMENT_MIB.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JVM_MANAGEMENT_MIB.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JVM_MANAGEMENT_MIB.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JVM_MANAGEMENT_MIBOidTable.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JVM_MANAGEMENT_MIBOidTable.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JVM_MANAGEMENT_MIBOidTable.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JVM_MANAGEMENT_MIBOidTable.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmClassLoadingMBean.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmClassLoadingMBean.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmClassLoadingMBean.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmClassLoadingMBean.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmClassLoadingMeta.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmClassLoadingMeta.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmClassLoadingMeta.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmClassLoadingMeta.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmCompilationMBean.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmCompilationMBean.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmCompilationMBean.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmCompilationMBean.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmCompilationMeta.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmCompilationMeta.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmCompilationMeta.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmCompilationMeta.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmMemGCEntryMBean.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmMemGCEntryMBean.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmMemGCEntryMBean.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmMemGCEntryMBean.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmMemGCEntryMeta.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmMemGCEntryMeta.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmMemGCEntryMeta.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmMemGCEntryMeta.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmMemGCTableMeta.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmMemGCTableMeta.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmMemGCTableMeta.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmMemGCTableMeta.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmMemManagerEntryMBean.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmMemManagerEntryMBean.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmMemManagerEntryMBean.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmMemManagerEntryMBean.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmMemManagerEntryMeta.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmMemManagerEntryMeta.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmMemManagerEntryMeta.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmMemManagerEntryMeta.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmMemManagerTableMeta.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmMemManagerTableMeta.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmMemManagerTableMeta.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmMemManagerTableMeta.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmMemMgrPoolRelEntryMBean.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmMemMgrPoolRelEntryMBean.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmMemMgrPoolRelEntryMBean.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmMemMgrPoolRelEntryMBean.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmMemMgrPoolRelEntryMeta.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmMemMgrPoolRelEntryMeta.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmMemMgrPoolRelEntryMeta.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmMemMgrPoolRelEntryMeta.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmMemMgrPoolRelTableMeta.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmMemMgrPoolRelTableMeta.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmMemMgrPoolRelTableMeta.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmMemMgrPoolRelTableMeta.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmMemPoolEntryMBean.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmMemPoolEntryMBean.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmMemPoolEntryMBean.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmMemPoolEntryMBean.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmMemPoolEntryMeta.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmMemPoolEntryMeta.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmMemPoolEntryMeta.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmMemPoolEntryMeta.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmMemPoolTableMeta.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmMemPoolTableMeta.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmMemPoolTableMeta.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmMemPoolTableMeta.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmMemoryMBean.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmMemoryMBean.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmMemoryMBean.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmMemoryMBean.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmMemoryMeta.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmMemoryMeta.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmMemoryMeta.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmMemoryMeta.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmOSMBean.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmOSMBean.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmOSMBean.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmOSMBean.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmOSMeta.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmOSMeta.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmOSMeta.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmOSMeta.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmRTBootClassPathEntryMBean.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmRTBootClassPathEntryMBean.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmRTBootClassPathEntryMBean.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmRTBootClassPathEntryMBean.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmRTBootClassPathEntryMeta.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmRTBootClassPathEntryMeta.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmRTBootClassPathEntryMeta.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmRTBootClassPathEntryMeta.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmRTBootClassPathTableMeta.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmRTBootClassPathTableMeta.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmRTBootClassPathTableMeta.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmRTBootClassPathTableMeta.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmRTClassPathEntryMBean.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmRTClassPathEntryMBean.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmRTClassPathEntryMBean.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmRTClassPathEntryMBean.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmRTClassPathEntryMeta.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmRTClassPathEntryMeta.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmRTClassPathEntryMeta.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmRTClassPathEntryMeta.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmRTClassPathTableMeta.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmRTClassPathTableMeta.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmRTClassPathTableMeta.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmRTClassPathTableMeta.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmRTInputArgsEntryMBean.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmRTInputArgsEntryMBean.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmRTInputArgsEntryMBean.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmRTInputArgsEntryMBean.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmRTInputArgsEntryMeta.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmRTInputArgsEntryMeta.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmRTInputArgsEntryMeta.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmRTInputArgsEntryMeta.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmRTInputArgsTableMeta.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmRTInputArgsTableMeta.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmRTInputArgsTableMeta.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmRTInputArgsTableMeta.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmRTLibraryPathEntryMBean.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmRTLibraryPathEntryMBean.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmRTLibraryPathEntryMBean.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmRTLibraryPathEntryMBean.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmRTLibraryPathEntryMeta.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmRTLibraryPathEntryMeta.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmRTLibraryPathEntryMeta.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmRTLibraryPathEntryMeta.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmRTLibraryPathTableMeta.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmRTLibraryPathTableMeta.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmRTLibraryPathTableMeta.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmRTLibraryPathTableMeta.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmRuntimeMBean.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmRuntimeMBean.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmRuntimeMBean.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmRuntimeMBean.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmRuntimeMeta.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmRuntimeMeta.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmRuntimeMeta.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmRuntimeMeta.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmThreadInstanceEntryMBean.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmThreadInstanceEntryMBean.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmThreadInstanceEntryMBean.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmThreadInstanceEntryMBean.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmThreadInstanceEntryMeta.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmThreadInstanceEntryMeta.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmThreadInstanceEntryMeta.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmThreadInstanceEntryMeta.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmThreadInstanceTableMeta.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmThreadInstanceTableMeta.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmThreadInstanceTableMeta.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmThreadInstanceTableMeta.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmThreadingMBean.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmThreadingMBean.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmThreadingMBean.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmThreadingMBean.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/JvmThreadingMeta.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmThreadingMeta.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/JvmThreadingMeta.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmThreadingMeta.java
diff --git a/jdk/src/share/classes/sun/management/snmp/jvmmib/package.html b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/package.html
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/jvmmib/package.html
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/package.html
diff --git a/jdk/src/share/classes/sun/management/snmp/package.html b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/package.html
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/package.html
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/package.html
diff --git a/jdk/src/share/classes/sun/management/snmp/util/JvmContextFactory.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/util/JvmContextFactory.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/util/JvmContextFactory.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/util/JvmContextFactory.java
diff --git a/jdk/src/share/classes/sun/management/snmp/util/MibLogger.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/util/MibLogger.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/util/MibLogger.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/util/MibLogger.java
diff --git a/jdk/src/share/classes/sun/management/snmp/util/SnmpCachedData.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/util/SnmpCachedData.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/util/SnmpCachedData.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/util/SnmpCachedData.java
diff --git a/jdk/src/share/classes/sun/management/snmp/util/SnmpListTableCache.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/util/SnmpListTableCache.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/util/SnmpListTableCache.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/util/SnmpListTableCache.java
diff --git a/jdk/src/share/classes/sun/management/snmp/util/SnmpLoadedClassData.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/util/SnmpLoadedClassData.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/util/SnmpLoadedClassData.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/util/SnmpLoadedClassData.java
diff --git a/jdk/src/share/classes/sun/management/snmp/util/SnmpNamedListTableCache.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/util/SnmpNamedListTableCache.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/util/SnmpNamedListTableCache.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/util/SnmpNamedListTableCache.java
diff --git a/jdk/src/share/classes/sun/management/snmp/util/SnmpTableCache.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/util/SnmpTableCache.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/util/SnmpTableCache.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/util/SnmpTableCache.java
diff --git a/jdk/src/share/classes/sun/management/snmp/util/SnmpTableHandler.java b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/util/SnmpTableHandler.java
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/util/SnmpTableHandler.java
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/util/SnmpTableHandler.java
diff --git a/jdk/src/share/classes/sun/management/snmp/util/package.html b/jdk/src/jdk.snmp/share/classes/sun/management/snmp/util/package.html
similarity index 100%
rename from jdk/src/share/classes/sun/management/snmp/util/package.html
rename to jdk/src/jdk.snmp/share/classes/sun/management/snmp/util/package.html
diff --git a/jdk/src/share/classes/jdk/nio/zipfs/META-INF/services/java.nio.file.spi.FileSystemProvider b/jdk/src/jdk.zipfs/share/classes/META-INF/services/java.nio.file.spi.FileSystemProvider
similarity index 100%
rename from jdk/src/share/classes/jdk/nio/zipfs/META-INF/services/java.nio.file.spi.FileSystemProvider
rename to jdk/src/jdk.zipfs/share/classes/META-INF/services/java.nio.file.spi.FileSystemProvider
diff --git a/jdk/src/share/classes/jdk/nio/zipfs/JarFileSystemProvider.java b/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystemProvider.java
similarity index 100%
rename from jdk/src/share/classes/jdk/nio/zipfs/JarFileSystemProvider.java
rename to jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystemProvider.java
diff --git a/jdk/src/share/classes/jdk/nio/zipfs/ZipCoder.java b/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipCoder.java
similarity index 100%
rename from jdk/src/share/classes/jdk/nio/zipfs/ZipCoder.java
rename to jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipCoder.java
diff --git a/jdk/src/share/classes/jdk/nio/zipfs/ZipConstants.java b/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipConstants.java
similarity index 100%
rename from jdk/src/share/classes/jdk/nio/zipfs/ZipConstants.java
rename to jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipConstants.java
diff --git a/jdk/src/share/classes/jdk/nio/zipfs/ZipDirectoryStream.java b/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipDirectoryStream.java
similarity index 100%
rename from jdk/src/share/classes/jdk/nio/zipfs/ZipDirectoryStream.java
rename to jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipDirectoryStream.java
diff --git a/jdk/src/share/classes/jdk/nio/zipfs/ZipFileAttributeView.java b/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileAttributeView.java
similarity index 100%
rename from jdk/src/share/classes/jdk/nio/zipfs/ZipFileAttributeView.java
rename to jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileAttributeView.java
diff --git a/jdk/src/share/classes/jdk/nio/zipfs/ZipFileAttributes.java b/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileAttributes.java
similarity index 100%
rename from jdk/src/share/classes/jdk/nio/zipfs/ZipFileAttributes.java
rename to jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileAttributes.java
diff --git a/jdk/src/share/classes/jdk/nio/zipfs/ZipFileStore.java b/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileStore.java
similarity index 100%
rename from jdk/src/share/classes/jdk/nio/zipfs/ZipFileStore.java
rename to jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileStore.java
diff --git a/jdk/src/share/classes/jdk/nio/zipfs/ZipFileSystem.java b/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java
similarity index 100%
rename from jdk/src/share/classes/jdk/nio/zipfs/ZipFileSystem.java
rename to jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java
diff --git a/jdk/src/share/classes/jdk/nio/zipfs/ZipFileSystemProvider.java b/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystemProvider.java
similarity index 100%
rename from jdk/src/share/classes/jdk/nio/zipfs/ZipFileSystemProvider.java
rename to jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystemProvider.java
diff --git a/jdk/src/share/classes/jdk/nio/zipfs/ZipInfo.java b/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipInfo.java
similarity index 100%
rename from jdk/src/share/classes/jdk/nio/zipfs/ZipInfo.java
rename to jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipInfo.java
diff --git a/jdk/src/share/classes/jdk/nio/zipfs/ZipPath.java b/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipPath.java
similarity index 100%
rename from jdk/src/share/classes/jdk/nio/zipfs/ZipPath.java
rename to jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipPath.java
diff --git a/jdk/src/share/classes/jdk/nio/zipfs/ZipUtils.java b/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipUtils.java
similarity index 100%
rename from jdk/src/share/classes/jdk/nio/zipfs/ZipUtils.java
rename to jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipUtils.java
diff --git a/jdk/src/share/sample/README b/jdk/src/sample/share/README
similarity index 100%
rename from jdk/src/share/sample/README
rename to jdk/src/sample/share/README
diff --git a/jdk/src/share/sample/annotations/DependencyChecker/PluginChecker/src/checker/Device.java b/jdk/src/sample/share/annotations/DependencyChecker/PluginChecker/src/checker/Device.java
similarity index 100%
rename from jdk/src/share/sample/annotations/DependencyChecker/PluginChecker/src/checker/Device.java
rename to jdk/src/sample/share/annotations/DependencyChecker/PluginChecker/src/checker/Device.java
diff --git a/jdk/src/share/sample/annotations/DependencyChecker/PluginChecker/src/checker/Kettle.xml b/jdk/src/sample/share/annotations/DependencyChecker/PluginChecker/src/checker/Kettle.xml
similarity index 100%
rename from jdk/src/share/sample/annotations/DependencyChecker/PluginChecker/src/checker/Kettle.xml
rename to jdk/src/sample/share/annotations/DependencyChecker/PluginChecker/src/checker/Kettle.xml
diff --git a/jdk/src/share/sample/annotations/DependencyChecker/PluginChecker/src/checker/Module.java b/jdk/src/sample/share/annotations/DependencyChecker/PluginChecker/src/checker/Module.java
similarity index 100%
rename from jdk/src/share/sample/annotations/DependencyChecker/PluginChecker/src/checker/Module.java
rename to jdk/src/sample/share/annotations/DependencyChecker/PluginChecker/src/checker/Module.java
diff --git a/jdk/src/share/sample/annotations/DependencyChecker/PluginChecker/src/checker/PluginChecker.java b/jdk/src/sample/share/annotations/DependencyChecker/PluginChecker/src/checker/PluginChecker.java
similarity index 100%
rename from jdk/src/share/sample/annotations/DependencyChecker/PluginChecker/src/checker/PluginChecker.java
rename to jdk/src/sample/share/annotations/DependencyChecker/PluginChecker/src/checker/PluginChecker.java
diff --git a/jdk/src/share/sample/annotations/DependencyChecker/PluginChecker/src/checker/Require.java b/jdk/src/sample/share/annotations/DependencyChecker/PluginChecker/src/checker/Require.java
similarity index 100%
rename from jdk/src/share/sample/annotations/DependencyChecker/PluginChecker/src/checker/Require.java
rename to jdk/src/sample/share/annotations/DependencyChecker/PluginChecker/src/checker/Require.java
diff --git a/jdk/src/share/sample/annotations/DependencyChecker/PluginChecker/src/checker/RequireContainer.java b/jdk/src/sample/share/annotations/DependencyChecker/PluginChecker/src/checker/RequireContainer.java
similarity index 100%
rename from jdk/src/share/sample/annotations/DependencyChecker/PluginChecker/src/checker/RequireContainer.java
rename to jdk/src/sample/share/annotations/DependencyChecker/PluginChecker/src/checker/RequireContainer.java
diff --git a/jdk/src/share/sample/annotations/DependencyChecker/Plugins/src/plugins/BoilerPlugin.java b/jdk/src/sample/share/annotations/DependencyChecker/Plugins/src/plugins/BoilerPlugin.java
similarity index 100%
rename from jdk/src/share/sample/annotations/DependencyChecker/Plugins/src/plugins/BoilerPlugin.java
rename to jdk/src/sample/share/annotations/DependencyChecker/Plugins/src/plugins/BoilerPlugin.java
diff --git a/jdk/src/share/sample/annotations/DependencyChecker/Plugins/src/plugins/ExtendedBoilerPlugin.java b/jdk/src/sample/share/annotations/DependencyChecker/Plugins/src/plugins/ExtendedBoilerPlugin.java
similarity index 100%
rename from jdk/src/share/sample/annotations/DependencyChecker/Plugins/src/plugins/ExtendedBoilerPlugin.java
rename to jdk/src/sample/share/annotations/DependencyChecker/Plugins/src/plugins/ExtendedBoilerPlugin.java
diff --git a/jdk/src/share/sample/annotations/DependencyChecker/Plugins/src/plugins/TimerPlugin.java b/jdk/src/sample/share/annotations/DependencyChecker/Plugins/src/plugins/TimerPlugin.java
similarity index 100%
rename from jdk/src/share/sample/annotations/DependencyChecker/Plugins/src/plugins/TimerPlugin.java
rename to jdk/src/sample/share/annotations/DependencyChecker/Plugins/src/plugins/TimerPlugin.java
diff --git a/jdk/src/share/sample/annotations/Validator/src/PositiveIntegerSupplier.java b/jdk/src/sample/share/annotations/Validator/src/PositiveIntegerSupplier.java
similarity index 100%
rename from jdk/src/share/sample/annotations/Validator/src/PositiveIntegerSupplier.java
rename to jdk/src/sample/share/annotations/Validator/src/PositiveIntegerSupplier.java
diff --git a/jdk/src/share/sample/annotations/Validator/src/SupplierValidator.java b/jdk/src/sample/share/annotations/Validator/src/SupplierValidator.java
similarity index 100%
rename from jdk/src/share/sample/annotations/Validator/src/SupplierValidator.java
rename to jdk/src/sample/share/annotations/Validator/src/SupplierValidator.java
diff --git a/jdk/src/share/sample/annotations/Validator/src/Validate.java b/jdk/src/sample/share/annotations/Validator/src/Validate.java
similarity index 100%
rename from jdk/src/share/sample/annotations/Validator/src/Validate.java
rename to jdk/src/sample/share/annotations/Validator/src/Validate.java
diff --git a/jdk/src/share/sample/annotations/Validator/src/Validator.java b/jdk/src/sample/share/annotations/Validator/src/Validator.java
similarity index 100%
rename from jdk/src/share/sample/annotations/Validator/src/Validator.java
rename to jdk/src/sample/share/annotations/Validator/src/Validator.java
diff --git a/jdk/src/share/sample/annotations/index.html b/jdk/src/sample/share/annotations/index.html
similarity index 100%
rename from jdk/src/share/sample/annotations/index.html
rename to jdk/src/sample/share/annotations/index.html
diff --git a/jdk/src/share/sample/forkjoin/mergesort/MergeDemo.java b/jdk/src/sample/share/forkjoin/mergesort/MergeDemo.java
similarity index 100%
rename from jdk/src/share/sample/forkjoin/mergesort/MergeDemo.java
rename to jdk/src/sample/share/forkjoin/mergesort/MergeDemo.java
diff --git a/jdk/src/share/sample/forkjoin/mergesort/MergeSort.java b/jdk/src/sample/share/forkjoin/mergesort/MergeSort.java
similarity index 100%
rename from jdk/src/share/sample/forkjoin/mergesort/MergeSort.java
rename to jdk/src/sample/share/forkjoin/mergesort/MergeSort.java
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/build.properties b/jdk/src/sample/share/jmx/jmx-scandir/build.properties
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/build.properties
rename to jdk/src/sample/share/jmx/jmx-scandir/build.properties
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/build.xml b/jdk/src/sample/share/jmx/jmx-scandir/build.xml
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/build.xml
rename to jdk/src/sample/share/jmx/jmx-scandir/build.xml
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/docfiles/connect-local-ant-run.jpg b/jdk/src/sample/share/jmx/jmx-scandir/docfiles/connect-local-ant-run.jpg
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/docfiles/connect-local-ant-run.jpg
rename to jdk/src/sample/share/jmx/jmx-scandir/docfiles/connect-local-ant-run.jpg
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/docfiles/connect-local-java-jar.jpg b/jdk/src/sample/share/jmx/jmx-scandir/docfiles/connect-local-java-jar.jpg
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/docfiles/connect-local-java-jar.jpg
rename to jdk/src/sample/share/jmx/jmx-scandir/docfiles/connect-local-java-jar.jpg
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/docfiles/connect-local.jpg b/jdk/src/sample/share/jmx/jmx-scandir/docfiles/connect-local.jpg
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/docfiles/connect-local.jpg
rename to jdk/src/sample/share/jmx/jmx-scandir/docfiles/connect-local.jpg
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/docfiles/remote-connection-failed.jpg b/jdk/src/sample/share/jmx/jmx-scandir/docfiles/remote-connection-failed.jpg
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/docfiles/remote-connection-failed.jpg
rename to jdk/src/sample/share/jmx/jmx-scandir/docfiles/remote-connection-failed.jpg
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/docfiles/remote-connection.jpg b/jdk/src/sample/share/jmx/jmx-scandir/docfiles/remote-connection.jpg
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/docfiles/remote-connection.jpg
rename to jdk/src/sample/share/jmx/jmx-scandir/docfiles/remote-connection.jpg
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/docfiles/scandir-config.jpg b/jdk/src/sample/share/jmx/jmx-scandir/docfiles/scandir-config.jpg
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/docfiles/scandir-config.jpg
rename to jdk/src/sample/share/jmx/jmx-scandir/docfiles/scandir-config.jpg
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/docfiles/scandir-result.jpg b/jdk/src/sample/share/jmx/jmx-scandir/docfiles/scandir-result.jpg
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/docfiles/scandir-result.jpg
rename to jdk/src/sample/share/jmx/jmx-scandir/docfiles/scandir-result.jpg
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/docfiles/scandir-start.jpg b/jdk/src/sample/share/jmx/jmx-scandir/docfiles/scandir-start.jpg
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/docfiles/scandir-start.jpg
rename to jdk/src/sample/share/jmx/jmx-scandir/docfiles/scandir-start.jpg
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/index.html b/jdk/src/sample/share/jmx/jmx-scandir/index.html
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/index.html
rename to jdk/src/sample/share/jmx/jmx-scandir/index.html
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/keystore b/jdk/src/sample/share/jmx/jmx-scandir/keystore
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/keystore
rename to jdk/src/sample/share/jmx/jmx-scandir/keystore
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/logging.properties b/jdk/src/sample/share/jmx/jmx-scandir/logging.properties
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/logging.properties
rename to jdk/src/sample/share/jmx/jmx-scandir/logging.properties
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/manifest.mf b/jdk/src/sample/share/jmx/jmx-scandir/manifest.mf
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/manifest.mf
rename to jdk/src/sample/share/jmx/jmx-scandir/manifest.mf
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/nbproject/file-targets.xml b/jdk/src/sample/share/jmx/jmx-scandir/nbproject/file-targets.xml
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/nbproject/file-targets.xml
rename to jdk/src/sample/share/jmx/jmx-scandir/nbproject/file-targets.xml
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/nbproject/jdk.xml b/jdk/src/sample/share/jmx/jmx-scandir/nbproject/jdk.xml
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/nbproject/jdk.xml
rename to jdk/src/sample/share/jmx/jmx-scandir/nbproject/jdk.xml
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/nbproject/netbeans-targets.xml b/jdk/src/sample/share/jmx/jmx-scandir/nbproject/netbeans-targets.xml
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/nbproject/netbeans-targets.xml
rename to jdk/src/sample/share/jmx/jmx-scandir/nbproject/netbeans-targets.xml
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/nbproject/project.xml b/jdk/src/sample/share/jmx/jmx-scandir/nbproject/project.xml
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/nbproject/project.xml
rename to jdk/src/sample/share/jmx/jmx-scandir/nbproject/project.xml
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/DirectoryScanner.java b/jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/DirectoryScanner.java
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/DirectoryScanner.java
rename to jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/DirectoryScanner.java
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/DirectoryScannerMXBean.java b/jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/DirectoryScannerMXBean.java
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/DirectoryScannerMXBean.java
rename to jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/DirectoryScannerMXBean.java
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ResultLogManager.java b/jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ResultLogManager.java
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ResultLogManager.java
rename to jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ResultLogManager.java
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ResultLogManagerMXBean.java b/jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ResultLogManagerMXBean.java
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ResultLogManagerMXBean.java
rename to jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ResultLogManagerMXBean.java
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirAgent.java b/jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirAgent.java
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirAgent.java
rename to jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirAgent.java
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirClient.java b/jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirClient.java
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirClient.java
rename to jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirClient.java
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirConfig.java b/jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirConfig.java
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirConfig.java
rename to jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirConfig.java
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirConfigMXBean.java b/jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirConfigMXBean.java
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirConfigMXBean.java
rename to jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirConfigMXBean.java
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanManager.java b/jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanManager.java
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanManager.java
rename to jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanManager.java
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanManagerMXBean.java b/jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanManagerMXBean.java
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanManagerMXBean.java
rename to jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanManagerMXBean.java
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/DirectoryScannerConfig.java b/jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/DirectoryScannerConfig.java
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/DirectoryScannerConfig.java
rename to jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/DirectoryScannerConfig.java
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/FileMatch.java b/jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/FileMatch.java
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/FileMatch.java
rename to jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/FileMatch.java
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/ResultLogConfig.java b/jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/ResultLogConfig.java
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/ResultLogConfig.java
rename to jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/ResultLogConfig.java
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/ResultRecord.java b/jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/ResultRecord.java
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/ResultRecord.java
rename to jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/ResultRecord.java
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/ScanManagerConfig.java b/jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/ScanManagerConfig.java
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/ScanManagerConfig.java
rename to jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/ScanManagerConfig.java
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/XmlConfigUtils.java b/jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/XmlConfigUtils.java
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/XmlConfigUtils.java
rename to jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/XmlConfigUtils.java
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/package.html b/jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/package.html
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/package.html
rename to jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/package.html
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/package.html b/jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/package.html
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/package.html
rename to jdk/src/sample/share/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/package.html
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/src/etc/access.properties b/jdk/src/sample/share/jmx/jmx-scandir/src/etc/access.properties
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/src/etc/access.properties
rename to jdk/src/sample/share/jmx/jmx-scandir/src/etc/access.properties
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/src/etc/management.properties b/jdk/src/sample/share/jmx/jmx-scandir/src/etc/management.properties
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/src/etc/management.properties
rename to jdk/src/sample/share/jmx/jmx-scandir/src/etc/management.properties
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/src/etc/password.properties b/jdk/src/sample/share/jmx/jmx-scandir/src/etc/password.properties
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/src/etc/password.properties
rename to jdk/src/sample/share/jmx/jmx-scandir/src/etc/password.properties
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/src/etc/testconfig.xml b/jdk/src/sample/share/jmx/jmx-scandir/src/etc/testconfig.xml
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/src/etc/testconfig.xml
rename to jdk/src/sample/share/jmx/jmx-scandir/src/etc/testconfig.xml
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/DirectoryScannerTest.java b/jdk/src/sample/share/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/DirectoryScannerTest.java
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/DirectoryScannerTest.java
rename to jdk/src/sample/share/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/DirectoryScannerTest.java
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/ScanDirConfigTest.java b/jdk/src/sample/share/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/ScanDirConfigTest.java
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/ScanDirConfigTest.java
rename to jdk/src/sample/share/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/ScanDirConfigTest.java
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/ScanManagerTest.java b/jdk/src/sample/share/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/ScanManagerTest.java
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/ScanManagerTest.java
rename to jdk/src/sample/share/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/ScanManagerTest.java
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/TestUtils.java b/jdk/src/sample/share/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/TestUtils.java
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/TestUtils.java
rename to jdk/src/sample/share/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/TestUtils.java
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/config/XmlConfigUtilsTest.java b/jdk/src/sample/share/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/config/XmlConfigUtilsTest.java
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/config/XmlConfigUtilsTest.java
rename to jdk/src/sample/share/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/config/XmlConfigUtilsTest.java
diff --git a/jdk/src/share/sample/jmx/jmx-scandir/truststore b/jdk/src/sample/share/jmx/jmx-scandir/truststore
similarity index 100%
rename from jdk/src/share/sample/jmx/jmx-scandir/truststore
rename to jdk/src/sample/share/jmx/jmx-scandir/truststore
diff --git a/jdk/src/share/sample/lambda/BulkDataOperations/index.html b/jdk/src/sample/share/lambda/BulkDataOperations/index.html
similarity index 100%
rename from jdk/src/share/sample/lambda/BulkDataOperations/index.html
rename to jdk/src/sample/share/lambda/BulkDataOperations/index.html
diff --git a/jdk/src/share/sample/lambda/BulkDataOperations/src/CSVProcessor.java b/jdk/src/sample/share/lambda/BulkDataOperations/src/CSVProcessor.java
similarity index 100%
rename from jdk/src/share/sample/lambda/BulkDataOperations/src/CSVProcessor.java
rename to jdk/src/sample/share/lambda/BulkDataOperations/src/CSVProcessor.java
diff --git a/jdk/src/share/sample/lambda/BulkDataOperations/src/Grep.java b/jdk/src/sample/share/lambda/BulkDataOperations/src/Grep.java
similarity index 100%
rename from jdk/src/share/sample/lambda/BulkDataOperations/src/Grep.java
rename to jdk/src/sample/share/lambda/BulkDataOperations/src/Grep.java
diff --git a/jdk/src/share/sample/lambda/BulkDataOperations/src/PasswordGenerator.java b/jdk/src/sample/share/lambda/BulkDataOperations/src/PasswordGenerator.java
similarity index 100%
rename from jdk/src/share/sample/lambda/BulkDataOperations/src/PasswordGenerator.java
rename to jdk/src/sample/share/lambda/BulkDataOperations/src/PasswordGenerator.java
diff --git a/jdk/src/share/sample/lambda/BulkDataOperations/src/WC.java b/jdk/src/sample/share/lambda/BulkDataOperations/src/WC.java
similarity index 100%
rename from jdk/src/share/sample/lambda/BulkDataOperations/src/WC.java
rename to jdk/src/sample/share/lambda/BulkDataOperations/src/WC.java
diff --git a/jdk/src/share/sample/lambda/DefaultMethods/ArrayIterator.java b/jdk/src/sample/share/lambda/DefaultMethods/ArrayIterator.java
similarity index 100%
rename from jdk/src/share/sample/lambda/DefaultMethods/ArrayIterator.java
rename to jdk/src/sample/share/lambda/DefaultMethods/ArrayIterator.java
diff --git a/jdk/src/share/sample/lambda/DefaultMethods/DiamondInheritance.java b/jdk/src/sample/share/lambda/DefaultMethods/DiamondInheritance.java
similarity index 100%
rename from jdk/src/share/sample/lambda/DefaultMethods/DiamondInheritance.java
rename to jdk/src/sample/share/lambda/DefaultMethods/DiamondInheritance.java
diff --git a/jdk/src/share/sample/lambda/DefaultMethods/Inheritance.java b/jdk/src/sample/share/lambda/DefaultMethods/Inheritance.java
similarity index 100%
rename from jdk/src/share/sample/lambda/DefaultMethods/Inheritance.java
rename to jdk/src/sample/share/lambda/DefaultMethods/Inheritance.java
diff --git a/jdk/src/share/sample/lambda/DefaultMethods/MixIn.java b/jdk/src/sample/share/lambda/DefaultMethods/MixIn.java
similarity index 100%
rename from jdk/src/share/sample/lambda/DefaultMethods/MixIn.java
rename to jdk/src/sample/share/lambda/DefaultMethods/MixIn.java
diff --git a/jdk/src/share/sample/lambda/DefaultMethods/Reflection.java b/jdk/src/sample/share/lambda/DefaultMethods/Reflection.java
similarity index 100%
rename from jdk/src/share/sample/lambda/DefaultMethods/Reflection.java
rename to jdk/src/sample/share/lambda/DefaultMethods/Reflection.java
diff --git a/jdk/src/share/sample/lambda/DefaultMethods/SimplestUsage.java b/jdk/src/sample/share/lambda/DefaultMethods/SimplestUsage.java
similarity index 100%
rename from jdk/src/share/sample/lambda/DefaultMethods/SimplestUsage.java
rename to jdk/src/sample/share/lambda/DefaultMethods/SimplestUsage.java
diff --git a/jdk/src/share/sample/nbproject/project.xml b/jdk/src/sample/share/nbproject/project.xml
similarity index 100%
rename from jdk/src/share/sample/nbproject/project.xml
rename to jdk/src/sample/share/nbproject/project.xml
diff --git a/jdk/src/share/sample/nio/chatserver/ChatServer.java b/jdk/src/sample/share/nio/chatserver/ChatServer.java
similarity index 100%
rename from jdk/src/share/sample/nio/chatserver/ChatServer.java
rename to jdk/src/sample/share/nio/chatserver/ChatServer.java
diff --git a/jdk/src/share/sample/nio/chatserver/Client.java b/jdk/src/sample/share/nio/chatserver/Client.java
similarity index 100%
rename from jdk/src/share/sample/nio/chatserver/Client.java
rename to jdk/src/sample/share/nio/chatserver/Client.java
diff --git a/jdk/src/share/sample/nio/chatserver/ClientReader.java b/jdk/src/sample/share/nio/chatserver/ClientReader.java
similarity index 100%
rename from jdk/src/share/sample/nio/chatserver/ClientReader.java
rename to jdk/src/sample/share/nio/chatserver/ClientReader.java
diff --git a/jdk/src/share/sample/nio/chatserver/DataReader.java b/jdk/src/sample/share/nio/chatserver/DataReader.java
similarity index 100%
rename from jdk/src/share/sample/nio/chatserver/DataReader.java
rename to jdk/src/sample/share/nio/chatserver/DataReader.java
diff --git a/jdk/src/share/sample/nio/chatserver/MessageReader.java b/jdk/src/sample/share/nio/chatserver/MessageReader.java
similarity index 100%
rename from jdk/src/share/sample/nio/chatserver/MessageReader.java
rename to jdk/src/sample/share/nio/chatserver/MessageReader.java
diff --git a/jdk/src/share/sample/nio/chatserver/NameReader.java b/jdk/src/sample/share/nio/chatserver/NameReader.java
similarity index 100%
rename from jdk/src/share/sample/nio/chatserver/NameReader.java
rename to jdk/src/sample/share/nio/chatserver/NameReader.java
diff --git a/jdk/src/share/sample/nio/chatserver/README.txt b/jdk/src/sample/share/nio/chatserver/README.txt
similarity index 100%
rename from jdk/src/share/sample/nio/chatserver/README.txt
rename to jdk/src/sample/share/nio/chatserver/README.txt
diff --git a/jdk/src/share/sample/nio/file/AclEdit.java b/jdk/src/sample/share/nio/file/AclEdit.java
similarity index 100%
rename from jdk/src/share/sample/nio/file/AclEdit.java
rename to jdk/src/sample/share/nio/file/AclEdit.java
diff --git a/jdk/src/share/sample/nio/file/Chmod.java b/jdk/src/sample/share/nio/file/Chmod.java
similarity index 100%
rename from jdk/src/share/sample/nio/file/Chmod.java
rename to jdk/src/sample/share/nio/file/Chmod.java
diff --git a/jdk/src/share/sample/nio/file/Copy.java b/jdk/src/sample/share/nio/file/Copy.java
similarity index 100%
rename from jdk/src/share/sample/nio/file/Copy.java
rename to jdk/src/sample/share/nio/file/Copy.java
diff --git a/jdk/src/share/sample/nio/file/DiskUsage.java b/jdk/src/sample/share/nio/file/DiskUsage.java
similarity index 100%
rename from jdk/src/share/sample/nio/file/DiskUsage.java
rename to jdk/src/sample/share/nio/file/DiskUsage.java
diff --git a/jdk/src/share/sample/nio/file/FileType.java b/jdk/src/sample/share/nio/file/FileType.java
similarity index 100%
rename from jdk/src/share/sample/nio/file/FileType.java
rename to jdk/src/sample/share/nio/file/FileType.java
diff --git a/jdk/src/share/sample/nio/file/WatchDir.java b/jdk/src/sample/share/nio/file/WatchDir.java
similarity index 100%
rename from jdk/src/share/sample/nio/file/WatchDir.java
rename to jdk/src/sample/share/nio/file/WatchDir.java
diff --git a/jdk/src/share/sample/nio/file/Xdd.java b/jdk/src/sample/share/nio/file/Xdd.java
similarity index 100%
rename from jdk/src/share/sample/nio/file/Xdd.java
rename to jdk/src/sample/share/nio/file/Xdd.java
diff --git a/jdk/src/share/sample/nio/multicast/MulticastAddress.java b/jdk/src/sample/share/nio/multicast/MulticastAddress.java
similarity index 100%
rename from jdk/src/share/sample/nio/multicast/MulticastAddress.java
rename to jdk/src/sample/share/nio/multicast/MulticastAddress.java
diff --git a/jdk/src/share/sample/nio/multicast/Reader.java b/jdk/src/sample/share/nio/multicast/Reader.java
similarity index 100%
rename from jdk/src/share/sample/nio/multicast/Reader.java
rename to jdk/src/sample/share/nio/multicast/Reader.java
diff --git a/jdk/src/share/sample/nio/multicast/Sender.java b/jdk/src/sample/share/nio/multicast/Sender.java
similarity index 100%
rename from jdk/src/share/sample/nio/multicast/Sender.java
rename to jdk/src/sample/share/nio/multicast/Sender.java
diff --git a/jdk/src/share/sample/nio/server/AcceptHandler.java b/jdk/src/sample/share/nio/server/AcceptHandler.java
similarity index 100%
rename from jdk/src/share/sample/nio/server/AcceptHandler.java
rename to jdk/src/sample/share/nio/server/AcceptHandler.java
diff --git a/jdk/src/share/sample/nio/server/Acceptor.java b/jdk/src/sample/share/nio/server/Acceptor.java
similarity index 100%
rename from jdk/src/share/sample/nio/server/Acceptor.java
rename to jdk/src/sample/share/nio/server/Acceptor.java
diff --git a/jdk/src/share/sample/nio/server/B1.java b/jdk/src/sample/share/nio/server/B1.java
similarity index 100%
rename from jdk/src/share/sample/nio/server/B1.java
rename to jdk/src/sample/share/nio/server/B1.java
diff --git a/jdk/src/share/sample/nio/server/BN.java b/jdk/src/sample/share/nio/server/BN.java
similarity index 100%
rename from jdk/src/share/sample/nio/server/BN.java
rename to jdk/src/sample/share/nio/server/BN.java
diff --git a/jdk/src/share/sample/nio/server/BP.java b/jdk/src/sample/share/nio/server/BP.java
similarity index 100%
rename from jdk/src/share/sample/nio/server/BP.java
rename to jdk/src/sample/share/nio/server/BP.java
diff --git a/jdk/src/share/sample/nio/server/ChannelIO.java b/jdk/src/sample/share/nio/server/ChannelIO.java
similarity index 100%
rename from jdk/src/share/sample/nio/server/ChannelIO.java
rename to jdk/src/sample/share/nio/server/ChannelIO.java
diff --git a/jdk/src/share/sample/nio/server/ChannelIOSecure.java b/jdk/src/sample/share/nio/server/ChannelIOSecure.java
similarity index 100%
rename from jdk/src/share/sample/nio/server/ChannelIOSecure.java
rename to jdk/src/sample/share/nio/server/ChannelIOSecure.java
diff --git a/jdk/src/share/sample/nio/server/Content.java b/jdk/src/sample/share/nio/server/Content.java
similarity index 100%
rename from jdk/src/share/sample/nio/server/Content.java
rename to jdk/src/sample/share/nio/server/Content.java
diff --git a/jdk/src/share/sample/nio/server/Dispatcher.java b/jdk/src/sample/share/nio/server/Dispatcher.java
similarity index 100%
rename from jdk/src/share/sample/nio/server/Dispatcher.java
rename to jdk/src/sample/share/nio/server/Dispatcher.java
diff --git a/jdk/src/share/sample/nio/server/Dispatcher1.java b/jdk/src/sample/share/nio/server/Dispatcher1.java
similarity index 100%
rename from jdk/src/share/sample/nio/server/Dispatcher1.java
rename to jdk/src/sample/share/nio/server/Dispatcher1.java
diff --git a/jdk/src/share/sample/nio/server/DispatcherN.java b/jdk/src/sample/share/nio/server/DispatcherN.java
similarity index 100%
rename from jdk/src/share/sample/nio/server/DispatcherN.java
rename to jdk/src/sample/share/nio/server/DispatcherN.java
diff --git a/jdk/src/share/sample/nio/server/FileContent.java b/jdk/src/sample/share/nio/server/FileContent.java
similarity index 100%
rename from jdk/src/share/sample/nio/server/FileContent.java
rename to jdk/src/sample/share/nio/server/FileContent.java
diff --git a/jdk/src/share/sample/nio/server/Handler.java b/jdk/src/sample/share/nio/server/Handler.java
similarity index 100%
rename from jdk/src/share/sample/nio/server/Handler.java
rename to jdk/src/sample/share/nio/server/Handler.java
diff --git a/jdk/src/share/sample/nio/server/MalformedRequestException.java b/jdk/src/sample/share/nio/server/MalformedRequestException.java
similarity index 100%
rename from jdk/src/share/sample/nio/server/MalformedRequestException.java
rename to jdk/src/sample/share/nio/server/MalformedRequestException.java
diff --git a/jdk/src/share/sample/nio/server/N1.java b/jdk/src/sample/share/nio/server/N1.java
similarity index 100%
rename from jdk/src/share/sample/nio/server/N1.java
rename to jdk/src/sample/share/nio/server/N1.java
diff --git a/jdk/src/share/sample/nio/server/N2.java b/jdk/src/sample/share/nio/server/N2.java
similarity index 100%
rename from jdk/src/share/sample/nio/server/N2.java
rename to jdk/src/sample/share/nio/server/N2.java
diff --git a/jdk/src/share/sample/nio/server/README.txt b/jdk/src/sample/share/nio/server/README.txt
similarity index 100%
rename from jdk/src/share/sample/nio/server/README.txt
rename to jdk/src/sample/share/nio/server/README.txt
diff --git a/jdk/src/share/sample/nio/server/Reply.java b/jdk/src/sample/share/nio/server/Reply.java
similarity index 100%
rename from jdk/src/share/sample/nio/server/Reply.java
rename to jdk/src/sample/share/nio/server/Reply.java
diff --git a/jdk/src/share/sample/nio/server/Request.java b/jdk/src/sample/share/nio/server/Request.java
similarity index 100%
rename from jdk/src/share/sample/nio/server/Request.java
rename to jdk/src/sample/share/nio/server/Request.java
diff --git a/jdk/src/share/sample/nio/server/RequestHandler.java b/jdk/src/sample/share/nio/server/RequestHandler.java
similarity index 100%
rename from jdk/src/share/sample/nio/server/RequestHandler.java
rename to jdk/src/sample/share/nio/server/RequestHandler.java
diff --git a/jdk/src/share/sample/nio/server/RequestServicer.java b/jdk/src/sample/share/nio/server/RequestServicer.java
similarity index 100%
rename from jdk/src/share/sample/nio/server/RequestServicer.java
rename to jdk/src/sample/share/nio/server/RequestServicer.java
diff --git a/jdk/src/share/sample/nio/server/Sendable.java b/jdk/src/sample/share/nio/server/Sendable.java
similarity index 100%
rename from jdk/src/share/sample/nio/server/Sendable.java
rename to jdk/src/sample/share/nio/server/Sendable.java
diff --git a/jdk/src/share/sample/nio/server/Server.java b/jdk/src/sample/share/nio/server/Server.java
similarity index 100%
rename from jdk/src/share/sample/nio/server/Server.java
rename to jdk/src/sample/share/nio/server/Server.java
diff --git a/jdk/src/share/sample/nio/server/StringContent.java b/jdk/src/sample/share/nio/server/StringContent.java
similarity index 100%
rename from jdk/src/share/sample/nio/server/StringContent.java
rename to jdk/src/sample/share/nio/server/StringContent.java
diff --git a/jdk/src/share/sample/nio/server/URLDumper.java b/jdk/src/sample/share/nio/server/URLDumper.java
similarity index 100%
rename from jdk/src/share/sample/nio/server/URLDumper.java
rename to jdk/src/sample/share/nio/server/URLDumper.java
diff --git a/jdk/src/share/sample/scripting/scriptpad/README.txt b/jdk/src/sample/share/scripting/scriptpad/README.txt
similarity index 100%
rename from jdk/src/share/sample/scripting/scriptpad/README.txt
rename to jdk/src/sample/share/scripting/scriptpad/README.txt
diff --git a/jdk/src/share/sample/scripting/scriptpad/build.properties b/jdk/src/sample/share/scripting/scriptpad/build.properties
similarity index 100%
rename from jdk/src/share/sample/scripting/scriptpad/build.properties
rename to jdk/src/sample/share/scripting/scriptpad/build.properties
diff --git a/jdk/src/share/sample/scripting/scriptpad/build.xml b/jdk/src/sample/share/scripting/scriptpad/build.xml
similarity index 100%
rename from jdk/src/share/sample/scripting/scriptpad/build.xml
rename to jdk/src/sample/share/scripting/scriptpad/build.xml
diff --git a/jdk/src/share/sample/scripting/scriptpad/nbproject/file-targets.xml b/jdk/src/sample/share/scripting/scriptpad/nbproject/file-targets.xml
similarity index 100%
rename from jdk/src/share/sample/scripting/scriptpad/nbproject/file-targets.xml
rename to jdk/src/sample/share/scripting/scriptpad/nbproject/file-targets.xml
diff --git a/jdk/src/share/sample/scripting/scriptpad/nbproject/jdk.xml b/jdk/src/sample/share/scripting/scriptpad/nbproject/jdk.xml
similarity index 100%
rename from jdk/src/share/sample/scripting/scriptpad/nbproject/jdk.xml
rename to jdk/src/sample/share/scripting/scriptpad/nbproject/jdk.xml
diff --git a/jdk/src/share/sample/scripting/scriptpad/nbproject/netbeans-targets.xml b/jdk/src/sample/share/scripting/scriptpad/nbproject/netbeans-targets.xml
similarity index 100%
rename from jdk/src/share/sample/scripting/scriptpad/nbproject/netbeans-targets.xml
rename to jdk/src/sample/share/scripting/scriptpad/nbproject/netbeans-targets.xml
diff --git a/jdk/src/share/sample/scripting/scriptpad/nbproject/project.xml b/jdk/src/sample/share/scripting/scriptpad/nbproject/project.xml
similarity index 100%
rename from jdk/src/share/sample/scripting/scriptpad/nbproject/project.xml
rename to jdk/src/sample/share/scripting/scriptpad/nbproject/project.xml
diff --git a/jdk/src/share/sample/scripting/scriptpad/src/META-INF/manifest.mf b/jdk/src/sample/share/scripting/scriptpad/src/META-INF/manifest.mf
similarity index 100%
rename from jdk/src/share/sample/scripting/scriptpad/src/META-INF/manifest.mf
rename to jdk/src/sample/share/scripting/scriptpad/src/META-INF/manifest.mf
diff --git a/jdk/src/share/sample/scripting/scriptpad/src/com/sun/sample/scriptpad/Main.java b/jdk/src/sample/share/scripting/scriptpad/src/com/sun/sample/scriptpad/Main.java
similarity index 100%
rename from jdk/src/share/sample/scripting/scriptpad/src/com/sun/sample/scriptpad/Main.java
rename to jdk/src/sample/share/scripting/scriptpad/src/com/sun/sample/scriptpad/Main.java
diff --git a/jdk/src/share/sample/scripting/scriptpad/src/resources/Main.js b/jdk/src/sample/share/scripting/scriptpad/src/resources/Main.js
similarity index 100%
rename from jdk/src/share/sample/scripting/scriptpad/src/resources/Main.js
rename to jdk/src/sample/share/scripting/scriptpad/src/resources/Main.js
diff --git a/jdk/src/share/sample/scripting/scriptpad/src/resources/conc.js b/jdk/src/sample/share/scripting/scriptpad/src/resources/conc.js
similarity index 100%
rename from jdk/src/share/sample/scripting/scriptpad/src/resources/conc.js
rename to jdk/src/sample/share/scripting/scriptpad/src/resources/conc.js
diff --git a/jdk/src/share/sample/scripting/scriptpad/src/resources/gui.js b/jdk/src/sample/share/scripting/scriptpad/src/resources/gui.js
similarity index 100%
rename from jdk/src/share/sample/scripting/scriptpad/src/resources/gui.js
rename to jdk/src/sample/share/scripting/scriptpad/src/resources/gui.js
diff --git a/jdk/src/share/sample/scripting/scriptpad/src/resources/mm.js b/jdk/src/sample/share/scripting/scriptpad/src/resources/mm.js
similarity index 100%
rename from jdk/src/share/sample/scripting/scriptpad/src/resources/mm.js
rename to jdk/src/sample/share/scripting/scriptpad/src/resources/mm.js
diff --git a/jdk/src/share/sample/scripting/scriptpad/src/resources/scriptpad.js b/jdk/src/sample/share/scripting/scriptpad/src/resources/scriptpad.js
similarity index 100%
rename from jdk/src/share/sample/scripting/scriptpad/src/resources/scriptpad.js
rename to jdk/src/sample/share/scripting/scriptpad/src/resources/scriptpad.js
diff --git a/jdk/src/share/sample/scripting/scriptpad/src/scripts/README.txt b/jdk/src/sample/share/scripting/scriptpad/src/scripts/README.txt
similarity index 100%
rename from jdk/src/share/sample/scripting/scriptpad/src/scripts/README.txt
rename to jdk/src/sample/share/scripting/scriptpad/src/scripts/README.txt
diff --git a/jdk/src/share/sample/scripting/scriptpad/src/scripts/browse.js b/jdk/src/sample/share/scripting/scriptpad/src/scripts/browse.js
similarity index 100%
rename from jdk/src/share/sample/scripting/scriptpad/src/scripts/browse.js
rename to jdk/src/sample/share/scripting/scriptpad/src/scripts/browse.js
diff --git a/jdk/src/share/sample/scripting/scriptpad/src/scripts/insertfile.js b/jdk/src/sample/share/scripting/scriptpad/src/scripts/insertfile.js
similarity index 100%
rename from jdk/src/share/sample/scripting/scriptpad/src/scripts/insertfile.js
rename to jdk/src/sample/share/scripting/scriptpad/src/scripts/insertfile.js
diff --git a/jdk/src/share/sample/scripting/scriptpad/src/scripts/linewrap.js b/jdk/src/sample/share/scripting/scriptpad/src/scripts/linewrap.js
similarity index 100%
rename from jdk/src/share/sample/scripting/scriptpad/src/scripts/linewrap.js
rename to jdk/src/sample/share/scripting/scriptpad/src/scripts/linewrap.js
diff --git a/jdk/src/share/sample/scripting/scriptpad/src/scripts/mail.js b/jdk/src/sample/share/scripting/scriptpad/src/scripts/mail.js
similarity index 100%
rename from jdk/src/share/sample/scripting/scriptpad/src/scripts/mail.js
rename to jdk/src/sample/share/scripting/scriptpad/src/scripts/mail.js
diff --git a/jdk/src/share/sample/scripting/scriptpad/src/scripts/memmonitor.js b/jdk/src/sample/share/scripting/scriptpad/src/scripts/memmonitor.js
similarity index 100%
rename from jdk/src/share/sample/scripting/scriptpad/src/scripts/memmonitor.js
rename to jdk/src/sample/share/scripting/scriptpad/src/scripts/memmonitor.js
diff --git a/jdk/src/share/sample/scripting/scriptpad/src/scripts/memory.bat b/jdk/src/sample/share/scripting/scriptpad/src/scripts/memory.bat
similarity index 100%
rename from jdk/src/share/sample/scripting/scriptpad/src/scripts/memory.bat
rename to jdk/src/sample/share/scripting/scriptpad/src/scripts/memory.bat
diff --git a/jdk/src/share/sample/scripting/scriptpad/src/scripts/memory.js b/jdk/src/sample/share/scripting/scriptpad/src/scripts/memory.js
similarity index 100%
rename from jdk/src/share/sample/scripting/scriptpad/src/scripts/memory.js
rename to jdk/src/sample/share/scripting/scriptpad/src/scripts/memory.js
diff --git a/jdk/src/share/sample/scripting/scriptpad/src/scripts/memory.sh b/jdk/src/sample/share/scripting/scriptpad/src/scripts/memory.sh
similarity index 100%
rename from jdk/src/share/sample/scripting/scriptpad/src/scripts/memory.sh
rename to jdk/src/sample/share/scripting/scriptpad/src/scripts/memory.sh
diff --git a/jdk/src/share/sample/scripting/scriptpad/src/scripts/textcolor.js b/jdk/src/sample/share/scripting/scriptpad/src/scripts/textcolor.js
similarity index 100%
rename from jdk/src/share/sample/scripting/scriptpad/src/scripts/textcolor.js
rename to jdk/src/sample/share/scripting/scriptpad/src/scripts/textcolor.js
diff --git a/jdk/src/share/sample/try-with-resources/index.html b/jdk/src/sample/share/try-with-resources/index.html
similarity index 100%
rename from jdk/src/share/sample/try-with-resources/index.html
rename to jdk/src/sample/share/try-with-resources/index.html
diff --git a/jdk/src/share/sample/try-with-resources/src/CustomAutoCloseableSample.java b/jdk/src/sample/share/try-with-resources/src/CustomAutoCloseableSample.java
similarity index 100%
rename from jdk/src/share/sample/try-with-resources/src/CustomAutoCloseableSample.java
rename to jdk/src/sample/share/try-with-resources/src/CustomAutoCloseableSample.java
diff --git a/jdk/src/share/sample/try-with-resources/src/Unzip.java b/jdk/src/sample/share/try-with-resources/src/Unzip.java
similarity index 100%
rename from jdk/src/share/sample/try-with-resources/src/Unzip.java
rename to jdk/src/sample/share/try-with-resources/src/Unzip.java
diff --git a/jdk/src/share/sample/try-with-resources/src/ZipCat.java b/jdk/src/sample/share/try-with-resources/src/ZipCat.java
similarity index 100%
rename from jdk/src/share/sample/try-with-resources/src/ZipCat.java
rename to jdk/src/sample/share/try-with-resources/src/ZipCat.java
diff --git a/jdk/src/share/sample/vm/clr-jvm/Makefile b/jdk/src/sample/share/vm/clr-jvm/Makefile
similarity index 100%
rename from jdk/src/share/sample/vm/clr-jvm/Makefile
rename to jdk/src/sample/share/vm/clr-jvm/Makefile
diff --git a/jdk/src/share/sample/vm/clr-jvm/README.txt b/jdk/src/sample/share/vm/clr-jvm/README.txt
similarity index 100%
rename from jdk/src/share/sample/vm/clr-jvm/README.txt
rename to jdk/src/sample/share/vm/clr-jvm/README.txt
diff --git a/jdk/src/share/sample/vm/clr-jvm/invoked.java b/jdk/src/sample/share/vm/clr-jvm/invoked.java
similarity index 100%
rename from jdk/src/share/sample/vm/clr-jvm/invoked.java
rename to jdk/src/sample/share/vm/clr-jvm/invoked.java
diff --git a/jdk/src/share/sample/vm/clr-jvm/invoker.cs b/jdk/src/sample/share/vm/clr-jvm/invoker.cs
similarity index 100%
rename from jdk/src/share/sample/vm/clr-jvm/invoker.cs
rename to jdk/src/sample/share/vm/clr-jvm/invoker.cs
diff --git a/jdk/src/share/sample/vm/clr-jvm/jinvoker.cpp b/jdk/src/sample/share/vm/clr-jvm/jinvoker.cpp
similarity index 100%
rename from jdk/src/share/sample/vm/clr-jvm/jinvoker.cpp
rename to jdk/src/sample/share/vm/clr-jvm/jinvoker.cpp
diff --git a/jdk/src/share/sample/vm/clr-jvm/jinvokerExp.h b/jdk/src/sample/share/vm/clr-jvm/jinvokerExp.h
similarity index 100%
rename from jdk/src/share/sample/vm/clr-jvm/jinvokerExp.h
rename to jdk/src/sample/share/vm/clr-jvm/jinvokerExp.h
diff --git a/jdk/src/share/sample/vm/jvm-clr/Makefile b/jdk/src/sample/share/vm/jvm-clr/Makefile
similarity index 100%
rename from jdk/src/share/sample/vm/jvm-clr/Makefile
rename to jdk/src/sample/share/vm/jvm-clr/Makefile
diff --git a/jdk/src/share/sample/vm/jvm-clr/README.txt b/jdk/src/sample/share/vm/jvm-clr/README.txt
similarity index 100%
rename from jdk/src/share/sample/vm/jvm-clr/README.txt
rename to jdk/src/sample/share/vm/jvm-clr/README.txt
diff --git a/jdk/src/share/sample/vm/jvm-clr/invoked.cs b/jdk/src/sample/share/vm/jvm-clr/invoked.cs
similarity index 100%
rename from jdk/src/share/sample/vm/jvm-clr/invoked.cs
rename to jdk/src/sample/share/vm/jvm-clr/invoked.cs
diff --git a/jdk/src/share/sample/vm/jvm-clr/invoker.cpp b/jdk/src/sample/share/vm/jvm-clr/invoker.cpp
similarity index 100%
rename from jdk/src/share/sample/vm/jvm-clr/invoker.cpp
rename to jdk/src/sample/share/vm/jvm-clr/invoker.cpp
diff --git a/jdk/src/share/sample/vm/jvm-clr/invoker.h b/jdk/src/sample/share/vm/jvm-clr/invoker.h
similarity index 100%
rename from jdk/src/share/sample/vm/jvm-clr/invoker.h
rename to jdk/src/sample/share/vm/jvm-clr/invoker.h
diff --git a/jdk/src/share/sample/vm/jvm-clr/invoker.java b/jdk/src/sample/share/vm/jvm-clr/invoker.java
similarity index 100%
rename from jdk/src/share/sample/vm/jvm-clr/invoker.java
rename to jdk/src/sample/share/vm/jvm-clr/invoker.java
diff --git a/jdk/src/share/sample/vm/jvm-clr/invokerExp.h b/jdk/src/sample/share/vm/jvm-clr/invokerExp.h
similarity index 100%
rename from jdk/src/share/sample/vm/jvm-clr/invokerExp.h
rename to jdk/src/sample/share/vm/jvm-clr/invokerExp.h
diff --git a/jdk/src/solaris/sample/dtrace/README.txt b/jdk/src/sample/solaris/dtrace/README.txt
similarity index 100%
rename from jdk/src/solaris/sample/dtrace/README.txt
rename to jdk/src/sample/solaris/dtrace/README.txt
diff --git a/jdk/src/solaris/sample/dtrace/helpers/dtrace_helper.d b/jdk/src/sample/solaris/dtrace/helpers/dtrace_helper.d
similarity index 100%
rename from jdk/src/solaris/sample/dtrace/helpers/dtrace_helper.d
rename to jdk/src/sample/solaris/dtrace/helpers/dtrace_helper.d
diff --git a/jdk/src/solaris/sample/dtrace/hotspot/README.txt b/jdk/src/sample/solaris/dtrace/hotspot/README.txt
similarity index 100%
rename from jdk/src/solaris/sample/dtrace/hotspot/README.txt
rename to jdk/src/sample/solaris/dtrace/hotspot/README.txt
diff --git a/jdk/src/solaris/sample/dtrace/hotspot/class_loading_stat.d b/jdk/src/sample/solaris/dtrace/hotspot/class_loading_stat.d
similarity index 100%
rename from jdk/src/solaris/sample/dtrace/hotspot/class_loading_stat.d
rename to jdk/src/sample/solaris/dtrace/hotspot/class_loading_stat.d
diff --git a/jdk/src/solaris/sample/dtrace/hotspot/gc_time_stat.d b/jdk/src/sample/solaris/dtrace/hotspot/gc_time_stat.d
similarity index 100%
rename from jdk/src/solaris/sample/dtrace/hotspot/gc_time_stat.d
rename to jdk/src/sample/solaris/dtrace/hotspot/gc_time_stat.d
diff --git a/jdk/src/solaris/sample/dtrace/hotspot/hotspot_calls_tree.d b/jdk/src/sample/solaris/dtrace/hotspot/hotspot_calls_tree.d
similarity index 100%
rename from jdk/src/solaris/sample/dtrace/hotspot/hotspot_calls_tree.d
rename to jdk/src/sample/solaris/dtrace/hotspot/hotspot_calls_tree.d
diff --git a/jdk/src/solaris/sample/dtrace/hotspot/method_compile_stat.d b/jdk/src/sample/solaris/dtrace/hotspot/method_compile_stat.d
similarity index 100%
rename from jdk/src/solaris/sample/dtrace/hotspot/method_compile_stat.d
rename to jdk/src/sample/solaris/dtrace/hotspot/method_compile_stat.d
diff --git a/jdk/src/solaris/sample/dtrace/hotspot/method_invocation_stat.d b/jdk/src/sample/solaris/dtrace/hotspot/method_invocation_stat.d
similarity index 100%
rename from jdk/src/solaris/sample/dtrace/hotspot/method_invocation_stat.d
rename to jdk/src/sample/solaris/dtrace/hotspot/method_invocation_stat.d
diff --git a/jdk/src/solaris/sample/dtrace/hotspot/method_invocation_stat_filter.d b/jdk/src/sample/solaris/dtrace/hotspot/method_invocation_stat_filter.d
similarity index 100%
rename from jdk/src/solaris/sample/dtrace/hotspot/method_invocation_stat_filter.d
rename to jdk/src/sample/solaris/dtrace/hotspot/method_invocation_stat_filter.d
diff --git a/jdk/src/solaris/sample/dtrace/hotspot/method_invocation_tree.d b/jdk/src/sample/solaris/dtrace/hotspot/method_invocation_tree.d
similarity index 100%
rename from jdk/src/solaris/sample/dtrace/hotspot/method_invocation_tree.d
rename to jdk/src/sample/solaris/dtrace/hotspot/method_invocation_tree.d
diff --git a/jdk/src/solaris/sample/dtrace/hotspot/monitors.d b/jdk/src/sample/solaris/dtrace/hotspot/monitors.d
similarity index 100%
rename from jdk/src/solaris/sample/dtrace/hotspot/monitors.d
rename to jdk/src/sample/solaris/dtrace/hotspot/monitors.d
diff --git a/jdk/src/solaris/sample/dtrace/hotspot/object_allocation_stat.d b/jdk/src/sample/solaris/dtrace/hotspot/object_allocation_stat.d
similarity index 100%
rename from jdk/src/solaris/sample/dtrace/hotspot/object_allocation_stat.d
rename to jdk/src/sample/solaris/dtrace/hotspot/object_allocation_stat.d
diff --git a/jdk/src/solaris/sample/dtrace/hotspot_jni/CriticalSection.d b/jdk/src/sample/solaris/dtrace/hotspot_jni/CriticalSection.d
similarity index 100%
rename from jdk/src/solaris/sample/dtrace/hotspot_jni/CriticalSection.d
rename to jdk/src/sample/solaris/dtrace/hotspot_jni/CriticalSection.d
diff --git a/jdk/src/solaris/sample/dtrace/hotspot_jni/CriticalSection_slow.d b/jdk/src/sample/solaris/dtrace/hotspot_jni/CriticalSection_slow.d
similarity index 100%
rename from jdk/src/solaris/sample/dtrace/hotspot_jni/CriticalSection_slow.d
rename to jdk/src/sample/solaris/dtrace/hotspot_jni/CriticalSection_slow.d
diff --git a/jdk/src/solaris/sample/dtrace/hotspot_jni/README.txt b/jdk/src/sample/solaris/dtrace/hotspot_jni/README.txt
similarity index 100%
rename from jdk/src/solaris/sample/dtrace/hotspot_jni/README.txt
rename to jdk/src/sample/solaris/dtrace/hotspot_jni/README.txt
diff --git a/jdk/src/solaris/sample/dtrace/hotspot_jni/hotspot_jni_calls_stat.d b/jdk/src/sample/solaris/dtrace/hotspot_jni/hotspot_jni_calls_stat.d
similarity index 100%
rename from jdk/src/solaris/sample/dtrace/hotspot_jni/hotspot_jni_calls_stat.d
rename to jdk/src/sample/solaris/dtrace/hotspot_jni/hotspot_jni_calls_stat.d
diff --git a/jdk/src/solaris/sample/dtrace/hotspot_jni/hotspot_jni_calls_tree.d b/jdk/src/sample/solaris/dtrace/hotspot_jni/hotspot_jni_calls_tree.d
similarity index 100%
rename from jdk/src/solaris/sample/dtrace/hotspot_jni/hotspot_jni_calls_tree.d
rename to jdk/src/sample/solaris/dtrace/hotspot_jni/hotspot_jni_calls_tree.d
diff --git a/jdk/src/share/classes/javax/management/build.xml b/jdk/src/share/classes/javax/management/build.xml
deleted file mode 100644
index e1d263520f0..00000000000
--- a/jdk/src/share/classes/javax/management/build.xml
+++ /dev/null
@@ -1,312 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-    
-
-    
-        Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
-
-        Description: JMX API Version 1.4 - Source Code from Java SE 6
-    
-
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-    
-
-
-
-    
-
-    
-	
-    
-
-
-
-    
-
-    
-
-
-
-
-    
-    
-    
-
-
-    
-    
-
-    
-
-        
-        
-	    
-        
-
-        
-        
-
-        
-        
-
-        
-	
-	See the contents of ${dir.build}/properties.log for all defined properties.
-	
-        
-        
-        
-        
-        
-        
-        
-	
-        
-        
-        
-        
-        
-        
-	
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-
-    
-
-
-
-    
-    
-
-    
-
-
-    
-    
-
-    
-
-        
-
-	
-	    
-	    
-	
-
-    
-
-
-    
-    
-
-    
-
-
-	
-
-        
-	
-
-	
-        
-
-
-	
-
-	
-	
-
-	
-        
-
-    
-
-
-    
-    
-
-    
-
-       
-
-       
-
-	    
-
-	    
-		    
-		    
-		    
-		
          
-		    
-		    
-		    
-		    
-		    
-		    
-		    
-		
          
-	    
-       
-
-    
-
-
-
-    
-    
-
-    
-        
-           
-        
-    
-
-
-    
-    
-
-    
-        
-    
-
-
-    
-    
-
-    
-
-
-
-
diff --git a/jdk/src/share/classes/overview-bundled.html b/jdk/src/share/classes/overview-bundled.html
deleted file mode 100644
index 4ae4e9a515b..00000000000
--- a/jdk/src/share/classes/overview-bundled.html
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-
-
-This document contains API that are not part of the Java 2 Platform.
-While they may be a part of Sun's JDK and J2SE Runtime 
-Environment distributions, developers cannot depend on their availability 
-in non-Sun implementations.  
-
          
-
-
-
-
diff --git a/jdk/src/share/classes/sun/tools/jconsole/manifest b/jdk/src/share/classes/sun/tools/jconsole/manifest
deleted file mode 100644
index a6a2eefe766..00000000000
--- a/jdk/src/share/classes/sun/tools/jconsole/manifest
+++ /dev/null
@@ -1 +0,0 @@
-Main-Class: sun.tools.jconsole.JConsole
diff --git a/jdk/src/share/classes/sun/util/locale/AsciiUtil.java b/jdk/src/share/classes/sun/util/locale/AsciiUtil.java
deleted file mode 100644
index b122292ca8a..00000000000
--- a/jdk/src/share/classes/sun/util/locale/AsciiUtil.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- *******************************************************************************
- * Copyright (C) 2009, International Business Machines Corporation and         *
- * others. All Rights Reserved.                                                *
- *******************************************************************************
- */
-package sun.util.locale;
-
-public final class AsciiUtil {
-    public static boolean caseIgnoreMatch(String s1, String s2) {
-        if (s1 == s2) {
-            return true;
-        }
-        int len = s1.length();
-        if (len != s2.length()) {
-            return false;
-        }
-        int i = 0;
-        while (i < len) {
-            char c1 = s1.charAt(i);
-            char c2 = s2.charAt(i);
-            if (c1 != c2 && toLower(c1) != toLower(c2)) {
-                break;
-            }
-            i++;
-        }
-        return (i == len);
-    }
-
-    public static int caseIgnoreCompare(String s1, String s2) {
-        if (s1 == s2) {
-            return 0;
-        }
-        return AsciiUtil.toLowerString(s1).compareTo(AsciiUtil.toLowerString(s2));
-    }
-
-
-    public static char toUpper(char c) {
-        if (c >= 'a' && c <= 'z') {
-            c -= 0x20;
-        }
-        return c;
-    }
-
-    public static char toLower(char c) {
-        if (c >= 'A' && c <= 'Z') {
-            c += 0x20;
-        }
-        return c;
-    }
-
-    public static String toLowerString(String s) {
-        int idx = 0;
-        for (; idx < s.length(); idx++) {
-            char c = s.charAt(idx);
-            if (c >= 'A' && c <= 'Z') {
-                break;
-            }
-        }
-        if (idx == s.length()) {
-            return s;
-        }
-        StringBuilder buf = new StringBuilder(s.substring(0, idx));
-        for (; idx < s.length(); idx++) {
-            buf.append(toLower(s.charAt(idx)));
-        }
-        return buf.toString();
-    }
-
-    public static String toUpperString(String s) {
-        int idx = 0;
-        for (; idx < s.length(); idx++) {
-            char c = s.charAt(idx);
-            if (c >= 'a' && c <= 'z') {
-                break;
-            }
-        }
-        if (idx == s.length()) {
-            return s;
-        }
-        StringBuilder buf = new StringBuilder(s.substring(0, idx));
-        for (; idx < s.length(); idx++) {
-            buf.append(toUpper(s.charAt(idx)));
-        }
-        return buf.toString();
-    }
-
-    public static String toTitleString(String s) {
-        if (s.length() == 0) {
-            return s;
-        }
-        int idx = 0;
-        char c = s.charAt(idx);
-        if (!(c >= 'a' && c <= 'z')) {
-            for (idx = 1; idx < s.length(); idx++) {
-                if (c >= 'A' && c <= 'Z') {
-                    break;
-                }
-            }
-        }
-        if (idx == s.length()) {
-            return s;
-        }
-        StringBuilder buf = new StringBuilder(s.substring(0, idx));
-        if (idx == 0) {
-            buf.append(toUpper(s.charAt(idx)));
-            idx++;
-        }
-        for (; idx < s.length(); idx++) {
-            buf.append(toLower(s.charAt(idx)));
-        }
-        return buf.toString();
-    }
-
-    public static boolean isAlpha(char c) {
-        return (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z');
-    }
-
-    public static boolean isAlphaString(String s) {
-        boolean b = true;
-        for (int i = 0; i < s.length(); i++) {
-            if (!isAlpha(s.charAt(i))) {
-                b = false;
-                break;
-            }
-        }
-        return b;
-    }
-
-    public static boolean isNumeric(char c) {
-        return (c >= '0' && c <= '9');
-    }
-
-    public static boolean isNumericString(String s) {
-        boolean b = true;
-        for (int i = 0; i < s.length(); i++) {
-            if (!isNumeric(s.charAt(i))) {
-                b = false;
-                break;
-            }
-        }
-        return b;
-    }
-
-    public static boolean isAlphaNumeric(char c) {
-        return isAlpha(c) || isNumeric(c);
-    }
-
-    public static boolean isAlphaNumericString(String s) {
-        boolean b = true;
-        for (int i = 0; i < s.length(); i++) {
-            if (!isAlphaNumeric(s.charAt(i))) {
-                b = false;
-                break;
-            }
-        }
-        return b;
-    }
-
-    public static class CaseInsensitiveKey {
-        private String _key;
-        private int _hash;
-
-        public CaseInsensitiveKey(String key) {
-            _key = key;
-            _hash = AsciiUtil.toLowerString(key).hashCode();
-        }
-
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o instanceof CaseInsensitiveKey) {
-                return AsciiUtil.caseIgnoreMatch(_key, ((CaseInsensitiveKey)o)._key);
-            }
-            return false;
-        }
-
-        public int hashCode() {
-            return _hash;
-        }
-    }
-}
diff --git a/jdk/src/share/lib/colorname.properties b/jdk/src/share/lib/colorname.properties
deleted file mode 100644
index ba453dc2442..00000000000
--- a/jdk/src/share/lib/colorname.properties
+++ /dev/null
@@ -1,485 +0,0 @@
-aliceblue=eff7ff
-antiquewhite1=feedd6
-antiquewhite2=ebdbc5
-antiquewhite3=c8b9a6
-antiquewhite4=817468
-antiquewhite=f9e8d2
-aqua=00ffff
-aquamarine1=87fdce
-aquamarine2=7deabe
-aquamarine3=69c69f
-aquamarine4=417c64
-aquamarine=43b7ba
-azure2=deecec
-azure3=bcc7c7
-azure4=7a7d7d
-azure=efffff
-beige=f5f3d7
-bisque2=ead0ae
-bisque3=c7af92
-bisque4=816e59
-bisque=fde0bc
-black=000000
-blanchedalmond=fee8c6
-blue1=1535ff
-blue2=1531ec
-blue3=1528c7
-blue4=151b7e
-blue=0000ff
-blueviolet=7931df
-brown1=f63526
-brown2=e42d17
-brown3=c22217
-brown=980517
-burlywood1=fcce8e
-burlywood2=eabe83
-burlywood3=c6a06d
-burlywood4=806341
-cadetblue1=99f3ff
-cadetblue2=8ee2ec
-cadetblue3=77bfc7
-cadetblue4=4c787e
-cadetblue=578693
-chartreuse2=7fe817
-chartreuse3=6cc417
-chartreuse4=437c17
-chartreuse=8afb17
-chocolate=c85a17
-coral2=e55b3c
-coral3=c34a2c
-coral4=7e2817
-coral=f76541
-cornflowerblue=151b8d
-cornsilk2=ece5c6
-cornsilk3=c8c2a7
-cornsilk4=817a68
-cornsilk=fff7d7
-cyan1=57feff
-cyan2=50ebec
-cyan3=46c7c7
-cyan4=307d7e
-cyan=00ffff
-darkgoldenrod1=fbb117
-darkgoldenrod2=e8a317
-darkgoldenrod3=c58917
-darkgoldenrod4=7f5217
-darkgoldenrod=af7817
-darkgreen=254117
-darkkhaki=b7ad59
-darkolivegreen1=ccfb5d
-darkolivegreen2=bce954
-darkolivegreen3=a0c544
-darkolivegreen4=667c26
-darkolivegreen=4a4117
-darkorange1=f87217
-darkorange2=e56717
-darkorange3=c35617
-darkorange4=7e3117
-darkorange=f88017
-darkorchid1=b041ff
-darkorchid2=a23bec
-darkorchid3=8b31c7
-darkorchid4=571b7e
-darkorchid=7d1b7e
-darksalmon=e18b6b
-darkseagreen1=c3fdb8
-darkseagreen2=b5eaaa
-darkseagreen3=99c68e
-darkseagreen4=617c58
-darkseagreen=8bb381
-darkslateblue=2b3856
-darkslategray1=9afeff
-darkslategray2=8eebec
-darkslategray3=78c7c7
-darkslategray4=4c7d7e
-darkslategray=25383c
-darkturquoise=3b9c9c
-darkviolet=842dce
-deeppink2=e4287c
-deeppink3=c12267
-deeppink4=7d053f
-deeppink=f52887
-deepskyblue2=38acec
-deepskyblue3=3090c7
-deepskyblue4=25587e
-deepskyblue=3bb9ff
-dimgray=463e41
-dodgerblue2=157dec
-dodgerblue3=1569c7
-dodgerblue4=153e7e
-dodgerblue=1589ff
-firebrick1=f62817
-firebrick2=e42217
-firebrick3=c11b17
-firebrick=800517
-floralwhite=fff9ee
-forestgreen=4e9258
-fuchsia=ff00ff
-gainsboro=d8d9d7
-ghostwhite=f7f7ff
-gold1=fdd017
-gold2=eac117
-gold3=c7a317
-gold4=806517
-gold=d4a017
-goldenrod1=fbb917
-goldenrod2=e9ab17
-goldenrod3=c68e17
-goldenrod4=805817
-goldenrod=edda74
-gray0=150517
-gray100=ffffff
-gray18=250517
-gray21=2b1b17
-gray23=302217
-gray24=302226
-gray25=342826
-gray26=34282c
-gray27=382d2c
-gray28=3b3131
-gray29=3e3535
-gray30=413839
-gray31=41383c
-gray32=463e3f
-gray34=4a4344
-gray35=4c4646
-gray36=4e4848
-gray37=504a4b
-gray38=544e4f
-gray39=565051
-gray40=595454
-gray41=5c5858
-gray42=5f5a59
-gray43=625d5d
-gray44=646060
-gray45=666362
-gray46=696565
-gray47=6d6968
-gray48=6e6a6b
-gray49=726e6d
-gray50=747170
-gray51=787473
-gray52=7a7777
-gray53=7c7979
-gray54=807d7c
-gray55=82807e
-gray56=858381
-gray57=878583
-gray58=8b8987
-gray59=8d8b89
-gray60=8f8e8d
-gray61=939190
-gray62=959492
-gray63=999795
-gray64=9a9998
-gray65=9e9c9b
-gray66=a09f9d
-gray67=a3a2a0
-gray68=a5a4a3
-gray69=a9a8a6
-gray70=acaba9
-gray71=aeadac
-gray72=b1b1af
-gray73=b3b3b1
-gray74=b7b6b4
-gray75=b9b8b6
-gray76=bcbbba
-gray77=bebebc
-gray78=c1c1bf
-gray79=c3c4c2
-gray80=c7c7c5
-gray81=cacac9
-gray82=cccccb
-gray83=d0cfcf
-gray84=d2d2d1
-gray85=d5d5d4
-gray86=d7d7d7
-gray87=dbdbd9
-gray88=dddddc
-gray89=e0e0e0
-gray90=e2e3e1
-gray91=e5e6e4
-gray92=e8e9e8
-gray93=ebebea
-gray94=eeeeee
-gray95=f0f1f0
-gray96=f4f4f3
-gray97=f6f6f5
-gray98=f9f9fa
-gray99=fbfbfb
-gray=808080
-green1=5ffb17
-green2=59e817
-green3=4cc417
-green4=347c17
-green=00ff00
-greenyellow=b1fb17
-honeydew2=deebdc
-honeydew3=bcc7b9
-honeydew4=7a7d74
-honeydew=f0feee
-hotpink1=f665ab
-hotpink2=e45e9d
-hotpink3=c25283
-hotpink4=7d2252
-hotpink=f660ab
-indianred1=f75d59
-indianred2=e55451
-indianred3=c24641
-indianred4=7e2217
-indianred=5e2217
-ivory2=ececdc
-ivory3=c9c7b9
-ivory4=817d74
-ivory=ffffee
-khaki1=fff380
-khaki2=ede275
-khaki3=c9be62
-khaki4=827839
-khaki=ada96e
-lavender=e3e4fa
-lavenderblush2=ebdde2
-lavenderblush3=c8bbbe
-lavenderblush4=817679
-lavenderblush=fdeef4
-lawngreen=87f717
-lemonchiffon2=ece5b6
-lemonchiffon3=c9c299
-lemonchiffon4=827b60
-lemonchiffon=fff8c6
-lightblue1=bdedff
-lightblue2=afdcec
-lightblue3=95b9c7
-lightblue4=5e767e
-lightblue=addfff
-lightcoral=e77471
-lightcyan2=cfecec
-lightcyan3=afc7c7
-lightcyan4=717d7d
-lightcyan=e0ffff
-lightgoldenrod1=ffe87c
-lightgoldenrod2=ecd672
-lightgoldenrod3=c8b560
-lightgoldenrod4=817339
-lightgoldenrod=ecd872
-lightgoldenrodyellow=faf8cc
-lightpink1=f9a7b0
-lightpink2=e799a3
-lightpink3=c48189
-lightpink4=7f4e52
-lightpink=faafba
-lightsalmon2=e78a61
-lightsalmon3=c47451
-lightsalmon4=7f462c
-lightsalmon=f9966b
-lightseagreen=3ea99f
-lightskyblue2=a0cfec
-lightskyblue3=87afc7
-lightskyblue4=566d7e
-lightskyblue=82cafa
-lightslateblue=736aff
-lightslategray=6d7b8d
-lightsteelblue1=c6deff
-lightsteelblue2=b7ceec
-lightsteelblue3=9aadc7
-lightsteelblue4=646d7e
-lightsteelblue=728fce
-lightyellow2=edebcb
-lightyellow3=c9c7aa
-lightyellow4=827d6b
-lightyellow=fffedc
-lime=00ff00
-limegreen=41a317
-linen=f9eee2
-magenta1=f43eff
-magenta2=e238ec
-magenta3=c031c7
-magenta=ff00ff
-maroon1=f535aa
-maroon2=e3319d
-maroon3=c12283
-maroon4=7d0552
-maroon=810541
-mediumaquamarine=348781
-mediumblue=152dc6
-mediumforestgreen=347235
-mediumgoldenrod=ccb954
-mediumorchid1=d462ff
-mediumorchid2=c45aec
-mediumorchid3=a74ac7
-mediumorchid4=6a287e
-mediumorchid=b048b5
-mediumpurple1=9e7bff
-mediumpurple2=9172ec
-mediumpurple3=7a5dc7
-mediumpurple4=4e387e
-mediumpurple=8467d7
-mediumseagreen=306754
-mediumslateblue=5e5a80
-mediumspringgreen=348017
-mediumturquoise=48cccd
-mediumvioletred=ca226b
-midnightblue=151b54
-mintcream=f5fff9
-mistyrose2=ead0cc
-mistyrose3=c6afac
-mistyrose4=806f6c
-mistyrose=fde1dd
-moccasin=fde0ac
-navajowhite2=eac995
-navajowhite3=c7aa7d
-navajowhite4=806a4b
-navajowhite=fddaa3
-navy=150567
-oldlace=fcf3e2
-olive=808000
-olivedrab1=c3fb17
-olivedrab2=b5e917
-olivedrab3=99c517
-olivedrab4=617c17
-olivedrab=658017
-orange1=fa9b17
-orange2=e78e17
-orange3=c57717
-orange4=7f4817
-orange=f87a17
-orangered2=e43117
-orangered3=c22817
-orangered4=7e0517
-orangered=f63817
-orchid1=f67dfa
-orchid2=e473e7
-orchid3=c160c3
-orchid4=7d387c
-orchid=e57ded
-palegoldenrod=ede49e
-palegreen1=a0fc8d
-palegreen2=94e981
-palegreen3=7dc56c
-palegreen4=4e7c41
-palegreen=79d867
-paleturquoise1=bcfeff
-paleturquoise2=adebec
-paleturquoise3=92c7c7
-paleturquoise4=5e7d7e
-paleturquoise=aeebec
-palevioletred1=f778a1
-palevioletred2=e56e94
-palevioletred3=c25a7c
-palevioletred4=7e354d
-palevioletred=d16587
-papayawhip=feeccf
-peachpuff2=eac5a3
-peachpuff3=c6a688
-peachpuff4=806752
-peachpuff=fcd5b0
-peru=c57726
-pink2=e7a1b0
-pink3=c48793
-pink4=7f525d
-pink=faafbe
-plum1=f9b7ff
-plum2=e6a9ec
-plum3=c38ec7
-plum4=7e587e
-plum=b93b8f
-powderblue=addce3
-purple1=893bff
-purple2=7f38ec
-purple3=6c2dc7
-purple4=461b7e
-purple=8e35ef
-red1=f62217
-red2=e41b17
-red=ff0000
-rosybrown1=fbbbb9
-rosybrown2=e8adaa
-rosybrown3=c5908e
-rosybrown4=7f5a58
-rosybrown=b38481
-royalblue1=306eff
-royalblue2=2b65ec
-royalblue3=2554c7
-royalblue4=15317e
-royalblue=2b60de
-salmon1=f88158
-salmon2=e67451
-salmon3=c36241
-salmon4=7e3817
-sandybrown=ee9a4d
-seagreen1=6afb92
-seagreen2=64e986
-seagreen3=54c571
-seagreen4=387c44
-seagreen=4e8975
-seashell2=ebe2d9
-seashell3=c8bfb6
-seashell4=817873
-seashell=fef3eb
-sienna1=f87431
-sienna2=e66c2c
-sienna3=c35817
-sienna4=7e3517
-sienna=8a4117
-silver=c0c0c0
-skyblue1=82caff
-skyblue2=79baec
-skyblue3=659ec7
-skyblue4=41627e
-skyblue=6698ff
-slateblue1=7369ff
-slateblue2=6960ec
-slateblue3=574ec7
-slateblue4=342d7e
-slateblue=737ca1
-slategray1=c2dfff
-slategray2=b4cfec
-slategray3=98afc7
-slategray4=616d7e
-slategray=657383
-snow2=ece7e6
-snow3=c8c4c2
-snow4=817c7b
-snow=fff9fa
-springgreen1=5efb6e
-springgreen2=57e964
-springgreen3=4cc552
-springgreen4=347c2c
-springgreen=4aa02c
-steelblue1=5cb3ff
-steelblue2=56a5ec
-steelblue3=488ac7
-steelblue4=2b547e
-steelblue=4863a0
-tan1=fa9b3c
-tan2=e78e35
-tan=d8af79
-teal=008080
-thistle1=fcdfff
-thistle2=e9cfec
-thistle3=c6aec7
-thistle4=806d7e
-thistle=d2b9d3
-tomato2=e54c2c
-tomato3=c23e17
-tomato=f75431
-turquoise1=52f3ff
-turquoise2=4ee2ec
-turquoise3=43bfc7
-turquoise4=30787e
-turquoise=43c6db
-violet=8d38c9
-violetred1=f6358a
-violetred2=e4317f
-violetred3=c12869
-violetred4=7d0541
-violetred=e9358a
-wheat1=fee4b1
-wheat2=ebd3a3
-wheat3=c8b189
-wheat4=816f54
-wheat=f3daa9
-white=ffffff
-yellow1=fffc17
-yellow=ffff00
-yellowgreen=52d017
diff --git a/jdk/src/share/lib/security/java.security-aix b/jdk/src/share/lib/security/java.security-aix
deleted file mode 100644
index 77540a3e506..00000000000
--- a/jdk/src/share/lib/security/java.security-aix
+++ /dev/null
@@ -1,496 +0,0 @@
-#
-# This is the "master security properties file".
-#
-# An alternate java.security properties file may be specified
-# from the command line via the system property
-#
-#    -Djava.security.properties=
-#
-# This properties file appends to the master security properties file.
-# If both properties files specify values for the same key, the value
-# from the command-line properties file is selected, as it is the last
-# one loaded.
-#
-# Also, if you specify
-#
-#    -Djava.security.properties== (2 equals),
-#
-# then that properties file completely overrides the master security
-# properties file.
-#
-# To disable the ability to specify an additional properties file from
-# the command line, set the key security.overridePropertiesFile
-# to false in the master security properties file. It is set to true
-# by default.
-
-# In this file, various security properties are set for use by
-# java.security classes. This is where users can statically register
-# Cryptography Package Providers ("providers" for short). The term
-# "provider" refers to a package or set of packages that supply a
-# concrete implementation of a subset of the cryptography aspects of
-# the Java Security API. A provider may, for example, implement one or
-# more digital signature algorithms or message digest algorithms.
-#
-# Each provider must implement a subclass of the Provider class.
-# To register a provider in this master security properties file,
-# specify the Provider subclass name and priority in the format
-#
-#    security.provider.=
-#
-# This declares a provider, and specifies its preference
-# order n. The preference order is the order in which providers are
-# searched for requested algorithms (when no specific provider is
-# requested). The order is 1-based; 1 is the most preferred, followed
-# by 2, and so on.
-#
-#  must specify the subclass of the Provider class whose
-# constructor sets the values of various properties that are required
-# for the Java Security API to look up the algorithms or other
-# facilities implemented by the provider.
-#
-# There must be at least one provider specification in java.security.
-# There is a default provider that comes standard with the JDK. It
-# is called the "SUN" provider, and its Provider subclass
-# named Sun appears in the sun.security.provider package. Thus, the
-# "SUN" provider is registered via the following:
-#
-#    security.provider.1=sun.security.provider.Sun
-#
-# (The number 1 is used for the default provider.)
-#
-# Note: Providers can be dynamically registered instead by calls to
-# either the addProvider or insertProviderAt method in the Security
-# class.
-
-#
-# List of providers and their preference orders (see above):
-#
-security.provider.1=sun.security.provider.Sun
-security.provider.2=sun.security.rsa.SunRsaSign
-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
-
-#
-# Sun Provider SecureRandom seed source.
-#
-# Select the primary source of seed data for the "SHA1PRNG" and
-# "NativePRNG" SecureRandom implementations in the "Sun" provider.
-# (Other SecureRandom implementations might also use this property.)
-#
-# On Unix-like systems (for example, Solaris/Linux/MacOS), the
-# "NativePRNG" and "SHA1PRNG" implementations obtains seed data from
-# special device files such as file:/dev/random.
-#
-# On Windows systems, specifying the URLs "file:/dev/random" or
-# "file:/dev/urandom" will enable the native Microsoft CryptoAPI seeding
-# mechanism for SHA1PRNG.
-#
-# By default, an attempt is made to use the entropy gathering device
-# specified by the "securerandom.source" Security property.  If an
-# exception occurs while accessing the specified URL:
-#
-#     SHA1PRNG:
-#         the traditional system/thread activity algorithm will be used.
-#
-#     NativePRNG:
-#         a default value of /dev/random will be used.  If neither
-#         are available, the implementation will be disabled.
-#         "file" is the only currently supported protocol type.
-#
-# The entropy gathering device can also be specified with the System
-# property "java.security.egd". For example:
-#
-#   % java -Djava.security.egd=file:/dev/random MainClass
-#
-# Specifying this System property will override the
-# "securerandom.source" Security property.
-#
-# In addition, if "file:/dev/random" or "file:/dev/urandom" is
-# specified, the "NativePRNG" implementation will be more preferred than
-# SHA1PRNG in the Sun provider.
-#
-securerandom.source=file:/dev/random
-
-#
-# A list of known strong SecureRandom implementations.
-#
-# To help guide applications in selecting a suitable strong
-# java.security.SecureRandom implementation, Java distributions should
-# indicate a list of known strong implementations using the property.
-#
-# This is a comma-separated list of algorithm and/or algorithm:provider
-# entries.
-#
-securerandom.strongAlgorithms=NativePRNGBlocking:SUN
-
-#
-# Class to instantiate as the javax.security.auth.login.Configuration
-# provider.
-#
-login.configuration.provider=sun.security.provider.ConfigFile
-
-#
-# Default login configuration file
-#
-#login.config.url.1=file:${user.home}/.java.login.config
-
-#
-# Class to instantiate as the system Policy. This is the name of the class
-# that will be used as the Policy object.
-#
-policy.provider=sun.security.provider.PolicyFile
-
-# The default is to have a single system-wide policy file,
-# and a policy file in the user's home directory.
-policy.url.1=file:${java.home}/lib/security/java.policy
-policy.url.2=file:${user.home}/.java.policy
-
-# whether or not we expand properties in the policy file
-# if this is set to false, properties (${...}) will not be expanded in policy
-# files.
-policy.expandProperties=true
-
-# whether or not we allow an extra policy to be passed on the command line
-# with -Djava.security.policy=somefile. Comment out this line to disable
-# this feature.
-policy.allowSystemProperty=true
-
-# whether or not we look into the IdentityScope for trusted Identities
-# when encountering a 1.1 signed JAR file. If the identity is found
-# and is trusted, we grant it AllPermission.
-policy.ignoreIdentityScope=false
-
-#
-# Default keystore type.
-#
-keystore.type=jks
-
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageAccess unless the
-# corresponding RuntimePermission ("accessClassInPackage."+package) has
-# been granted.
-package.access=sun.,\
-               com.sun.xml.internal.,\
-               com.sun.imageio.,\
-               com.sun.istack.internal.,\
-               com.sun.jmx.,\
-               com.sun.media.sound.,\
-               com.sun.naming.internal.,\
-               com.sun.proxy.,\
-               com.sun.corba.se.,\
-               com.sun.org.apache.bcel.internal.,\
-               com.sun.org.apache.regexp.internal.,\
-               com.sun.org.apache.xerces.internal.,\
-               com.sun.org.apache.xpath.internal.,\
-               com.sun.org.apache.xalan.internal.extensions.,\
-               com.sun.org.apache.xalan.internal.lib.,\
-               com.sun.org.apache.xalan.internal.res.,\
-               com.sun.org.apache.xalan.internal.templates.,\
-               com.sun.org.apache.xalan.internal.utils.,\
-               com.sun.org.apache.xalan.internal.xslt.,\
-               com.sun.org.apache.xalan.internal.xsltc.cmdline.,\
-               com.sun.org.apache.xalan.internal.xsltc.compiler.,\
-               com.sun.org.apache.xalan.internal.xsltc.trax.,\
-               com.sun.org.apache.xalan.internal.xsltc.util.,\
-               com.sun.org.apache.xml.internal.res.,\
-               com.sun.org.apache.xml.internal.security.,\
-               com.sun.org.apache.xml.internal.serializer.utils.,\
-               com.sun.org.apache.xml.internal.utils.,\
-               com.sun.org.glassfish.,\
-               com.oracle.xmlns.internal.,\
-               com.oracle.webservices.internal.,\
-               org.jcp.xml.dsig.internal.,\
-               jdk.internal.,\
-               jdk.nashorn.internal.,\
-               jdk.nashorn.tools.
-
-
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageDefinition unless the
-# corresponding RuntimePermission ("defineClassInPackage."+package) has
-# been granted.
-#
-# by default, none of the class loaders supplied with the JDK call
-# checkPackageDefinition.
-#
-package.definition=sun.,\
-                   com.sun.xml.internal.,\
-                   com.sun.imageio.,\
-                   com.sun.istack.internal.,\
-                   com.sun.jmx.,\
-                   com.sun.media.sound.,\
-                   com.sun.naming.internal.,\
-                   com.sun.proxy.,\
-                   com.sun.corba.se.,\
-                   com.sun.org.apache.bcel.internal.,\
-                   com.sun.org.apache.regexp.internal.,\
-                   com.sun.org.apache.xerces.internal.,\
-                   com.sun.org.apache.xpath.internal.,\
-                   com.sun.org.apache.xalan.internal.extensions.,\
-                   com.sun.org.apache.xalan.internal.lib.,\
-                   com.sun.org.apache.xalan.internal.res.,\
-                   com.sun.org.apache.xalan.internal.templates.,\
-                   com.sun.org.apache.xalan.internal.utils.,\
-                   com.sun.org.apache.xalan.internal.xslt.,\
-                   com.sun.org.apache.xalan.internal.xsltc.cmdline.,\
-                   com.sun.org.apache.xalan.internal.xsltc.compiler.,\
-                   com.sun.org.apache.xalan.internal.xsltc.trax.,\
-                   com.sun.org.apache.xalan.internal.xsltc.util.,\
-                   com.sun.org.apache.xml.internal.res.,\
-                   com.sun.org.apache.xml.internal.security.,\
-                   com.sun.org.apache.xml.internal.serializer.utils.,\
-                   com.sun.org.apache.xml.internal.utils.,\
-                   com.sun.org.glassfish.,\
-                   com.oracle.xmlns.internal.,\
-                   com.oracle.webservices.internal.,\
-                   org.jcp.xml.dsig.internal.,\
-                   jdk.internal.,\
-                   jdk.nashorn.internal.,\
-                   jdk.nashorn.tools.
-
-
-#
-# Determines whether this properties file can be appended to
-# or overridden on the command line via -Djava.security.properties
-#
-security.overridePropertiesFile=true
-
-#
-# Determines the default key and trust manager factory algorithms for
-# the javax.net.ssl package.
-#
-ssl.KeyManagerFactory.algorithm=SunX509
-ssl.TrustManagerFactory.algorithm=PKIX
-
-#
-# The Java-level namelookup cache policy for successful lookups:
-#
-# any negative value: caching forever
-# any positive value: the number of seconds to cache an address for
-# zero: do not cache
-#
-# default value is forever (FOREVER). For security reasons, this
-# caching is made forever when a security manager is set. When a security
-# manager is not set, the default behavior in this implementation
-# is to cache for 30 seconds.
-#
-# NOTE: setting this to anything other than the default value can have
-#       serious security implications. Do not set it unless
-#       you are sure you are not exposed to DNS spoofing attack.
-#
-#networkaddress.cache.ttl=-1
-
-# The Java-level namelookup cache policy for failed lookups:
-#
-# any negative value: cache forever
-# any positive value: the number of seconds to cache negative lookup results
-# zero: do not cache
-#
-# In some Microsoft Windows networking environments that employ
-# the WINS name service in addition to DNS, name service lookups
-# that fail may take a noticeably long time to return (approx. 5 seconds).
-# For this reason the default caching policy is to maintain these
-# results for 10 seconds.
-#
-#
-networkaddress.cache.negative.ttl=10
-
-#
-# Properties to configure OCSP for certificate revocation checking
-#
-
-# Enable OCSP
-#
-# By default, OCSP is not used for certificate revocation checking.
-# This property enables the use of OCSP when set to the value "true".
-#
-# NOTE: SocketPermission is required to connect to an OCSP responder.
-#
-# Example,
-#   ocsp.enable=true
-
-#
-# Location of the OCSP responder
-#
-# By default, the location of the OCSP responder is determined implicitly
-# from the certificate being validated. This property explicitly specifies
-# the location of the OCSP responder. The property is used when the
-# Authority Information Access extension (defined in RFC 3280) is absent
-# from the certificate or when it requires overriding.
-#
-# Example,
-#   ocsp.responderURL=http://ocsp.example.net:80
-
-#
-# Subject name of the OCSP responder's certificate
-#
-# By default, the certificate of the OCSP responder is that of the issuer
-# of the certificate being validated. This property identifies the certificate
-# of the OCSP responder when the default does not apply. Its value is a string
-# distinguished name (defined in RFC 2253) which identifies a certificate in
-# the set of certificates supplied during cert path validation. In cases where
-# the subject name alone is not sufficient to uniquely identify the certificate
-# then both the "ocsp.responderCertIssuerName" and
-# "ocsp.responderCertSerialNumber" properties must be used instead. When this
-# property is set then those two properties are ignored.
-#
-# Example,
-#   ocsp.responderCertSubjectName="CN=OCSP Responder, O=XYZ Corp"
-
-#
-# Issuer name of the OCSP responder's certificate
-#
-# By default, the certificate of the OCSP responder is that of the issuer
-# of the certificate being validated. This property identifies the certificate
-# of the OCSP responder when the default does not apply. Its value is a string
-# distinguished name (defined in RFC 2253) which identifies a certificate in
-# the set of certificates supplied during cert path validation. When this
-# property is set then the "ocsp.responderCertSerialNumber" property must also
-# be set. When the "ocsp.responderCertSubjectName" property is set then this
-# property is ignored.
-#
-# Example,
-#   ocsp.responderCertIssuerName="CN=Enterprise CA, O=XYZ Corp"
-
-#
-# Serial number of the OCSP responder's certificate
-#
-# By default, the certificate of the OCSP responder is that of the issuer
-# of the certificate being validated. This property identifies the certificate
-# of the OCSP responder when the default does not apply. Its value is a string
-# of hexadecimal digits (colon or space separators may be present) which
-# identifies a certificate in the set of certificates supplied during cert path
-# validation. When this property is set then the "ocsp.responderCertIssuerName"
-# property must also be set. When the "ocsp.responderCertSubjectName" property
-# is set then this property is ignored.
-#
-# Example,
-#   ocsp.responderCertSerialNumber=2A:FF:00
-
-#
-# Policy for failed Kerberos KDC lookups:
-#
-# When a KDC is unavailable (network error, service failure, etc), it is
-# put inside a blacklist and accessed less often for future requests. The
-# value (case-insensitive) for this policy can be:
-#
-# tryLast
-#    KDCs in the blacklist are always tried after those not on the list.
-#
-# tryLess[:max_retries,timeout]
-#    KDCs in the blacklist are still tried by their order in the configuration,
-#    but with smaller max_retries and timeout values. max_retries and timeout
-#    are optional numerical parameters (default 1 and 5000, which means once
-#    and 5 seconds). Please notes that if any of the values defined here is
-#    more than what is defined in krb5.conf, it will be ignored.
-#
-# Whenever a KDC is detected as available, it is removed from the blacklist.
-# The blacklist is reset when krb5.conf is reloaded. You can add
-# refreshKrb5Config=true to a JAAS configuration file so that krb5.conf is
-# reloaded whenever a JAAS authentication is attempted.
-#
-# Example,
-#   krb5.kdc.bad.policy = tryLast
-#   krb5.kdc.bad.policy = tryLess:2,2000
-krb5.kdc.bad.policy = tryLast
-
-# Algorithm restrictions for certification path (CertPath) processing
-#
-# In some environments, certain algorithms or key lengths may be undesirable
-# for certification path building and validation.  For example, "MD2" is
-# generally no longer considered to be a secure hash algorithm.  This section
-# describes the mechanism for disabling algorithms based on algorithm name
-# and/or key length.  This includes algorithms used in certificates, as well
-# as revocation information such as CRLs and signed OCSP Responses.
-#
-# The syntax of the disabled algorithm string is described as this Java
-# BNF-style:
-#   DisabledAlgorithms:
-#       " DisabledAlgorithm { , DisabledAlgorithm } "
-#
-#   DisabledAlgorithm:
-#       AlgorithmName [Constraint]
-#
-#   AlgorithmName:
-#       (see below)
-#
-#   Constraint:
-#       KeySizeConstraint
-#
-#   KeySizeConstraint:
-#       keySize Operator DecimalInteger
-#
-#   Operator:
-#       <= | < | == | != | >= | >
-#
-#   DecimalInteger:
-#       DecimalDigits
-#
-#   DecimalDigits:
-#       DecimalDigit {DecimalDigit}
-#
-#   DecimalDigit: one of
-#       1 2 3 4 5 6 7 8 9 0
-#
-# The "AlgorithmName" is the standard algorithm name of the disabled
-# algorithm. See "Java Cryptography Architecture Standard Algorithm Name
-# Documentation" for information about Standard Algorithm Names.  Matching
-# is performed using a case-insensitive sub-element matching rule.  (For
-# example, in "SHA1withECDSA" the sub-elements are "SHA1" for hashing and
-# "ECDSA" for signatures.)  If the assertion "AlgorithmName" is a
-# sub-element of the certificate algorithm name, the algorithm will be
-# rejected during certification path building and validation.  For example,
-# the assertion algorithm name "DSA" will disable all certificate algorithms
-# that rely on DSA, such as NONEwithDSA, SHA1withDSA.  However, the assertion
-# will not disable algorithms related to "ECDSA".
-#
-# A "Constraint" provides further guidance for the algorithm being specified.
-# The "KeySizeConstraint" requires a key of a valid size range if the
-# "AlgorithmName" is of a key algorithm.  The "DecimalInteger" indicates the
-# key size specified in number of bits.  For example, "RSA keySize <= 1024"
-# indicates that any RSA key with key size less than or equal to 1024 bits
-# should be disabled, and "RSA keySize < 1024, RSA keySize > 2048" indicates
-# that any RSA key with key size less than 1024 or greater than 2048 should
-# be disabled. Note that the "KeySizeConstraint" only makes sense to key
-# algorithms.
-#
-# Note: This property is currently used by Oracle's PKIX implementation. It
-# is not guaranteed to be examined and used by other implementations.
-#
-# Example:
-#   jdk.certpath.disabledAlgorithms=MD2, DSA, RSA keySize < 2048
-#
-#
-jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024
-
-# Algorithm restrictions for Secure Socket Layer/Transport Layer Security
-# (SSL/TLS) processing
-#
-# In some environments, certain algorithms or key lengths may be undesirable
-# when using SSL/TLS.  This section describes the mechanism for disabling
-# algorithms during SSL/TLS security parameters negotiation, including cipher
-# suites selection, peer authentication and key exchange mechanisms.
-#
-# For PKI-based peer authentication and key exchange mechanisms, this list
-# of disabled algorithms will also be checked during certification path
-# building and validation, including algorithms used in certificates, as
-# well as revocation information such as CRLs and signed OCSP Responses.
-# This is in addition to the jdk.certpath.disabledAlgorithms property above.
-#
-# See the specification of "jdk.certpath.disabledAlgorithms" for the
-# syntax of the disabled algorithm string.
-#
-# Note: This property is currently used by Oracle's JSSE implementation.
-# It is not guaranteed to be examined and used by other implementations.
-#
-# Example:
-#   jdk.tls.disabledAlgorithms=MD5, SHA1, DSA, RSA keySize < 2048
diff --git a/jdk/src/share/lib/security/java.security-linux b/jdk/src/share/lib/security/java.security-linux
deleted file mode 100644
index 6f4204cf791..00000000000
--- a/jdk/src/share/lib/security/java.security-linux
+++ /dev/null
@@ -1,496 +0,0 @@
-#
-# This is the "master security properties file".
-#
-# An alternate java.security properties file may be specified
-# from the command line via the system property
-#
-#    -Djava.security.properties=
-#
-# This properties file appends to the master security properties file.
-# If both properties files specify values for the same key, the value
-# from the command-line properties file is selected, as it is the last
-# one loaded.
-#
-# Also, if you specify
-#
-#    -Djava.security.properties== (2 equals),
-#
-# then that properties file completely overrides the master security
-# properties file.
-#
-# To disable the ability to specify an additional properties file from
-# the command line, set the key security.overridePropertiesFile
-# to false in the master security properties file. It is set to true
-# by default.
-
-# In this file, various security properties are set for use by
-# java.security classes. This is where users can statically register
-# Cryptography Package Providers ("providers" for short). The term
-# "provider" refers to a package or set of packages that supply a
-# concrete implementation of a subset of the cryptography aspects of
-# the Java Security API. A provider may, for example, implement one or
-# more digital signature algorithms or message digest algorithms.
-#
-# Each provider must implement a subclass of the Provider class.
-# To register a provider in this master security properties file,
-# specify the Provider subclass name and priority in the format
-#
-#    security.provider.=
-#
-# This declares a provider, and specifies its preference
-# order n. The preference order is the order in which providers are
-# searched for requested algorithms (when no specific provider is
-# requested). The order is 1-based; 1 is the most preferred, followed
-# by 2, and so on.
-#
-#  must specify the subclass of the Provider class whose
-# constructor sets the values of various properties that are required
-# for the Java Security API to look up the algorithms or other
-# facilities implemented by the provider.
-#
-# There must be at least one provider specification in java.security.
-# There is a default provider that comes standard with the JDK. It
-# is called the "SUN" provider, and its Provider subclass
-# named Sun appears in the sun.security.provider package. Thus, the
-# "SUN" provider is registered via the following:
-#
-#    security.provider.1=sun.security.provider.Sun
-#
-# (The number 1 is used for the default provider.)
-#
-# Note: Providers can be dynamically registered instead by calls to
-# either the addProvider or insertProviderAt method in the Security
-# class.
-
-#
-# List of providers and their preference orders (see above):
-#
-security.provider.1=sun.security.provider.Sun
-security.provider.2=sun.security.rsa.SunRsaSign
-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
-
-#
-# Sun Provider SecureRandom seed source.
-#
-# Select the primary source of seed data for the "SHA1PRNG" and
-# "NativePRNG" SecureRandom implementations in the "Sun" provider.
-# (Other SecureRandom implementations might also use this property.)
-#
-# On Unix-like systems (for example, Solaris/Linux/MacOS), the
-# "NativePRNG" and "SHA1PRNG" implementations obtains seed data from
-# special device files such as file:/dev/random.
-#
-# On Windows systems, specifying the URLs "file:/dev/random" or
-# "file:/dev/urandom" will enable the native Microsoft CryptoAPI seeding
-# mechanism for SHA1PRNG.
-#
-# By default, an attempt is made to use the entropy gathering device
-# specified by the "securerandom.source" Security property.  If an
-# exception occurs while accessing the specified URL:
-#
-#     SHA1PRNG:
-#         the traditional system/thread activity algorithm will be used.
-#
-#     NativePRNG:
-#         a default value of /dev/random will be used.  If neither
-#         are available, the implementation will be disabled.
-#         "file" is the only currently supported protocol type.
-#
-# The entropy gathering device can also be specified with the System
-# property "java.security.egd". For example:
-#
-#   % java -Djava.security.egd=file:/dev/random MainClass
-#
-# Specifying this System property will override the
-# "securerandom.source" Security property.
-#
-# In addition, if "file:/dev/random" or "file:/dev/urandom" is
-# specified, the "NativePRNG" implementation will be more preferred than
-# SHA1PRNG in the Sun provider.
-#
-securerandom.source=file:/dev/random
-
-#
-# A list of known strong SecureRandom implementations.
-#
-# To help guide applications in selecting a suitable strong
-# java.security.SecureRandom implementation, Java distributions should
-# indicate a list of known strong implementations using the property.
-#
-# This is a comma-separated list of algorithm and/or algorithm:provider
-# entries.
-#
-securerandom.strongAlgorithms=NativePRNGBlocking:SUN
-
-#
-# Class to instantiate as the javax.security.auth.login.Configuration
-# provider.
-#
-login.configuration.provider=sun.security.provider.ConfigFile
-
-#
-# Default login configuration file
-#
-#login.config.url.1=file:${user.home}/.java.login.config
-
-#
-# Class to instantiate as the system Policy. This is the name of the class
-# that will be used as the Policy object.
-#
-policy.provider=sun.security.provider.PolicyFile
-
-# The default is to have a single system-wide policy file,
-# and a policy file in the user's home directory.
-policy.url.1=file:${java.home}/lib/security/java.policy
-policy.url.2=file:${user.home}/.java.policy
-
-# whether or not we expand properties in the policy file
-# if this is set to false, properties (${...}) will not be expanded in policy
-# files.
-policy.expandProperties=true
-
-# whether or not we allow an extra policy to be passed on the command line
-# with -Djava.security.policy=somefile. Comment out this line to disable
-# this feature.
-policy.allowSystemProperty=true
-
-# whether or not we look into the IdentityScope for trusted Identities
-# when encountering a 1.1 signed JAR file. If the identity is found
-# and is trusted, we grant it AllPermission.
-policy.ignoreIdentityScope=false
-
-#
-# Default keystore type.
-#
-keystore.type=jks
-
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageAccess unless the
-# corresponding RuntimePermission ("accessClassInPackage."+package) has
-# been granted.
-package.access=sun.,\
-               com.sun.xml.internal.,\
-               com.sun.imageio.,\
-               com.sun.istack.internal.,\
-               com.sun.jmx.,\
-               com.sun.media.sound.,\
-               com.sun.naming.internal.,\
-               com.sun.proxy.,\
-               com.sun.corba.se.,\
-               com.sun.org.apache.bcel.internal.,\
-               com.sun.org.apache.regexp.internal.,\
-               com.sun.org.apache.xerces.internal.,\
-               com.sun.org.apache.xpath.internal.,\
-               com.sun.org.apache.xalan.internal.extensions.,\
-               com.sun.org.apache.xalan.internal.lib.,\
-               com.sun.org.apache.xalan.internal.res.,\
-               com.sun.org.apache.xalan.internal.templates.,\
-               com.sun.org.apache.xalan.internal.utils.,\
-               com.sun.org.apache.xalan.internal.xslt.,\
-               com.sun.org.apache.xalan.internal.xsltc.cmdline.,\
-               com.sun.org.apache.xalan.internal.xsltc.compiler.,\
-               com.sun.org.apache.xalan.internal.xsltc.trax.,\
-               com.sun.org.apache.xalan.internal.xsltc.util.,\
-               com.sun.org.apache.xml.internal.res.,\
-               com.sun.org.apache.xml.internal.security.,\
-               com.sun.org.apache.xml.internal.serializer.utils.,\
-               com.sun.org.apache.xml.internal.utils.,\
-               com.sun.org.glassfish.,\
-               com.oracle.xmlns.internal.,\
-               com.oracle.webservices.internal.,\
-               org.jcp.xml.dsig.internal.,\
-               jdk.internal.,\
-               jdk.nashorn.internal.,\
-               jdk.nashorn.tools.,\
-               com.sun.activation.registries.
-
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageDefinition unless the
-# corresponding RuntimePermission ("defineClassInPackage."+package) has
-# been granted.
-#
-# by default, none of the class loaders supplied with the JDK call
-# checkPackageDefinition.
-#
-package.definition=sun.,\
-                   com.sun.xml.internal.,\
-                   com.sun.imageio.,\
-                   com.sun.istack.internal.,\
-                   com.sun.jmx.,\
-                   com.sun.media.sound.,\
-                   com.sun.naming.internal.,\
-                   com.sun.proxy.,\
-                   com.sun.corba.se.,\
-                   com.sun.org.apache.bcel.internal.,\
-                   com.sun.org.apache.regexp.internal.,\
-                   com.sun.org.apache.xerces.internal.,\
-                   com.sun.org.apache.xpath.internal.,\
-                   com.sun.org.apache.xalan.internal.extensions.,\
-                   com.sun.org.apache.xalan.internal.lib.,\
-                   com.sun.org.apache.xalan.internal.res.,\
-                   com.sun.org.apache.xalan.internal.templates.,\
-                   com.sun.org.apache.xalan.internal.utils.,\
-                   com.sun.org.apache.xalan.internal.xslt.,\
-                   com.sun.org.apache.xalan.internal.xsltc.cmdline.,\
-                   com.sun.org.apache.xalan.internal.xsltc.compiler.,\
-                   com.sun.org.apache.xalan.internal.xsltc.trax.,\
-                   com.sun.org.apache.xalan.internal.xsltc.util.,\
-                   com.sun.org.apache.xml.internal.res.,\
-                   com.sun.org.apache.xml.internal.security.,\
-                   com.sun.org.apache.xml.internal.serializer.utils.,\
-                   com.sun.org.apache.xml.internal.utils.,\
-                   com.sun.org.glassfish.,\
-                   com.oracle.xmlns.internal.,\
-                   com.oracle.webservices.internal.,\
-                   org.jcp.xml.dsig.internal.,\
-                   jdk.internal.,\
-                   jdk.nashorn.internal.,\
-                   jdk.nashorn.tools.,\
-                   com.sun.activation.registries.
-
-#
-# Determines whether this properties file can be appended to
-# or overridden on the command line via -Djava.security.properties
-#
-security.overridePropertiesFile=true
-
-#
-# Determines the default key and trust manager factory algorithms for
-# the javax.net.ssl package.
-#
-ssl.KeyManagerFactory.algorithm=SunX509
-ssl.TrustManagerFactory.algorithm=PKIX
-
-#
-# The Java-level namelookup cache policy for successful lookups:
-#
-# any negative value: caching forever
-# any positive value: the number of seconds to cache an address for
-# zero: do not cache
-#
-# default value is forever (FOREVER). For security reasons, this
-# caching is made forever when a security manager is set. When a security
-# manager is not set, the default behavior in this implementation
-# is to cache for 30 seconds.
-#
-# NOTE: setting this to anything other than the default value can have
-#       serious security implications. Do not set it unless
-#       you are sure you are not exposed to DNS spoofing attack.
-#
-#networkaddress.cache.ttl=-1
-
-# The Java-level namelookup cache policy for failed lookups:
-#
-# any negative value: cache forever
-# any positive value: the number of seconds to cache negative lookup results
-# zero: do not cache
-#
-# In some Microsoft Windows networking environments that employ
-# the WINS name service in addition to DNS, name service lookups
-# that fail may take a noticeably long time to return (approx. 5 seconds).
-# For this reason the default caching policy is to maintain these
-# results for 10 seconds.
-#
-#
-networkaddress.cache.negative.ttl=10
-
-#
-# Properties to configure OCSP for certificate revocation checking
-#
-
-# Enable OCSP
-#
-# By default, OCSP is not used for certificate revocation checking.
-# This property enables the use of OCSP when set to the value "true".
-#
-# NOTE: SocketPermission is required to connect to an OCSP responder.
-#
-# Example,
-#   ocsp.enable=true
-
-#
-# Location of the OCSP responder
-#
-# By default, the location of the OCSP responder is determined implicitly
-# from the certificate being validated. This property explicitly specifies
-# the location of the OCSP responder. The property is used when the
-# Authority Information Access extension (defined in RFC 3280) is absent
-# from the certificate or when it requires overriding.
-#
-# Example,
-#   ocsp.responderURL=http://ocsp.example.net:80
-
-#
-# Subject name of the OCSP responder's certificate
-#
-# By default, the certificate of the OCSP responder is that of the issuer
-# of the certificate being validated. This property identifies the certificate
-# of the OCSP responder when the default does not apply. Its value is a string
-# distinguished name (defined in RFC 2253) which identifies a certificate in
-# the set of certificates supplied during cert path validation. In cases where
-# the subject name alone is not sufficient to uniquely identify the certificate
-# then both the "ocsp.responderCertIssuerName" and
-# "ocsp.responderCertSerialNumber" properties must be used instead. When this
-# property is set then those two properties are ignored.
-#
-# Example,
-#   ocsp.responderCertSubjectName="CN=OCSP Responder, O=XYZ Corp"
-
-#
-# Issuer name of the OCSP responder's certificate
-#
-# By default, the certificate of the OCSP responder is that of the issuer
-# of the certificate being validated. This property identifies the certificate
-# of the OCSP responder when the default does not apply. Its value is a string
-# distinguished name (defined in RFC 2253) which identifies a certificate in
-# the set of certificates supplied during cert path validation. When this
-# property is set then the "ocsp.responderCertSerialNumber" property must also
-# be set. When the "ocsp.responderCertSubjectName" property is set then this
-# property is ignored.
-#
-# Example,
-#   ocsp.responderCertIssuerName="CN=Enterprise CA, O=XYZ Corp"
-
-#
-# Serial number of the OCSP responder's certificate
-#
-# By default, the certificate of the OCSP responder is that of the issuer
-# of the certificate being validated. This property identifies the certificate
-# of the OCSP responder when the default does not apply. Its value is a string
-# of hexadecimal digits (colon or space separators may be present) which
-# identifies a certificate in the set of certificates supplied during cert path
-# validation. When this property is set then the "ocsp.responderCertIssuerName"
-# property must also be set. When the "ocsp.responderCertSubjectName" property
-# is set then this property is ignored.
-#
-# Example,
-#   ocsp.responderCertSerialNumber=2A:FF:00
-
-#
-# Policy for failed Kerberos KDC lookups:
-#
-# When a KDC is unavailable (network error, service failure, etc), it is
-# put inside a blacklist and accessed less often for future requests. The
-# value (case-insensitive) for this policy can be:
-#
-# tryLast
-#    KDCs in the blacklist are always tried after those not on the list.
-#
-# tryLess[:max_retries,timeout]
-#    KDCs in the blacklist are still tried by their order in the configuration,
-#    but with smaller max_retries and timeout values. max_retries and timeout
-#    are optional numerical parameters (default 1 and 5000, which means once
-#    and 5 seconds). Please notes that if any of the values defined here is
-#    more than what is defined in krb5.conf, it will be ignored.
-#
-# Whenever a KDC is detected as available, it is removed from the blacklist.
-# The blacklist is reset when krb5.conf is reloaded. You can add
-# refreshKrb5Config=true to a JAAS configuration file so that krb5.conf is
-# reloaded whenever a JAAS authentication is attempted.
-#
-# Example,
-#   krb5.kdc.bad.policy = tryLast
-#   krb5.kdc.bad.policy = tryLess:2,2000
-krb5.kdc.bad.policy = tryLast
-
-# Algorithm restrictions for certification path (CertPath) processing
-#
-# In some environments, certain algorithms or key lengths may be undesirable
-# for certification path building and validation.  For example, "MD2" is
-# generally no longer considered to be a secure hash algorithm.  This section
-# describes the mechanism for disabling algorithms based on algorithm name
-# and/or key length.  This includes algorithms used in certificates, as well
-# as revocation information such as CRLs and signed OCSP Responses.
-#
-# The syntax of the disabled algorithm string is described as this Java
-# BNF-style:
-#   DisabledAlgorithms:
-#       " DisabledAlgorithm { , DisabledAlgorithm } "
-#
-#   DisabledAlgorithm:
-#       AlgorithmName [Constraint]
-#
-#   AlgorithmName:
-#       (see below)
-#
-#   Constraint:
-#       KeySizeConstraint
-#
-#   KeySizeConstraint:
-#       keySize Operator DecimalInteger
-#
-#   Operator:
-#       <= | < | == | != | >= | >
-#
-#   DecimalInteger:
-#       DecimalDigits
-#
-#   DecimalDigits:
-#       DecimalDigit {DecimalDigit}
-#
-#   DecimalDigit: one of
-#       1 2 3 4 5 6 7 8 9 0
-#
-# The "AlgorithmName" is the standard algorithm name of the disabled
-# algorithm. See "Java Cryptography Architecture Standard Algorithm Name
-# Documentation" for information about Standard Algorithm Names.  Matching
-# is performed using a case-insensitive sub-element matching rule.  (For
-# example, in "SHA1withECDSA" the sub-elements are "SHA1" for hashing and
-# "ECDSA" for signatures.)  If the assertion "AlgorithmName" is a
-# sub-element of the certificate algorithm name, the algorithm will be
-# rejected during certification path building and validation.  For example,
-# the assertion algorithm name "DSA" will disable all certificate algorithms
-# that rely on DSA, such as NONEwithDSA, SHA1withDSA.  However, the assertion
-# will not disable algorithms related to "ECDSA".
-#
-# A "Constraint" provides further guidance for the algorithm being specified.
-# The "KeySizeConstraint" requires a key of a valid size range if the
-# "AlgorithmName" is of a key algorithm.  The "DecimalInteger" indicates the
-# key size specified in number of bits.  For example, "RSA keySize <= 1024"
-# indicates that any RSA key with key size less than or equal to 1024 bits
-# should be disabled, and "RSA keySize < 1024, RSA keySize > 2048" indicates
-# that any RSA key with key size less than 1024 or greater than 2048 should
-# be disabled. Note that the "KeySizeConstraint" only makes sense to key
-# algorithms.
-#
-# Note: This property is currently used by Oracle's PKIX implementation. It
-# is not guaranteed to be examined and used by other implementations.
-#
-# Example:
-#   jdk.certpath.disabledAlgorithms=MD2, DSA, RSA keySize < 2048
-#
-#
-jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024
-
-# Algorithm restrictions for Secure Socket Layer/Transport Layer Security
-# (SSL/TLS) processing
-#
-# In some environments, certain algorithms or key lengths may be undesirable
-# when using SSL/TLS.  This section describes the mechanism for disabling
-# algorithms during SSL/TLS security parameters negotiation, including cipher
-# suites selection, peer authentication and key exchange mechanisms.
-#
-# For PKI-based peer authentication and key exchange mechanisms, this list
-# of disabled algorithms will also be checked during certification path
-# building and validation, including algorithms used in certificates, as
-# well as revocation information such as CRLs and signed OCSP Responses.
-# This is in addition to the jdk.certpath.disabledAlgorithms property above.
-#
-# See the specification of "jdk.certpath.disabledAlgorithms" for the
-# syntax of the disabled algorithm string.
-#
-# Note: This property is currently used by Oracle's JSSE implementation.
-# It is not guaranteed to be examined and used by other implementations.
-#
-# Example:
-#   jdk.tls.disabledAlgorithms=MD5, SHA1, DSA, RSA keySize < 2048
diff --git a/jdk/src/share/lib/security/java.security-macosx b/jdk/src/share/lib/security/java.security-macosx
deleted file mode 100644
index ff726991c56..00000000000
--- a/jdk/src/share/lib/security/java.security-macosx
+++ /dev/null
@@ -1,499 +0,0 @@
-#
-# This is the "master security properties file".
-#
-# An alternate java.security properties file may be specified
-# from the command line via the system property
-#
-#    -Djava.security.properties=
-#
-# This properties file appends to the master security properties file.
-# If both properties files specify values for the same key, the value
-# from the command-line properties file is selected, as it is the last
-# one loaded.
-#
-# Also, if you specify
-#
-#    -Djava.security.properties== (2 equals),
-#
-# then that properties file completely overrides the master security
-# properties file.
-#
-# To disable the ability to specify an additional properties file from
-# the command line, set the key security.overridePropertiesFile
-# to false in the master security properties file. It is set to true
-# by default.
-
-# In this file, various security properties are set for use by
-# java.security classes. This is where users can statically register
-# Cryptography Package Providers ("providers" for short). The term
-# "provider" refers to a package or set of packages that supply a
-# concrete implementation of a subset of the cryptography aspects of
-# the Java Security API. A provider may, for example, implement one or
-# more digital signature algorithms or message digest algorithms.
-#
-# Each provider must implement a subclass of the Provider class.
-# To register a provider in this master security properties file,
-# specify the Provider subclass name and priority in the format
-#
-#    security.provider.=
-#
-# This declares a provider, and specifies its preference
-# order n. The preference order is the order in which providers are
-# searched for requested algorithms (when no specific provider is
-# requested). The order is 1-based; 1 is the most preferred, followed
-# by 2, and so on.
-#
-#  must specify the subclass of the Provider class whose
-# constructor sets the values of various properties that are required
-# for the Java Security API to look up the algorithms or other
-# facilities implemented by the provider.
-#
-# There must be at least one provider specification in java.security.
-# There is a default provider that comes standard with the JDK. It
-# is called the "SUN" provider, and its Provider subclass
-# named Sun appears in the sun.security.provider package. Thus, the
-# "SUN" provider is registered via the following:
-#
-#    security.provider.1=sun.security.provider.Sun
-#
-# (The number 1 is used for the default provider.)
-#
-# Note: Providers can be dynamically registered instead by calls to
-# either the addProvider or insertProviderAt method in the Security
-# class.
-
-#
-# List of providers and their preference orders (see above):
-#
-security.provider.1=sun.security.provider.Sun
-security.provider.2=sun.security.rsa.SunRsaSign
-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=apple.security.AppleProvider
-
-#
-# Sun Provider SecureRandom seed source.
-#
-# Select the primary source of seed data for the "SHA1PRNG" and
-# "NativePRNG" SecureRandom implementations in the "Sun" provider.
-# (Other SecureRandom implementations might also use this property.)
-#
-# On Unix-like systems (for example, Solaris/Linux/MacOS), the
-# "NativePRNG" and "SHA1PRNG" implementations obtains seed data from
-# special device files such as file:/dev/random.
-#
-# On Windows systems, specifying the URLs "file:/dev/random" or
-# "file:/dev/urandom" will enable the native Microsoft CryptoAPI seeding
-# mechanism for SHA1PRNG.
-#
-# By default, an attempt is made to use the entropy gathering device
-# specified by the "securerandom.source" Security property.  If an
-# exception occurs while accessing the specified URL:
-#
-#     SHA1PRNG:
-#         the traditional system/thread activity algorithm will be used.
-#
-#     NativePRNG:
-#         a default value of /dev/random will be used.  If neither
-#         are available, the implementation will be disabled.
-#         "file" is the only currently supported protocol type.
-#
-# The entropy gathering device can also be specified with the System
-# property "java.security.egd". For example:
-#
-#   % java -Djava.security.egd=file:/dev/random MainClass
-#
-# Specifying this System property will override the
-# "securerandom.source" Security property.
-#
-# In addition, if "file:/dev/random" or "file:/dev/urandom" is
-# specified, the "NativePRNG" implementation will be more preferred than
-# SHA1PRNG in the Sun provider.
-#
-securerandom.source=file:/dev/random
-
-#
-# A list of known strong SecureRandom implementations.
-#
-# To help guide applications in selecting a suitable strong
-# java.security.SecureRandom implementation, Java distributions should
-# indicate a list of known strong implementations using the property.
-#
-# This is a comma-separated list of algorithm and/or algorithm:provider
-# entries.
-#
-securerandom.strongAlgorithms=NativePRNGBlocking:SUN
-
-#
-# Class to instantiate as the javax.security.auth.login.Configuration
-# provider.
-#
-login.configuration.provider=sun.security.provider.ConfigFile
-
-#
-# Default login configuration file
-#
-#login.config.url.1=file:${user.home}/.java.login.config
-
-#
-# Class to instantiate as the system Policy. This is the name of the class
-# that will be used as the Policy object.
-#
-policy.provider=sun.security.provider.PolicyFile
-
-# The default is to have a single system-wide policy file,
-# and a policy file in the user's home directory.
-policy.url.1=file:${java.home}/lib/security/java.policy
-policy.url.2=file:${user.home}/.java.policy
-
-# whether or not we expand properties in the policy file
-# if this is set to false, properties (${...}) will not be expanded in policy
-# files.
-policy.expandProperties=true
-
-# whether or not we allow an extra policy to be passed on the command line
-# with -Djava.security.policy=somefile. Comment out this line to disable
-# this feature.
-policy.allowSystemProperty=true
-
-# whether or not we look into the IdentityScope for trusted Identities
-# when encountering a 1.1 signed JAR file. If the identity is found
-# and is trusted, we grant it AllPermission.
-policy.ignoreIdentityScope=false
-
-#
-# Default keystore type.
-#
-keystore.type=jks
-
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageAccess unless the
-# corresponding RuntimePermission ("accessClassInPackage."+package) has
-# been granted.
-package.access=sun.,\
-               com.sun.xml.internal.,\
-               com.sun.imageio.,\
-               com.sun.istack.internal.,\
-               com.sun.jmx.,\
-               com.sun.media.sound.,\
-               com.sun.naming.internal.,\
-               com.sun.proxy.,\
-               com.sun.corba.se.,\
-               com.sun.org.apache.bcel.internal.,\
-               com.sun.org.apache.regexp.internal.,\
-               com.sun.org.apache.xerces.internal.,\
-               com.sun.org.apache.xpath.internal.,\
-               com.sun.org.apache.xalan.internal.extensions.,\
-               com.sun.org.apache.xalan.internal.lib.,\
-               com.sun.org.apache.xalan.internal.res.,\
-               com.sun.org.apache.xalan.internal.templates.,\
-               com.sun.org.apache.xalan.internal.utils.,\
-               com.sun.org.apache.xalan.internal.xslt.,\
-               com.sun.org.apache.xalan.internal.xsltc.cmdline.,\
-               com.sun.org.apache.xalan.internal.xsltc.compiler.,\
-               com.sun.org.apache.xalan.internal.xsltc.trax.,\
-               com.sun.org.apache.xalan.internal.xsltc.util.,\
-               com.sun.org.apache.xml.internal.res.,\
-               com.sun.org.apache.xml.internal.security.,\
-               com.sun.org.apache.xml.internal.serializer.utils.,\
-               com.sun.org.apache.xml.internal.utils.,\
-               com.sun.org.glassfish.,\
-               com.oracle.xmlns.internal.,\
-               com.oracle.webservices.internal.,\
-               org.jcp.xml.dsig.internal.,\
-               jdk.internal.,\
-               jdk.nashorn.internal.,\
-               jdk.nashorn.tools.,\
-               com.sun.activation.registries.,\
-               apple.
-
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageDefinition unless the
-# corresponding RuntimePermission ("defineClassInPackage."+package) has
-# been granted.
-#
-# by default, none of the class loaders supplied with the JDK call
-# checkPackageDefinition.
-#
-package.definition=sun.,\
-                   com.sun.xml.internal.,\
-                   com.sun.imageio.,\
-                   com.sun.istack.internal.,\
-                   com.sun.jmx.,\
-                   com.sun.media.sound.,\
-                   com.sun.naming.internal.,\
-                   com.sun.proxy.,\
-                   com.sun.corba.se.,\
-                   com.sun.org.apache.bcel.internal.,\
-                   com.sun.org.apache.regexp.internal.,\
-                   com.sun.org.apache.xerces.internal.,\
-                   com.sun.org.apache.xpath.internal.,\
-                   com.sun.org.apache.xalan.internal.extensions.,\
-                   com.sun.org.apache.xalan.internal.lib.,\
-                   com.sun.org.apache.xalan.internal.res.,\
-                   com.sun.org.apache.xalan.internal.templates.,\
-                   com.sun.org.apache.xalan.internal.utils.,\
-                   com.sun.org.apache.xalan.internal.xslt.,\
-                   com.sun.org.apache.xalan.internal.xsltc.cmdline.,\
-                   com.sun.org.apache.xalan.internal.xsltc.compiler.,\
-                   com.sun.org.apache.xalan.internal.xsltc.trax.,\
-                   com.sun.org.apache.xalan.internal.xsltc.util.,\
-                   com.sun.org.apache.xml.internal.res.,\
-                   com.sun.org.apache.xml.internal.security.,\
-                   com.sun.org.apache.xml.internal.serializer.utils.,\
-                   com.sun.org.apache.xml.internal.utils.,\
-                   com.sun.org.glassfish.,\
-                   com.oracle.xmlns.internal.,\
-                   com.oracle.webservices.internal.,\
-                   org.jcp.xml.dsig.internal.,\
-                   jdk.internal.,\
-                   jdk.nashorn.internal.,\
-                   jdk.nashorn.tools.,\
-                   com.sun.activation.registries.,\
-                   apple.
-
-#
-# Determines whether this properties file can be appended to
-# or overridden on the command line via -Djava.security.properties
-#
-security.overridePropertiesFile=true
-
-#
-# Determines the default key and trust manager factory algorithms for
-# the javax.net.ssl package.
-#
-ssl.KeyManagerFactory.algorithm=SunX509
-ssl.TrustManagerFactory.algorithm=PKIX
-
-#
-# The Java-level namelookup cache policy for successful lookups:
-#
-# any negative value: caching forever
-# any positive value: the number of seconds to cache an address for
-# zero: do not cache
-#
-# default value is forever (FOREVER). For security reasons, this
-# caching is made forever when a security manager is set. When a security
-# manager is not set, the default behavior in this implementation
-# is to cache for 30 seconds.
-#
-# NOTE: setting this to anything other than the default value can have
-#       serious security implications. Do not set it unless
-#       you are sure you are not exposed to DNS spoofing attack.
-#
-#networkaddress.cache.ttl=-1
-
-# The Java-level namelookup cache policy for failed lookups:
-#
-# any negative value: cache forever
-# any positive value: the number of seconds to cache negative lookup results
-# zero: do not cache
-#
-# In some Microsoft Windows networking environments that employ
-# the WINS name service in addition to DNS, name service lookups
-# that fail may take a noticeably long time to return (approx. 5 seconds).
-# For this reason the default caching policy is to maintain these
-# results for 10 seconds.
-#
-#
-networkaddress.cache.negative.ttl=10
-
-#
-# Properties to configure OCSP for certificate revocation checking
-#
-
-# Enable OCSP
-#
-# By default, OCSP is not used for certificate revocation checking.
-# This property enables the use of OCSP when set to the value "true".
-#
-# NOTE: SocketPermission is required to connect to an OCSP responder.
-#
-# Example,
-#   ocsp.enable=true
-
-#
-# Location of the OCSP responder
-#
-# By default, the location of the OCSP responder is determined implicitly
-# from the certificate being validated. This property explicitly specifies
-# the location of the OCSP responder. The property is used when the
-# Authority Information Access extension (defined in RFC 3280) is absent
-# from the certificate or when it requires overriding.
-#
-# Example,
-#   ocsp.responderURL=http://ocsp.example.net:80
-
-#
-# Subject name of the OCSP responder's certificate
-#
-# By default, the certificate of the OCSP responder is that of the issuer
-# of the certificate being validated. This property identifies the certificate
-# of the OCSP responder when the default does not apply. Its value is a string
-# distinguished name (defined in RFC 2253) which identifies a certificate in
-# the set of certificates supplied during cert path validation. In cases where
-# the subject name alone is not sufficient to uniquely identify the certificate
-# then both the "ocsp.responderCertIssuerName" and
-# "ocsp.responderCertSerialNumber" properties must be used instead. When this
-# property is set then those two properties are ignored.
-#
-# Example,
-#   ocsp.responderCertSubjectName="CN=OCSP Responder, O=XYZ Corp"
-
-#
-# Issuer name of the OCSP responder's certificate
-#
-# By default, the certificate of the OCSP responder is that of the issuer
-# of the certificate being validated. This property identifies the certificate
-# of the OCSP responder when the default does not apply. Its value is a string
-# distinguished name (defined in RFC 2253) which identifies a certificate in
-# the set of certificates supplied during cert path validation. When this
-# property is set then the "ocsp.responderCertSerialNumber" property must also
-# be set. When the "ocsp.responderCertSubjectName" property is set then this
-# property is ignored.
-#
-# Example,
-#   ocsp.responderCertIssuerName="CN=Enterprise CA, O=XYZ Corp"
-
-#
-# Serial number of the OCSP responder's certificate
-#
-# By default, the certificate of the OCSP responder is that of the issuer
-# of the certificate being validated. This property identifies the certificate
-# of the OCSP responder when the default does not apply. Its value is a string
-# of hexadecimal digits (colon or space separators may be present) which
-# identifies a certificate in the set of certificates supplied during cert path
-# validation. When this property is set then the "ocsp.responderCertIssuerName"
-# property must also be set. When the "ocsp.responderCertSubjectName" property
-# is set then this property is ignored.
-#
-# Example,
-#   ocsp.responderCertSerialNumber=2A:FF:00
-
-#
-# Policy for failed Kerberos KDC lookups:
-#
-# When a KDC is unavailable (network error, service failure, etc), it is
-# put inside a blacklist and accessed less often for future requests. The
-# value (case-insensitive) for this policy can be:
-#
-# tryLast
-#    KDCs in the blacklist are always tried after those not on the list.
-#
-# tryLess[:max_retries,timeout]
-#    KDCs in the blacklist are still tried by their order in the configuration,
-#    but with smaller max_retries and timeout values. max_retries and timeout
-#    are optional numerical parameters (default 1 and 5000, which means once
-#    and 5 seconds). Please notes that if any of the values defined here is
-#    more than what is defined in krb5.conf, it will be ignored.
-#
-# Whenever a KDC is detected as available, it is removed from the blacklist.
-# The blacklist is reset when krb5.conf is reloaded. You can add
-# refreshKrb5Config=true to a JAAS configuration file so that krb5.conf is
-# reloaded whenever a JAAS authentication is attempted.
-#
-# Example,
-#   krb5.kdc.bad.policy = tryLast
-#   krb5.kdc.bad.policy = tryLess:2,2000
-krb5.kdc.bad.policy = tryLast
-
-# Algorithm restrictions for certification path (CertPath) processing
-#
-# In some environments, certain algorithms or key lengths may be undesirable
-# for certification path building and validation.  For example, "MD2" is
-# generally no longer considered to be a secure hash algorithm.  This section
-# describes the mechanism for disabling algorithms based on algorithm name
-# and/or key length.  This includes algorithms used in certificates, as well
-# as revocation information such as CRLs and signed OCSP Responses.
-#
-# The syntax of the disabled algorithm string is described as this Java
-# BNF-style:
-#   DisabledAlgorithms:
-#       " DisabledAlgorithm { , DisabledAlgorithm } "
-#
-#   DisabledAlgorithm:
-#       AlgorithmName [Constraint]
-#
-#   AlgorithmName:
-#       (see below)
-#
-#   Constraint:
-#       KeySizeConstraint
-#
-#   KeySizeConstraint:
-#       keySize Operator DecimalInteger
-#
-#   Operator:
-#       <= | < | == | != | >= | >
-#
-#   DecimalInteger:
-#       DecimalDigits
-#
-#   DecimalDigits:
-#       DecimalDigit {DecimalDigit}
-#
-#   DecimalDigit: one of
-#       1 2 3 4 5 6 7 8 9 0
-#
-# The "AlgorithmName" is the standard algorithm name of the disabled
-# algorithm. See "Java Cryptography Architecture Standard Algorithm Name
-# Documentation" for information about Standard Algorithm Names.  Matching
-# is performed using a case-insensitive sub-element matching rule.  (For
-# example, in "SHA1withECDSA" the sub-elements are "SHA1" for hashing and
-# "ECDSA" for signatures.)  If the assertion "AlgorithmName" is a
-# sub-element of the certificate algorithm name, the algorithm will be
-# rejected during certification path building and validation.  For example,
-# the assertion algorithm name "DSA" will disable all certificate algorithms
-# that rely on DSA, such as NONEwithDSA, SHA1withDSA.  However, the assertion
-# will not disable algorithms related to "ECDSA".
-#
-# A "Constraint" provides further guidance for the algorithm being specified.
-# The "KeySizeConstraint" requires a key of a valid size range if the
-# "AlgorithmName" is of a key algorithm.  The "DecimalInteger" indicates the
-# key size specified in number of bits.  For example, "RSA keySize <= 1024"
-# indicates that any RSA key with key size less than or equal to 1024 bits
-# should be disabled, and "RSA keySize < 1024, RSA keySize > 2048" indicates
-# that any RSA key with key size less than 1024 or greater than 2048 should
-# be disabled. Note that the "KeySizeConstraint" only makes sense to key
-# algorithms.
-#
-# Note: This property is currently used by Oracle's PKIX implementation. It
-# is not guaranteed to be examined and used by other implementations.
-#
-# Example:
-#   jdk.certpath.disabledAlgorithms=MD2, DSA, RSA keySize < 2048
-#
-#
-jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024
-
-# Algorithm restrictions for Secure Socket Layer/Transport Layer Security
-# (SSL/TLS) processing
-#
-# In some environments, certain algorithms or key lengths may be undesirable
-# when using SSL/TLS.  This section describes the mechanism for disabling
-# algorithms during SSL/TLS security parameters negotiation, including cipher
-# suites selection, peer authentication and key exchange mechanisms.
-#
-# For PKI-based peer authentication and key exchange mechanisms, this list
-# of disabled algorithms will also be checked during certification path
-# building and validation, including algorithms used in certificates, as
-# well as revocation information such as CRLs and signed OCSP Responses.
-# This is in addition to the jdk.certpath.disabledAlgorithms property above.
-#
-# See the specification of "jdk.certpath.disabledAlgorithms" for the
-# syntax of the disabled algorithm string.
-#
-# Note: This property is currently used by Oracle's JSSE implementation.
-# It is not guaranteed to be examined and used by other implementations.
-#
-# Example:
-#   jdk.tls.disabledAlgorithms=MD5, SHA1, DSA, RSA keySize < 2048
diff --git a/jdk/src/share/lib/security/java.security-solaris b/jdk/src/share/lib/security/java.security-solaris
deleted file mode 100644
index e26ff143141..00000000000
--- a/jdk/src/share/lib/security/java.security-solaris
+++ /dev/null
@@ -1,498 +0,0 @@
-#
-# This is the "master security properties file".
-#
-# An alternate java.security properties file may be specified
-# from the command line via the system property
-#
-#    -Djava.security.properties=
-#
-# This properties file appends to the master security properties file.
-# If both properties files specify values for the same key, the value
-# from the command-line properties file is selected, as it is the last
-# one loaded.
-#
-# Also, if you specify
-#
-#    -Djava.security.properties== (2 equals),
-#
-# then that properties file completely overrides the master security
-# properties file.
-#
-# To disable the ability to specify an additional properties file from
-# the command line, set the key security.overridePropertiesFile
-# to false in the master security properties file. It is set to true
-# by default.
-
-# In this file, various security properties are set for use by
-# java.security classes. This is where users can statically register
-# Cryptography Package Providers ("providers" for short). The term
-# "provider" refers to a package or set of packages that supply a
-# concrete implementation of a subset of the cryptography aspects of
-# the Java Security API. A provider may, for example, implement one or
-# more digital signature algorithms or message digest algorithms.
-#
-# Each provider must implement a subclass of the Provider class.
-# To register a provider in this master security properties file,
-# specify the Provider subclass name and priority in the format
-#
-#    security.provider.=
-#
-# This declares a provider, and specifies its preference
-# order n. The preference order is the order in which providers are
-# searched for requested algorithms (when no specific provider is
-# requested). The order is 1-based; 1 is the most preferred, followed
-# by 2, and so on.
-#
-#  must specify the subclass of the Provider class whose
-# constructor sets the values of various properties that are required
-# for the Java Security API to look up the algorithms or other
-# facilities implemented by the provider.
-#
-# There must be at least one provider specification in java.security.
-# There is a default provider that comes standard with the JDK. It
-# is called the "SUN" provider, and its Provider subclass
-# named Sun appears in the sun.security.provider package. Thus, the
-# "SUN" provider is registered via the following:
-#
-#    security.provider.1=sun.security.provider.Sun
-#
-# (The number 1 is used for the default provider.)
-#
-# Note: Providers can be dynamically registered instead by calls to
-# either the addProvider or insertProviderAt method in the Security
-# class.
-
-#
-# List of providers and their preference orders (see above):
-#
-security.provider.1=com.oracle.security.ucrypto.UcryptoProvider ${java.home}/lib/security/ucrypto-solaris.cfg
-security.provider.2=sun.security.pkcs11.SunPKCS11 ${java.home}/lib/security/sunpkcs11-solaris.cfg
-security.provider.3=sun.security.provider.Sun
-security.provider.4=sun.security.rsa.SunRsaSign
-security.provider.5=sun.security.ec.SunEC
-security.provider.6=com.sun.net.ssl.internal.ssl.Provider
-security.provider.7=com.sun.crypto.provider.SunJCE
-security.provider.8=sun.security.jgss.SunProvider
-security.provider.9=com.sun.security.sasl.Provider
-security.provider.10=org.jcp.xml.dsig.internal.dom.XMLDSigRI
-security.provider.11=sun.security.smartcardio.SunPCSC
-
-#
-# Sun Provider SecureRandom seed source.
-#
-# Select the primary source of seed data for the "SHA1PRNG" and
-# "NativePRNG" SecureRandom implementations in the "Sun" provider.
-# (Other SecureRandom implementations might also use this property.)
-#
-# On Unix-like systems (for example, Solaris/Linux/MacOS), the
-# "NativePRNG" and "SHA1PRNG" implementations obtains seed data from
-# special device files such as file:/dev/random.
-#
-# On Windows systems, specifying the URLs "file:/dev/random" or
-# "file:/dev/urandom" will enable the native Microsoft CryptoAPI seeding
-# mechanism for SHA1PRNG.
-#
-# By default, an attempt is made to use the entropy gathering device
-# specified by the "securerandom.source" Security property.  If an
-# exception occurs while accessing the specified URL:
-#
-#     SHA1PRNG:
-#         the traditional system/thread activity algorithm will be used.
-#
-#     NativePRNG:
-#         a default value of /dev/random will be used.  If neither
-#         are available, the implementation will be disabled.
-#         "file" is the only currently supported protocol type.
-#
-# The entropy gathering device can also be specified with the System
-# property "java.security.egd". For example:
-#
-#   % java -Djava.security.egd=file:/dev/random MainClass
-#
-# Specifying this System property will override the
-# "securerandom.source" Security property.
-#
-# In addition, if "file:/dev/random" or "file:/dev/urandom" is
-# specified, the "NativePRNG" implementation will be more preferred than
-# SHA1PRNG in the Sun provider.
-#
-securerandom.source=file:/dev/random
-
-#
-# A list of known strong SecureRandom implementations.
-#
-# To help guide applications in selecting a suitable strong
-# java.security.SecureRandom implementation, Java distributions should
-# indicate a list of known strong implementations using the property.
-#
-# This is a comma-separated list of algorithm and/or algorithm:provider
-# entries.
-#
-securerandom.strongAlgorithms=NativePRNGBlocking:SUN
-
-#
-# Class to instantiate as the javax.security.auth.login.Configuration
-# provider.
-#
-login.configuration.provider=sun.security.provider.ConfigFile
-
-#
-# Default login configuration file
-#
-#login.config.url.1=file:${user.home}/.java.login.config
-
-#
-# Class to instantiate as the system Policy. This is the name of the class
-# that will be used as the Policy object.
-#
-policy.provider=sun.security.provider.PolicyFile
-
-# The default is to have a single system-wide policy file,
-# and a policy file in the user's home directory.
-policy.url.1=file:${java.home}/lib/security/java.policy
-policy.url.2=file:${user.home}/.java.policy
-
-# whether or not we expand properties in the policy file
-# if this is set to false, properties (${...}) will not be expanded in policy
-# files.
-policy.expandProperties=true
-
-# whether or not we allow an extra policy to be passed on the command line
-# with -Djava.security.policy=somefile. Comment out this line to disable
-# this feature.
-policy.allowSystemProperty=true
-
-# whether or not we look into the IdentityScope for trusted Identities
-# when encountering a 1.1 signed JAR file. If the identity is found
-# and is trusted, we grant it AllPermission.
-policy.ignoreIdentityScope=false
-
-#
-# Default keystore type.
-#
-keystore.type=jks
-
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageAccess unless the
-# corresponding RuntimePermission ("accessClassInPackage."+package) has
-# been granted.
-package.access=sun.,\
-               com.sun.xml.internal.,\
-               com.sun.imageio.,\
-               com.sun.istack.internal.,\
-               com.sun.jmx.,\
-               com.sun.media.sound.,\
-               com.sun.naming.internal.,\
-               com.sun.proxy.,\
-               com.sun.corba.se.,\
-               com.sun.org.apache.bcel.internal.,\
-               com.sun.org.apache.regexp.internal.,\
-               com.sun.org.apache.xerces.internal.,\
-               com.sun.org.apache.xpath.internal.,\
-               com.sun.org.apache.xalan.internal.extensions.,\
-               com.sun.org.apache.xalan.internal.lib.,\
-               com.sun.org.apache.xalan.internal.res.,\
-               com.sun.org.apache.xalan.internal.templates.,\
-               com.sun.org.apache.xalan.internal.utils.,\
-               com.sun.org.apache.xalan.internal.xslt.,\
-               com.sun.org.apache.xalan.internal.xsltc.cmdline.,\
-               com.sun.org.apache.xalan.internal.xsltc.compiler.,\
-               com.sun.org.apache.xalan.internal.xsltc.trax.,\
-               com.sun.org.apache.xalan.internal.xsltc.util.,\
-               com.sun.org.apache.xml.internal.res.,\
-               com.sun.org.apache.xml.internal.security.,\
-               com.sun.org.apache.xml.internal.serializer.utils.,\
-               com.sun.org.apache.xml.internal.utils.,\
-               com.sun.org.glassfish.,\
-               com.oracle.xmlns.internal.,\
-               com.oracle.webservices.internal.,\
-               org.jcp.xml.dsig.internal.,\
-               jdk.internal.,\
-               jdk.nashorn.internal.,\
-               jdk.nashorn.tools.,\
-               com.sun.activation.registries.
-
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageDefinition unless the
-# corresponding RuntimePermission ("defineClassInPackage."+package) has
-# been granted.
-#
-# by default, none of the class loaders supplied with the JDK call
-# checkPackageDefinition.
-#
-package.definition=sun.,\
-                   com.sun.xml.internal.,\
-                   com.sun.imageio.,\
-                   com.sun.istack.internal.,\
-                   com.sun.jmx.,\
-                   com.sun.media.sound.,\
-                   com.sun.naming.internal.,\
-                   com.sun.proxy.,\
-                   com.sun.corba.se.,\
-                   com.sun.org.apache.bcel.internal.,\
-                   com.sun.org.apache.regexp.internal.,\
-                   com.sun.org.apache.xerces.internal.,\
-                   com.sun.org.apache.xpath.internal.,\
-                   com.sun.org.apache.xalan.internal.extensions.,\
-                   com.sun.org.apache.xalan.internal.lib.,\
-                   com.sun.org.apache.xalan.internal.res.,\
-                   com.sun.org.apache.xalan.internal.templates.,\
-                   com.sun.org.apache.xalan.internal.utils.,\
-                   com.sun.org.apache.xalan.internal.xslt.,\
-                   com.sun.org.apache.xalan.internal.xsltc.cmdline.,\
-                   com.sun.org.apache.xalan.internal.xsltc.compiler.,\
-                   com.sun.org.apache.xalan.internal.xsltc.trax.,\
-                   com.sun.org.apache.xalan.internal.xsltc.util.,\
-                   com.sun.org.apache.xml.internal.res.,\
-                   com.sun.org.apache.xml.internal.security.,\
-                   com.sun.org.apache.xml.internal.serializer.utils.,\
-                   com.sun.org.apache.xml.internal.utils.,\
-                   com.sun.org.glassfish.,\
-                   com.oracle.xmlns.internal.,\
-                   com.oracle.webservices.internal.,\
-                   org.jcp.xml.dsig.internal.,\
-                   jdk.internal.,\
-                   jdk.nashorn.internal.,\
-                   jdk.nashorn.tools.,\
-                   com.sun.activation.registries.
-
-#
-# Determines whether this properties file can be appended to
-# or overridden on the command line via -Djava.security.properties
-#
-security.overridePropertiesFile=true
-
-#
-# Determines the default key and trust manager factory algorithms for
-# the javax.net.ssl package.
-#
-ssl.KeyManagerFactory.algorithm=SunX509
-ssl.TrustManagerFactory.algorithm=PKIX
-
-#
-# The Java-level namelookup cache policy for successful lookups:
-#
-# any negative value: caching forever
-# any positive value: the number of seconds to cache an address for
-# zero: do not cache
-#
-# default value is forever (FOREVER). For security reasons, this
-# caching is made forever when a security manager is set. When a security
-# manager is not set, the default behavior in this implementation
-# is to cache for 30 seconds.
-#
-# NOTE: setting this to anything other than the default value can have
-#       serious security implications. Do not set it unless
-#       you are sure you are not exposed to DNS spoofing attack.
-#
-#networkaddress.cache.ttl=-1
-
-# The Java-level namelookup cache policy for failed lookups:
-#
-# any negative value: cache forever
-# any positive value: the number of seconds to cache negative lookup results
-# zero: do not cache
-#
-# In some Microsoft Windows networking environments that employ
-# the WINS name service in addition to DNS, name service lookups
-# that fail may take a noticeably long time to return (approx. 5 seconds).
-# For this reason the default caching policy is to maintain these
-# results for 10 seconds.
-#
-#
-networkaddress.cache.negative.ttl=10
-
-#
-# Properties to configure OCSP for certificate revocation checking
-#
-
-# Enable OCSP
-#
-# By default, OCSP is not used for certificate revocation checking.
-# This property enables the use of OCSP when set to the value "true".
-#
-# NOTE: SocketPermission is required to connect to an OCSP responder.
-#
-# Example,
-#   ocsp.enable=true
-
-#
-# Location of the OCSP responder
-#
-# By default, the location of the OCSP responder is determined implicitly
-# from the certificate being validated. This property explicitly specifies
-# the location of the OCSP responder. The property is used when the
-# Authority Information Access extension (defined in RFC 3280) is absent
-# from the certificate or when it requires overriding.
-#
-# Example,
-#   ocsp.responderURL=http://ocsp.example.net:80
-
-#
-# Subject name of the OCSP responder's certificate
-#
-# By default, the certificate of the OCSP responder is that of the issuer
-# of the certificate being validated. This property identifies the certificate
-# of the OCSP responder when the default does not apply. Its value is a string
-# distinguished name (defined in RFC 2253) which identifies a certificate in
-# the set of certificates supplied during cert path validation. In cases where
-# the subject name alone is not sufficient to uniquely identify the certificate
-# then both the "ocsp.responderCertIssuerName" and
-# "ocsp.responderCertSerialNumber" properties must be used instead. When this
-# property is set then those two properties are ignored.
-#
-# Example,
-#   ocsp.responderCertSubjectName="CN=OCSP Responder, O=XYZ Corp"
-
-#
-# Issuer name of the OCSP responder's certificate
-#
-# By default, the certificate of the OCSP responder is that of the issuer
-# of the certificate being validated. This property identifies the certificate
-# of the OCSP responder when the default does not apply. Its value is a string
-# distinguished name (defined in RFC 2253) which identifies a certificate in
-# the set of certificates supplied during cert path validation. When this
-# property is set then the "ocsp.responderCertSerialNumber" property must also
-# be set. When the "ocsp.responderCertSubjectName" property is set then this
-# property is ignored.
-#
-# Example,
-#   ocsp.responderCertIssuerName="CN=Enterprise CA, O=XYZ Corp"
-
-#
-# Serial number of the OCSP responder's certificate
-#
-# By default, the certificate of the OCSP responder is that of the issuer
-# of the certificate being validated. This property identifies the certificate
-# of the OCSP responder when the default does not apply. Its value is a string
-# of hexadecimal digits (colon or space separators may be present) which
-# identifies a certificate in the set of certificates supplied during cert path
-# validation. When this property is set then the "ocsp.responderCertIssuerName"
-# property must also be set. When the "ocsp.responderCertSubjectName" property
-# is set then this property is ignored.
-#
-# Example,
-#   ocsp.responderCertSerialNumber=2A:FF:00
-
-#
-# Policy for failed Kerberos KDC lookups:
-#
-# When a KDC is unavailable (network error, service failure, etc), it is
-# put inside a blacklist and accessed less often for future requests. The
-# value (case-insensitive) for this policy can be:
-#
-# tryLast
-#    KDCs in the blacklist are always tried after those not on the list.
-#
-# tryLess[:max_retries,timeout]
-#    KDCs in the blacklist are still tried by their order in the configuration,
-#    but with smaller max_retries and timeout values. max_retries and timeout
-#    are optional numerical parameters (default 1 and 5000, which means once
-#    and 5 seconds). Please notes that if any of the values defined here is
-#    more than what is defined in krb5.conf, it will be ignored.
-#
-# Whenever a KDC is detected as available, it is removed from the blacklist.
-# The blacklist is reset when krb5.conf is reloaded. You can add
-# refreshKrb5Config=true to a JAAS configuration file so that krb5.conf is
-# reloaded whenever a JAAS authentication is attempted.
-#
-# Example,
-#   krb5.kdc.bad.policy = tryLast
-#   krb5.kdc.bad.policy = tryLess:2,2000
-krb5.kdc.bad.policy = tryLast
-
-# Algorithm restrictions for certification path (CertPath) processing
-#
-# In some environments, certain algorithms or key lengths may be undesirable
-# for certification path building and validation.  For example, "MD2" is
-# generally no longer considered to be a secure hash algorithm.  This section
-# describes the mechanism for disabling algorithms based on algorithm name
-# and/or key length.  This includes algorithms used in certificates, as well
-# as revocation information such as CRLs and signed OCSP Responses.
-#
-# The syntax of the disabled algorithm string is described as this Java
-# BNF-style:
-#   DisabledAlgorithms:
-#       " DisabledAlgorithm { , DisabledAlgorithm } "
-#
-#   DisabledAlgorithm:
-#       AlgorithmName [Constraint]
-#
-#   AlgorithmName:
-#       (see below)
-#
-#   Constraint:
-#       KeySizeConstraint
-#
-#   KeySizeConstraint:
-#       keySize Operator DecimalInteger
-#
-#   Operator:
-#       <= | < | == | != | >= | >
-#
-#   DecimalInteger:
-#       DecimalDigits
-#
-#   DecimalDigits:
-#       DecimalDigit {DecimalDigit}
-#
-#   DecimalDigit: one of
-#       1 2 3 4 5 6 7 8 9 0
-#
-# The "AlgorithmName" is the standard algorithm name of the disabled
-# algorithm. See "Java Cryptography Architecture Standard Algorithm Name
-# Documentation" for information about Standard Algorithm Names.  Matching
-# is performed using a case-insensitive sub-element matching rule.  (For
-# example, in "SHA1withECDSA" the sub-elements are "SHA1" for hashing and
-# "ECDSA" for signatures.)  If the assertion "AlgorithmName" is a
-# sub-element of the certificate algorithm name, the algorithm will be
-# rejected during certification path building and validation.  For example,
-# the assertion algorithm name "DSA" will disable all certificate algorithms
-# that rely on DSA, such as NONEwithDSA, SHA1withDSA.  However, the assertion
-# will not disable algorithms related to "ECDSA".
-#
-# A "Constraint" provides further guidance for the algorithm being specified.
-# The "KeySizeConstraint" requires a key of a valid size range if the
-# "AlgorithmName" is of a key algorithm.  The "DecimalInteger" indicates the
-# key size specified in number of bits.  For example, "RSA keySize <= 1024"
-# indicates that any RSA key with key size less than or equal to 1024 bits
-# should be disabled, and "RSA keySize < 1024, RSA keySize > 2048" indicates
-# that any RSA key with key size less than 1024 or greater than 2048 should
-# be disabled. Note that the "KeySizeConstraint" only makes sense to key
-# algorithms.
-#
-# Note: This property is currently used by Oracle's PKIX implementation. It
-# is not guaranteed to be examined and used by other implementations.
-#
-# Example:
-#   jdk.certpath.disabledAlgorithms=MD2, DSA, RSA keySize < 2048
-#
-#
-jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024
-
-# Algorithm restrictions for Secure Socket Layer/Transport Layer Security
-# (SSL/TLS) processing
-#
-# In some environments, certain algorithms or key lengths may be undesirable
-# when using SSL/TLS.  This section describes the mechanism for disabling
-# algorithms during SSL/TLS security parameters negotiation, including cipher
-# suites selection, peer authentication and key exchange mechanisms.
-#
-# For PKI-based peer authentication and key exchange mechanisms, this list
-# of disabled algorithms will also be checked during certification path
-# building and validation, including algorithms used in certificates, as
-# well as revocation information such as CRLs and signed OCSP Responses.
-# This is in addition to the jdk.certpath.disabledAlgorithms property above.
-#
-# See the specification of "jdk.certpath.disabledAlgorithms" for the
-# syntax of the disabled algorithm string.
-#
-# Note: This property is currently used by Oracle's JSSE implementation.
-# It is not guaranteed to be examined and used by other implementations.
-#
-# Example:
-#   jdk.tls.disabledAlgorithms=MD5, SHA1, DSA, RSA keySize < 2048
diff --git a/jdk/src/solaris/classes/com/sun/security/auth/module/README b/jdk/src/solaris/classes/com/sun/security/auth/module/README
deleted file mode 100644
index 512ffa13f21..00000000000
--- a/jdk/src/solaris/classes/com/sun/security/auth/module/README
+++ /dev/null
@@ -1,14 +0,0 @@
-This directory originally held the files:
-
-   SolarisLoginModule.java
-   SolarisSystem.java
-   UnixLoginModule.java
-   UnixSystem.java
-
-They were moved to src/share/classes/com/sun/security/auth/module
-because they need to be there for Javadoc to include them in 
-the JAAS specification.  Moving them derives from the fact that 
-the final documentation is built from the platform-specific source 
-bundles rather than from the full workspace, so files from all 
-platforms need to be in the share directory.  For details, 
-see bug 4492476.
diff --git a/jdk/src/windows/bin/java-rmi.c b/jdk/src/windows/bin/java-rmi.c
deleted file mode 100644
index b7d6e92693f..00000000000
--- a/jdk/src/windows/bin/java-rmi.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright (c) 1996, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-#include 
-#include 
-#include 
-#include 
-
-/*
- * This is a primitive bootstrapping utility for executing Java CGI
- * programs, specifically Java RMI's CGI HTTP forwarding mechanism
- *
- * It executes the Java interpreter with options to define
- * properties corresponding to the environment variables set by the
- * CGI 1.0 specification and runs the target class.
- *
- * The following assumptions are made:
- *     - the Java interpreter can be located by the system
- *       PATH variable
- *     - for RMI 1.1 prebeta release, the target class can be located
- *       using the system CLASSPATH variable
- */
-
-/* name of Java interpreter executable */
-#define JAVA_NAME "java"
-
-/* name of Java class to execute with interpreter */
-#define CLASS_NAME "sun.rmi.transport.proxy.CGIHandler"
-
-/* names of environment variables set in CGI 1.0 interface */
-static char *var_names[] = {
-    "AUTH_TYPE",
-    "CONTENT_LENGTH",
-    "CONTENT_TYPE",
-    "GATEWAY_INTERFACE",
-    "HTTP_ACCEPT",
-    "PATH_INFO",
-    "PATH_TRANSLATED",
-    "QUERY_STRING",
-    "REMOTE_ADDR",
-    "REMOTE_HOST",
-    "REMOTE_IDENT",
-    "REMOTE_USER",
-    "REQUEST_METHOD",
-    "SCRIPT_NAME",
-    "SERVER_NAME",
-    "SERVER_PORT",
-    "SERVER_PROTOCOL",
-    "SERVER_SOFTWARE"
-};
-
-#define NUM_VARS (sizeof(var_names) / sizeof(var_names[0]))
-
-/* file static functions */
-static void server_error(char *);
-
-/*
- * Program entry point: set up arguments and invoke Java interpreter.
- */
-int
-main(
-    int     argc,
-    char   *argv[]
-)
-{
-    int     i;                  /* loop index variable */
-    char  **args;               /* array to store arguments to interpreter */
-    int     n = 0;              /* next index to fill in argument array */
-
-    /* allocate space for argument list */
-    args = (char **)            /* allocate space for: */
-        malloc((1               /* executable name */
-                + NUM_VARS      /* property definition for each variable */
-                + 1             /* class name */
-                + 1)            /* terminating NULL */
-                * sizeof(*args));
-    if (args == NULL) {
-        server_error("memory allocation failure");
-        return 1;
-    }
-
-    /* first argument: name of java interpreter */
-    args[n ++] = JAVA_NAME;
-
-    /* next arguments: define CGI variables as properties to Java VM */
-    for (i = 0; i < NUM_VARS; ++ i) {
-        char *name = var_names[i];      /* name of variable */
-        char *value;                    /* value of variable */
-        char *buffer;                   /* buffer to store argument string */
-
-        value = getenv(name);
-        if (value == NULL)              /* if variable undefined, */
-            value = "";                 /* use empty string */
-
-        buffer = (char *)               /* allocate space for: */
-            malloc((2                   /* "-D" */
-                    + strlen(name)      /* variable name */
-                    + 2                 /* "=\"" */
-                    + strlen(value)     /* variable value */
-                    + 2)                /* "\"" and terminating '\0' */
-                    * sizeof(*buffer));
-        if (buffer == NULL) {
-            server_error("memory allocation failure");
-            return 1;
-        }
-
-        /* construct property definition parameter */
-        sprintf(buffer, "-D%s=\"%s\"", name, value);
-
-        args[n ++] = buffer;            /* add to argument list */
-    }
-
-    /* last argument: name of class to execute */
-    args[n ++] = CLASS_NAME;
-
-    args[n ++] = NULL;          /* terminate argument list */
-
-    _execvp(JAVA_NAME, args);   /* execute java interpreter */
-
-    /* if exec call returns, there was an error */
-    server_error("interpreter execution failure");
-    return 1;
-}
-
-/*
- * Return primitive error message to server because of some failure in
- * this program.  (This could be embellished to an HTML formatted error
- * message.)
- */
-static void
-server_error(
-    char  *message
-)
-{
-    /*
-     * NOTE: CGI 1.0 spec uses "\n" (unlike "\r\n"
-     * for HTTP 1.0) for line termination
-     */
-    printf("Status: 500 Server Error: %s\n", message);
-    printf("Content-type: text/plain\n");
-    printf("\n");
-    printf("%s", message);
-}
diff --git a/jdk/src/windows/classes/com/sun/security/auth/module/README b/jdk/src/windows/classes/com/sun/security/auth/module/README
deleted file mode 100644
index 1187afde89d..00000000000
--- a/jdk/src/windows/classes/com/sun/security/auth/module/README
+++ /dev/null
@@ -1,12 +0,0 @@
-This directory originally held the files:
-
-   NTLoginModule.java 
-   NTSystem.java
-
-They were moved to src/share/classes/com/sun/security/auth/module
-because they need to be there for Javadoc to include them in 
-the JAAS specification.  Moving them derives from the fact that 
-the final documentation is built from the platform-specific source 
-bundles rather than from the full workspace, so files from all 
-platforms need to be in the share directory.  For details, 
-see bug 4492476.
diff --git a/jdk/src/windows/lib/plugin.properties b/jdk/src/windows/lib/plugin.properties
deleted file mode 100644
index e917ccb2bf2..00000000000
--- a/jdk/src/windows/lib/plugin.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-#
-# properties file for java runtime plugin to a browser
-#
-
-# whether to display stdout to a console window (for
-# debugging)
-plugin.console=false
-# the max no. of inactive codebases to keep in cache
-plugin.cacheSize=3
-
diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
index f5e3f3a22ca..494e4e0b482 100644
--- a/jdk/test/ProblemList.txt
+++ b/jdk/test/ProblemList.txt
@@ -260,7 +260,7 @@ com/sun/jdi/RedefineImplementor.sh                              generic-all
 # 8031555
 com/sun/jdi/JdbMethodExitTest.sh                                generic-all
 
-# 8041934
+# 8043571
 com/sun/jdi/RepStep.java                                        generic-all
 
 # 8044419
@@ -287,13 +287,15 @@ sun/tools/jcmd/TestJcmdSanity.java				windows-all
 # 8033104
 sun/jvmstat/monitor/MonitoredVm/CR6672135.java			generic-all
 
-# 8041989
-sun/tools/jstatd/TestJstatdDefaults.java                        generic-all
-
-# 8037285
-sun/tools/jstatd/TestJstatdServer.java                          generic-all
+# 8027668
+sun/tools/jstatd/TestJstatdDefaults.java                generic-all
+sun/tools/jstatd/TestJstatdServer.java                  generic-all
+sun/tools/jstatd/TestJstatdPort.java                    generic-all
 
 # 8046355
 sun/tools/jstatd/TestJstatdExternalRegistry.java                generic-all
 
+# 6456333
+sun/tools/jps/TestJpsJarRelative.java				generic-all
+
 ############################################################################
diff --git a/jdk/test/TEST.ROOT b/jdk/test/TEST.ROOT
index e6cb16998ed..7288a0921d8 100644
--- a/jdk/test/TEST.ROOT
+++ b/jdk/test/TEST.ROOT
@@ -8,7 +8,7 @@ keys=2d dnd i18n
 othervm.dirs=java/awt java/beans javax/accessibility javax/imageio javax/sound javax/print javax/management com/sun/awt sun/awt sun/java2d sun/pisces
 
 # Tests that cannot run concurrently
-exclusiveAccess.dirs=java/rmi/Naming java/util/Currency java/util/prefs sun/management/jmxremote sun/tools/jstatd sun/security/mscapi
+exclusiveAccess.dirs=java/rmi/Naming java/util/prefs sun/management/jmxremote sun/tools/jstatd sun/security/mscapi
 
 # Group definitions
 groups=TEST.groups [closed/TEST.groups]
diff --git a/jdk/test/com/sun/tools/attach/StartManagementAgent.java b/jdk/test/com/sun/tools/attach/StartManagementAgent.java
index adb71048f04..0bfa9d98252 100644
--- a/jdk/test/com/sun/tools/attach/StartManagementAgent.java
+++ b/jdk/test/com/sun/tools/attach/StartManagementAgent.java
@@ -40,7 +40,7 @@ import jdk.testlibrary.Utils;
  * @test
  * @summary Test for VirtualMachine.startManagementAgent and VirtualMachine.startLocalManagementAgent
  * @library /lib/testlibrary
- * @run build Application jdk.testlibrary.*
+ * @run build Application SimpleProvider jdk.testlibrary.*
  * @run main StartManagementAgent
  */
 
diff --git a/jdk/test/java/lang/Long/ParsingTest.java b/jdk/test/java/lang/Long/ParsingTest.java
index 388c889ee6c..42c49dddf3d 100644
--- a/jdk/test/java/lang/Long/ParsingTest.java
+++ b/jdk/test/java/lang/Long/ParsingTest.java
@@ -128,10 +128,10 @@ public class ParsingTest {
     }
 
     private static void checkNumberFormatException(String val, int radix, int start) {
-        int n = 0;
+        long n = 0;
         try {
-            n = Integer.parseInt(val, radix, start);
-            System.err.println("parseInt(" + val + ", " + radix + ", " + start +
+            n = Long.parseLong(val, radix, start);
+            System.err.println("parseLong(" + val + ", " + radix + ", " + start +
                     ") incorrectly returned " + n);
             throw new RuntimeException();
         } catch (NumberFormatException nfe) {
@@ -143,7 +143,7 @@ public class ParsingTest {
         long n = 0;
         try {
             n = Long.parseLong(val, radix, start, end);
-            System.err.println("parseInt(" + val + ", " + radix + ", " + start + ", " + end +
+            System.err.println("parseLong(" + val + ", " + radix + ", " + start + ", " + end +
                     ") incorrectly returned " + n);
             throw new RuntimeException();
         } catch (NumberFormatException nfe) {
@@ -152,10 +152,10 @@ public class ParsingTest {
     }
 
     private static void checkIndexOutOfBoundsException(String val, int radix, int start) {
-        int n = 0;
+        long n = 0;
         try {
-            n = Integer.parseInt(val, radix, start);
-            System.err.println("parseInt(" + val + ", " + radix + ", " + start +
+            n = Long.parseLong(val, radix, start);
+            System.err.println("parseLong(" + val + ", " + radix + ", " + start +
                     ") incorrectly returned " + n);
             throw new RuntimeException();
         } catch (IndexOutOfBoundsException ioob) {
@@ -167,7 +167,7 @@ public class ParsingTest {
         long n = 0;
         try {
             n = Long.parseLong(val, radix, start, end);
-            System.err.println("parseInt(" + val + ", " + radix + ", " + start + ", " + end +
+            System.err.println("parseLong(" + val + ", " + radix + ", " + start + ", " + end +
                     ") incorrectly returned " + n);
             throw new RuntimeException();
         } catch (IndexOutOfBoundsException ioob) {
@@ -179,7 +179,7 @@ public class ParsingTest {
         long n = 0;
         try {
             n = Long.parseLong(null, 10, start, end);
-            System.err.println("parseInt(null, " + radix + ", " + start + ", " + end +
+            System.err.println("parseLong(null, " + radix + ", " + start + ", " + end +
                     ") incorrectly returned " + n);
             throw new RuntimeException();
         } catch (NullPointerException npe) {
diff --git a/jdk/test/java/lang/SecurityManager/CheckPackageAccess.java b/jdk/test/java/lang/SecurityManager/CheckPackageAccess.java
index 3a493e0dd99..118a60f03e9 100644
--- a/jdk/test/java/lang/SecurityManager/CheckPackageAccess.java
+++ b/jdk/test/java/lang/SecurityManager/CheckPackageAccess.java
@@ -92,8 +92,6 @@ public class CheckPackageAccess {
         String osName = System.getProperty("os.name");
         if (osName.contains("OS X")) {
             pkgs.add("apple.");  // add apple package for OS X
-        } else if (osName.startsWith("Windows")) {
-            pkgs.add("com.sun.java.accessibility.");
         }
 
         List jspkgs =
diff --git a/jdk/test/java/lang/SecurityManager/CheckSecurityProvider.java b/jdk/test/java/lang/SecurityManager/CheckSecurityProvider.java
new file mode 100644
index 00000000000..0e64edc4ead
--- /dev/null
+++ b/jdk/test/java/lang/SecurityManager/CheckSecurityProvider.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 6997010
+ * @summary Consolidate java.security files into one file with modifications
+ */
+
+import java.security.Provider;
+import java.security.Security;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+/*
+ * The main benefit of this test is to catch merge errors or other types
+ * of issues where one or more of the security providers are accidentally
+ * removed. This is why the known security providers have to
+ * be explicitly listed below.
+ */
+public class CheckSecurityProvider {
+    public static void main(String[] args) throws Exception {
+
+        String os = System.getProperty("os.name");
+
+        /*
+         * This array should be updated whenever new security providers
+         * are added to the the java.security file.
+         * NOTE: it should be in the same order as the java.security file
+         */
+
+        List expected = new ArrayList<>();
+
+        if (os.equals("SunOS")) {
+            if (!isOpenJDKOnly()) {
+                expected.add("com.oracle.security.ucrypto.UcryptoProvider");
+            }
+            expected.add("sun.security.pkcs11.SunPKCS11");
+        }
+        expected.add("sun.security.provider.Sun");
+        expected.add("sun.security.rsa.SunRsaSign");
+        expected.add("sun.security.ec.SunEC");
+        expected.add("com.sun.net.ssl.internal.ssl.Provider");
+        expected.add("com.sun.crypto.provider.SunJCE");
+        expected.add("sun.security.jgss.SunProvider");
+        expected.add("com.sun.security.sasl.Provider");
+        expected.add("org.jcp.xml.dsig.internal.dom.XMLDSigRI");
+        expected.add("sun.security.smartcardio.SunPCSC");
+        if (os.startsWith("Windows")) {
+            expected.add("sun.security.mscapi.SunMSCAPI");
+        }
+        if (os.contains("OS X")) {
+            expected.add("apple.security.AppleProvider");
+        }
+
+        Iterator iter = expected.iterator();
+        for (Provider p: Security.getProviders()) {
+            if (!iter.hasNext()) {
+                throw new Exception("Less expected");
+            }
+            String n1 = iter.next();
+            String n2 = p.getClass().getName();
+            if (!n1.equals(n2)) {
+                throw new Exception("Expected " + n1 + ", actual " + n2);
+            }
+        }
+        if (iter.hasNext()) {
+            throw new Exception("More expected");
+        }
+    }
+
+    // Copied from CheckPackageAccess.java in the same directory
+    private static boolean isOpenJDKOnly() {
+        String prop = System.getProperty("java.runtime.name");
+        return prop != null && prop.startsWith("OpenJDK");
+    }
+}
diff --git a/jdk/test/java/lang/annotation/typeAnnotations/ConstructorReceiverTest.java b/jdk/test/java/lang/annotation/typeAnnotations/ConstructorReceiverTest.java
index d4a75daaaeb..fb314502765 100644
--- a/jdk/test/java/lang/annotation/typeAnnotations/ConstructorReceiverTest.java
+++ b/jdk/test/java/lang/annotation/typeAnnotations/ConstructorReceiverTest.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8023651
+ * @bug 8023651 8044629
  * @summary Test that the receiver annotations and the return annotations of
  *          constructors behave correctly.
  * @run testng ConstructorReceiverTest
@@ -38,11 +38,16 @@ import org.testng.annotations.Test;
 import static org.testng.Assert.*;
 
 public class ConstructorReceiverTest {
+    public static final Integer EMPTY_ANNOTATED_TYPE =  Integer.valueOf(-1);
+
     // Format is {
     //   { Class to get ctor for,
     //       ctor param class,
     //       value of anno of return type,
-    //       value of anno for receiver or null if there should be no receiver anno
+    //       value of anno for receiver,
+    //              or null if there should be no receiver,
+    //              or EMPTY_ANNOTATED_TYPE of there should be a receiver but
+    //              no annotation
     //    },
     //    ...
     // }
@@ -51,13 +56,15 @@ public class ConstructorReceiverTest {
         { ConstructorReceiverTest.Middle.class, ConstructorReceiverTest.class, Integer.valueOf(10), Integer.valueOf(15) },
         { ConstructorReceiverTest.Middle.Inner.class, ConstructorReceiverTest.Middle.class, Integer.valueOf(100), Integer.valueOf(150) },
         { ConstructorReceiverTest.Middle.Inner.Innermost.class, ConstructorReceiverTest.Middle.Inner.class, Integer.valueOf(1000), Integer.valueOf(1500) },
-        { ConstructorReceiverTest.Middle.InnerNoReceiver.class, ConstructorReceiverTest.Middle.class, Integer.valueOf(300), null },
+        { ConstructorReceiverTest.Middle.InnerNoReceiver.class, ConstructorReceiverTest.Middle.class, Integer.valueOf(300), EMPTY_ANNOTATED_TYPE },
         { ConstructorReceiverTest.Nested.class, null, Integer.valueOf(20), null },
         { ConstructorReceiverTest.Nested.NestedMiddle.class, ConstructorReceiverTest.Nested.class, Integer.valueOf(200), Integer.valueOf(250)},
         { ConstructorReceiverTest.Nested.NestedMiddle.NestedInner.class, ConstructorReceiverTest.Nested.NestedMiddle.class, Integer.valueOf(2000), Integer.valueOf(2500)},
-        { ConstructorReceiverTest.Nested.NestedMiddle.NestedInnerNoReceiver.class, ConstructorReceiverTest.Nested.NestedMiddle.class, Integer.valueOf(4000), null},
+        { ConstructorReceiverTest.Nested.NestedMiddle.NestedInnerNoReceiver.class, ConstructorReceiverTest.Nested.NestedMiddle.class, Integer.valueOf(4000), EMPTY_ANNOTATED_TYPE},
+        { ConstructorReceiverTest.Nested.NestedMiddle.SecondNestedInnerNoReceiver.class, ConstructorReceiverTest.Nested.NestedMiddle.class, Integer.valueOf(5000), EMPTY_ANNOTATED_TYPE},
     };
 
+
     @DataProvider
     public Object[][] data() { return TESTS; }
 
@@ -71,14 +78,27 @@ public class ConstructorReceiverTest {
             c = toTest.getDeclaredConstructor(ctorParamType);
 
         AnnotatedType annotatedReceiverType = c.getAnnotatedReceiverType();
-        Annotation[] receiverAnnotations = annotatedReceiverType.getAnnotations();
 
+        // Some Constructors doesn't conceptually have a receiver, they should return null
         if (receiverVal == null) {
-            assertEquals(receiverAnnotations.length, 0, Arrays.asList(receiverAnnotations).toString() +
-                    " should be empty. Looking at 'length': ");
+            assertNull(annotatedReceiverType, "getAnnotatedReciverType  should return null for Constructor: " + c);
             return;
         }
 
+        // check that getType() matches the receiver
+        assertEquals(annotatedReceiverType.getType(),
+                ctorParamType,
+                "getType() doesn't match receiver type: " + ctorParamType);
+
+        Annotation[] receiverAnnotations = annotatedReceiverType.getAnnotations();
+
+        // Some Constructors have no annotations on but in theory can have a receiver
+        if (receiverVal.equals(EMPTY_ANNOTATED_TYPE)) {
+            assertEquals(receiverAnnotations.length, 0, "expecting an empty annotated type for: " + c);
+            return;
+        }
+
+        // The rest should have annotations
         assertEquals(receiverAnnotations.length, 1, "expecting a 1 element array. Looking at 'length': ");
         assertEquals(((Annot)receiverAnnotations[0]).value(), receiverVal.intValue(), " wrong annotation found. Found " +
                 receiverAnnotations[0] +
@@ -136,6 +156,10 @@ public class ConstructorReceiverTest {
             class NestedInnerNoReceiver {
                 @Annot(4000) public NestedInnerNoReceiver() {}
             }
+
+            class SecondNestedInnerNoReceiver {
+                @Annot(5000) public SecondNestedInnerNoReceiver(NestedMiddle NestedMiddle.this) {}
+            }
         }
     }
 
diff --git a/jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedReceiverType.java b/jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedReceiverType.java
index e3dd64612c8..e9608089763 100644
--- a/jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedReceiverType.java
+++ b/jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedReceiverType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014 Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,10 +23,11 @@
 
 /*
  * @test
- * @bug 8024915
+ * @bug 8024915 8044629
  */
 
 import java.lang.reflect.AnnotatedType;
+import java.lang.reflect.Executable;
 import java.util.Arrays;
 
 public class GetAnnotatedReceiverType {
@@ -42,41 +43,115 @@ public class GetAnnotatedReceiverType {
         public Inner1(GetAnnotatedReceiverType GetAnnotatedReceiverType.this) {}
     }
 
+    public static class Nested {
+        public Nested() {}
+
+        public class NestedInner {
+            public NestedInner() { }
+
+            public Class getLocalClass () {
+                class NestedInnerLocal { public NestedInnerLocal() {} }
+                return NestedInnerLocal.class;
+            }
+
+            public Class getAnonymousClass() {
+                return new Object() {}.getClass();
+            }
+        }
+    }
+
+    public class Inner2 {
+        public Inner2() { }
+
+        public class Inner3 {
+            public Inner3() { }
+
+            public Class getLocalClass () {
+                class InnerLocal { public InnerLocal() {} }
+                return InnerLocal.class;
+            }
+
+            public Class getAnonymousClass() {
+                return new Object() {}.getClass();
+            }
+        }
+
+        public Class getLocalClass () {
+            class InnerLocal { public InnerLocal() {} }
+                return InnerLocal.class;
+        }
+
+        public Class getAnonymousClass() {
+            return new Object() {}.getClass();
+        }
+    }
+
     private static int failures = 0;
     private static int tests = 0;
 
     public static void main(String[] args) throws NoSuchMethodException {
-        checkEmptyAT(GetAnnotatedReceiverType.class.getMethod("method").getAnnotatedReceiverType(),
+        checkEmptyAT(GetAnnotatedReceiverType.class.getMethod("method"),
                 "getAnnotatedReceiverType for \"method\" should return an empty AnnotatedType");
-        checkEmptyAT(Inner0.class.getConstructor(GetAnnotatedReceiverType.class).getAnnotatedReceiverType(),
+        checkEmptyAT(Inner0.class.getConstructor(GetAnnotatedReceiverType.class),
                 "getAnnotatedReceiverType for a ctor without a \"this\" should return an empty AnnotatedType");
 
-        checkEmptyAT(GetAnnotatedReceiverType.class.getMethod("method0").getAnnotatedReceiverType(),
+        checkEmptyAT(GetAnnotatedReceiverType.class.getMethod("method0"),
                 "getAnnotatedReceiverType for \"method0\" should return an empty AnnotatedType");
-        checkEmptyAT(Inner1.class.getConstructor(GetAnnotatedReceiverType.class).getAnnotatedReceiverType(),
+        checkEmptyAT(Inner1.class.getConstructor(GetAnnotatedReceiverType.class),
                 "getAnnotatedReceiverType for a ctor with a \"this\" should return an empty AnnotatedType");
 
-        checkNull(GetAnnotatedReceiverType.class.getMethod("method4").getAnnotatedReceiverType(),
+        checkNull(GetAnnotatedReceiverType.class.getMethod("method4"),
                 "getAnnotatedReceiverType() on a static method should return null");
 
+        // More nested, inner, local and anonymous classes
+        Nested nested = new Nested();
+        Nested.NestedInner instance = nested.new NestedInner();
+        checkNull(nested.getClass().getConstructors()[0],
+                "getAnnotatedReceiverType() on a constructor for a static class should return null");
+        checkEmptyAT(instance.getClass().getConstructors()[0],
+                "getAnnotatedReceiverType for a ctor without a \"this\" should return an empty AnnotatedType");
+        checkNull(instance.getLocalClass().getConstructors()[0],
+                "getAnnotatedReceiverType() on a constructor for a local class should return null");
+        checkNull(instance.getAnonymousClass().getDeclaredConstructors()[0],
+                "getAnnotatedReceiverType() on a constructor for an anonymous class should return null");
+
+        GetAnnotatedReceiverType outer = new GetAnnotatedReceiverType();
+        Inner2 instance2 = outer.new Inner2();
+        checkEmptyAT(instance2.getClass().getConstructors()[0],
+                "getAnnotatedReceiverType for a ctor without a \"this\" should return an empty AnnotatedType");
+        checkNull(instance2.getLocalClass().getConstructors()[0],
+                "getAnnotatedReceiverType() on a constructor for a local class should return null");
+        checkNull(instance2.getAnonymousClass().getDeclaredConstructors()[0],
+                "getAnnotatedReceiverType() on a constructor for an anonymous class should return null");
+
+        Inner2.Inner3 instance3 = instance2.new Inner3();
+        checkEmptyAT(instance3.getClass().getConstructors()[0],
+                "getAnnotatedReceiverType for a ctor without a \"this\" should return an empty AnnotatedType");
+        checkNull(instance3.getLocalClass().getConstructors()[0],
+                "getAnnotatedReceiverType() on a constructor for a local class should return null");
+        checkNull(instance3.getAnonymousClass().getDeclaredConstructors()[0],
+                "getAnnotatedReceiverType() on a constructor for an anonymous class should return null");
+
         if (failures != 0)
             throw new RuntimeException("Test failed, see log for details");
-        else if (tests != 5)
+        else if (tests != 15)
             throw new RuntimeException("Not all cases ran, failing");
     }
 
-    private static void checkNull(Object o, String msg) {
-        if (o != null) {
+    private static void checkNull(Executable e, String msg) {
+        AnnotatedType a = e.getAnnotatedReceiverType();
+        if (a != null) {
             failures++;
-            System.err.println(msg);
+            System.err.println(msg + ": " + e);
         }
         tests++;
     }
 
-    private static void checkEmptyAT(AnnotatedType a, String msg) {
+    private static void checkEmptyAT(Executable e, String msg) {
+        AnnotatedType a = e.getAnnotatedReceiverType();
         if (a.getAnnotations().length != 0) {
             failures++;
-            System.err.print(msg);
+            System.err.print(msg + ": " + e);
         }
         tests++;
     }
diff --git a/jdk/test/java/lang/annotation/typeAnnotations/TestExecutableGetAnnotatedType.java b/jdk/test/java/lang/annotation/typeAnnotations/TestExecutableGetAnnotatedType.java
index ad8a87a13d3..6735f46cec0 100644
--- a/jdk/test/java/lang/annotation/typeAnnotations/TestExecutableGetAnnotatedType.java
+++ b/jdk/test/java/lang/annotation/typeAnnotations/TestExecutableGetAnnotatedType.java
@@ -73,13 +73,11 @@ public class TestExecutableGetAnnotatedType {
         testParameters(e.getParameters());
     }
 
-    // should test constructors as well, see JDK-8044629
     @Test(dataProvider = "genericMethodData")
     public void testGenericReceiverType(Executable e) throws Exception {
         testReceiverType0(e);
     }
 
-    // should test constructors as well, see JDK-8044629
     @Test(dataProvider = "methodData")
     public void testReceiverType(Executable e) throws Exception {
         testReceiverType0(e);
diff --git a/jdk/test/java/lang/instrument/NMTHelper.java b/jdk/test/java/lang/instrument/NMTHelper.java
index ad08fdb7708..c5843f8f49b 100644
--- a/jdk/test/java/lang/instrument/NMTHelper.java
+++ b/jdk/test/java/lang/instrument/NMTHelper.java
@@ -32,8 +32,8 @@ public class NMTHelper
         executeDcmd("vmNativeMemory", "baseline");
     }
 
-    // Total:  reserved=3484685KB  +293KB, committed=266629KB +293KB
-    private static Pattern totalLine = Pattern.compile("^Total:  reserved=\\d+KB  .*KB, committed=\\d+KB (.*)KB$");
+    // Total: reserved=3484685KB +293KB, committed=266629KB +293KB
+    private static Pattern totalLine = Pattern.compile("^Total: reserved=\\d+KB .*KB, committed=\\d+KB (.*)KB$");
 
     public static long committedDiff() throws Exception {
         String res = (String) executeDcmd("vmNativeMemory", "detail.diff");
diff --git a/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest.java b/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest.java
index 891e2fbd4cb..450cc870296 100644
--- a/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest.java
+++ b/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest.java
@@ -50,6 +50,7 @@ public class LowMemoryTest {
     private static boolean testFailed = false;
     private static final int NUM_TRIGGERS = 5;
     private static final int NUM_CHUNKS = 2;
+    private static final int YOUNG_GEN_SIZE = 8 * 1024 * 1024;
     private static long chunkSize;
 
     /**
@@ -59,11 +60,14 @@ public class LowMemoryTest {
      */
     public static void main(String a[]) throws Throwable {
         final String main = "LowMemoryTest$TestMain";
-        RunUtil.runTestKeepGcOpts(main);
-        RunUtil.runTestClearGcOpts(main, "-XX:+UseSerialGC");
-        RunUtil.runTestClearGcOpts(main, "-XX:+UseParallelGC");
-        RunUtil.runTestClearGcOpts(main, "-XX:+UseG1GC");
-        RunUtil.runTestClearGcOpts(main, "-XX:+UseConcMarkSweepGC");
+        // Use a low young gen size to ensure that the
+        // allocated objects are put in the old gen.
+        final String nmFlag = "-Xmn" + YOUNG_GEN_SIZE;
+        RunUtil.runTestKeepGcOpts(main, nmFlag);
+        RunUtil.runTestClearGcOpts(main, nmFlag, "-XX:+UseSerialGC");
+        RunUtil.runTestClearGcOpts(main, nmFlag, "-XX:+UseParallelGC");
+        RunUtil.runTestClearGcOpts(main, nmFlag, "-XX:+UseG1GC");
+        RunUtil.runTestClearGcOpts(main, nmFlag, "-XX:+UseConcMarkSweepGC");
     }
 
     private static volatile boolean listenerInvoked = false;
@@ -156,6 +160,16 @@ public class LowMemoryTest {
             chunkSize = (mu.getMax() - mu.getUsed()) / 20;
             newThreshold = mu.getUsed() + (chunkSize * NUM_CHUNKS);
 
+            // Sanity check. Make sure the chunkSize is large than the YOUNG_GEN_SIZE
+            // If the chunkSize are lower than the YOUNG_GEN_SIZE, we will get intermittent
+            // failures when objects end up in the young gen instead of the old gen.
+            // Tweak the test if this fails.
+            if (chunkSize < YOUNG_GEN_SIZE) {
+                throw new RuntimeException("TEST FAILED: " +
+                        " chunkSize: " + chunkSize + " is less than YOUNG_GEN_SIZE: " + YOUNG_GEN_SIZE +
+                        " max: " + mu.getMax() + " used: " + mu.getUsed() + " newThreshold: " + newThreshold);
+            }
+
             System.out.println("Setting threshold for " + mpool.getName() +
                 " from " + mpool.getUsageThreshold() + " to " + newThreshold +
                 ".  Current used = " + mu.getUsed());
diff --git a/jdk/test/java/lang/management/MemoryMXBean/MemoryManagement.java b/jdk/test/java/lang/management/MemoryMXBean/MemoryManagement.java
index 4077d2a08ef..b9db049946f 100644
--- a/jdk/test/java/lang/management/MemoryMXBean/MemoryManagement.java
+++ b/jdk/test/java/lang/management/MemoryMXBean/MemoryManagement.java
@@ -31,7 +31,7 @@
  * @author  Mandy Chung
  *
  * @build MemoryManagement MemoryUtil
- * @run main/othervm/timeout=600 MemoryManagement
+ * @run main/othervm/timeout=600 -Xmn8m MemoryManagement
  */
 
 import java.lang.management.*;
@@ -49,6 +49,8 @@ public class MemoryManagement {
     private static volatile boolean trace = false;
     private static volatile boolean testFailed = false;
     private static final int NUM_CHUNKS = 2;
+    // Must match -Xmn set on the @run line
+    private static final int YOUNG_GEN_SIZE = 8 * 1024 * 1024;
     private static volatile long chunkSize;
     private static volatile int listenerInvoked = 0;
 
@@ -112,6 +114,16 @@ public class MemoryManagement {
         }
         newThreshold = mu.getUsed() + (chunkSize * NUM_CHUNKS);
 
+        // Sanity check. Make sure the chunkSize is large than the YOUNG_GEN_SIZE
+        // If the chunkSize are lower than the YOUNG_GEN_SIZE, we will get intermittent
+        // failures when objects end up in the young gen instead of the old gen.
+        // Tweak the test if this fails.
+        if (chunkSize < YOUNG_GEN_SIZE) {
+            throw new RuntimeException("TEST FAILED: " +
+                    " chunkSize: " + chunkSize + " is less than YOUNG_GEN_SIZE: " + YOUNG_GEN_SIZE +
+                    " max: " + mu.getMax() + " used: " + mu.getUsed() + " newThreshold: " + newThreshold);
+        }
+
         System.out.println("Setting threshold for " + mpool.getName() +
             " from " + mpool.getUsageThreshold() + " to " + newThreshold +
             ".  Current used = " + mu.getUsed());
diff --git a/jdk/test/java/net/ipv6tests/Tests.java b/jdk/test/java/net/ipv6tests/Tests.java
index 8f1793bb381..a0d78fa9c56 100644
--- a/jdk/test/java/net/ipv6tests/Tests.java
+++ b/jdk/test/java/net/ipv6tests/Tests.java
@@ -26,6 +26,9 @@ import java.io.*;
 import java.util.*;
 
 public class Tests {
+
+    static boolean isWindows = System.getProperty("os.name").startsWith("Windows");
+
     /**
      * performs a simple exchange of data between the two sockets
      * and throws an exception if there is any problem.
@@ -264,6 +267,12 @@ public class Tests {
             if (ifs != null) {
                 while (ifs.hasMoreElements()) {
                     NetworkInterface nic = (NetworkInterface)ifs.nextElement();
+                    // Skip (Windows)Teredo Tunneling Pseudo-Interface
+                    if (isWindows) {
+                        String dName = nic.getDisplayName();
+                        if (dName != null && dName.contains("Teredo"))
+                            continue;
+                    }
                     try {
                         if (nic.isUp() && !nic.isLoopback())
                             return nic;
diff --git a/jdk/test/java/util/Currency/PropertiesTest.sh b/jdk/test/java/util/Currency/PropertiesTest.sh
index 01f1326cd2d..cae14e6013c 100644
--- a/jdk/test/java/util/Currency/PropertiesTest.sh
+++ b/jdk/test/java/util/Currency/PropertiesTest.sh
@@ -97,25 +97,16 @@ run PropertiesTest -c dump1 dump2 ${PROPS}
 # Dump built-in currency data + overrides in properties file copied into
 # JRE image.
 
-# Copy the test properties file. If testjava is not a typical jdk-image
-# or testjava is not writable, make a private copy of it.
-COPIED=0
-if [ -w ${TESTJAVA}${FS}jre${FS}lib ]
-then
-  WRITABLEJDK=$TESTJAVA
+# Make a private copy of the jdk so we can write to the properties file location
+# without disturbing other users, including concurrently executing tests.
+WRITABLEJDK=.${FS}testjava
+cp -Hr $TESTJAVA $WRITABLEJDK
+if [ -d ${TESTJAVA}${FS}jre ]; then
   PROPLOCATION=${WRITABLEJDK}${FS}jre${FS}lib
 else
-  WRITABLEJDK=.${FS}testjava
-  if [ -d ${TESTJAVA}${FS}jre ]
-  then
-    PROPLOCATION=${WRITABLEJDK}${FS}jre${FS}lib
-  else
-    PROPLOCATION=${WRITABLEJDK}${FS}lib
-  fi
-  cp -r $TESTJAVA $WRITABLEJDK
-  chmod -R +w $WRITABLEJDK
-  COPIED=1
+  PROPLOCATION=${WRITABLEJDK}${FS}lib
 fi
+chmod -R +w $WRITABLEJDK
 cp ${PROPS} $PROPLOCATION
 echo "Properties location: ${PROPLOCATION}"
 
@@ -125,11 +116,7 @@ sh -xc "${WRITABLEJDK}${FS}bin${FS}java ${TESTVMOPTS} -cp ${TESTCLASSES} Propert
 if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
 
 # Cleanup
-rm -f ${PROPLOCATION}${FS}currency.properties
-if [ $COPIED -eq 1 ]
-then
-  rm -rf $WRITABLEJDK
-fi
+rm -rf $WRITABLEJDK
 
 # compare the two dump files
 run PropertiesTest -c dump1 dump3 ${PROPS}
diff --git a/jdk/test/java/util/logging/CheckZombieLockTest.java b/jdk/test/java/util/logging/CheckZombieLockTest.java
index f0b0a930c68..ab65a814f0b 100644
--- a/jdk/test/java/util/logging/CheckZombieLockTest.java
+++ b/jdk/test/java/util/logging/CheckZombieLockTest.java
@@ -51,23 +51,23 @@ import java.util.logging.Level;
 import java.util.logging.LogRecord;
 public class CheckZombieLockTest {
 
-    private static final String WRITABLE_DIR = "writable-dir";
+    private static final String WRITABLE_DIR = "writable-lockfile-dir";
     private static volatile boolean supportsLocking = true;
 
     static enum TestCase {
-        WRITABLE,  // just verifies that we can create a file in our 'writable-dir'
+        WRITABLE,  // just verifies that we can create a file in our 'writable-lockfile-dir'
         CLOSE, // checks that closing a FileHandler removes its lock file
-        CREATE_FIRST, // verifies that 'writable-dir' contains no lock, then creates a first FileHandler.
-        CREATE_NEXT, // verifies that 'writable-dir' contains a single lock, then creates the next FileHandler
+        CREATE_FIRST, // verifies that 'writable-lockfile-dir' contains no lock, then creates a first FileHandler.
+        CREATE_NEXT, // verifies that 'writable-lockfile-dir' contains a single lock, then creates the next FileHandler
         REUSE, // verifies that zombie lock files can be reused
-        CLEANUP // removes "writable-dir"
+        CLEANUP // removes "writable-lockfile-dir"
     };
 
     public static void main(String... args) throws IOException {
         // we'll base all file creation attempts on the system temp directory,
         // %t
         File writableDir = setup();
-        System.out.println("Writable dir is: "+writableDir.getAbsolutePath());
+        System.out.println("Writable dir is: " + writableDir.getAbsolutePath());
         // we now have one writable directory to work with:
         //    writableDir
         if (args == null || args.length == 0) {
@@ -104,7 +104,7 @@ public class CheckZombieLockTest {
                 case REUSE: testFileHandlerReuse(writableDir); break;
                 // Removes the writableDir
                 case CLEANUP: delete(writableDir); break;
-                default: throw new RuntimeException("No such test case: "+arg);
+                default: throw new RuntimeException("No such test case: " + arg);
             }
         }
     }
@@ -120,7 +120,7 @@ public class CheckZombieLockTest {
         // Test 1: make sure we can create/delete files in the writable dir.
         final File file = new File(writableDir, "test.txt");
         if (!createFile(file, false)) {
-            throw new IOException("Can't create "+file+"\n\tUnable to run test");
+            throw new IOException("Can't create " + file + "\n\tUnable to run test");
         } else {
             delete(file);
         }
@@ -159,22 +159,22 @@ public class CheckZombieLockTest {
     private static void testFileHandlerClose(File writableDir) throws IOException {
         File fakeLock = new File(writableDir, "log.log.lck");
         if (!createFile(fakeLock, false)) {
-            throw new IOException("Can't create fake lock file: "+fakeLock);
+            throw new IOException("Can't create fake lock file: " + fakeLock);
         }
         try {
             List before = listLocks(writableDir, true);
-            System.out.println("before: " +before.size() + " locks found");
+            System.out.println("before: " + before.size() + " locks found");
             FileHandler handler = createFileHandler(writableDir);
-            System.out.println("handler created: "+handler);
+            System.out.println("handler created: " + handler);
             List after = listLocks(writableDir, true);
             System.out.println("after creating handler: " + after.size() + " locks found");
             handler.close();
-            System.out.println("handler closed: "+handler);
+            System.out.println("handler closed: " + handler);
             List afterClose = listLocks(writableDir, true);
             System.out.println("after closing handler: " + afterClose.size() + " locks found");
             afterClose.removeAll(before);
             if (!afterClose.isEmpty()) {
-                throw new RuntimeException("Zombie lock file detected: "+ afterClose);
+                throw new RuntimeException("Zombie lock file detected: " + afterClose);
             }
         } finally {
             if (fakeLock.canRead()) delete(fakeLock);
@@ -186,21 +186,22 @@ public class CheckZombieLockTest {
 
     private static void testFileHandlerReuse(File writableDir) throws IOException {
         List before = listLocks(writableDir, true);
-        System.out.println("before: " +before.size() + " locks found");
+        System.out.println("before: " + before.size() + " locks found");
         try {
             if (!before.isEmpty()) {
-                throw new RuntimeException("Expected no lock file! Found: "+before);
+                throw new RuntimeException("Expected no lock file! Found: " + before);
             }
         } finally {
             before.stream().forEach(CheckZombieLockTest::delete);
         }
 
         FileHandler handler1 = createFileHandler(writableDir);
-        System.out.println("handler created: "+handler1);
+        System.out.println("handler created: " + handler1);
         List after = listLocks(writableDir, true);
         System.out.println("after creating handler: " + after.size() + " locks found");
         if (after.size() != 1) {
-            throw new RuntimeException("Unexpected number of lock files found for "+handler1+": "+after);
+            throw new RuntimeException("Unexpected number of lock files found for "
+                    + handler1 + ": " + after);
         }
         final File lock = after.get(0);
         after.clear();
@@ -208,33 +209,34 @@ public class CheckZombieLockTest {
         after = listLocks(writableDir, true);
         System.out.println("after closing handler: " + after.size() + " locks found");
         if (!after.isEmpty()) {
-            throw new RuntimeException("Unexpected number of lock files found for "+handler1+": "+after);
+            throw new RuntimeException("Unexpected number of lock files found for "
+                    + handler1 + ": " + after);
         }
         if (!createFile(lock, false)) {
-            throw new IOException("Can't create fake lock file: "+lock);
+            throw new IOException("Can't create fake lock file: " + lock);
         }
         try {
             before = listLocks(writableDir, true);
-            System.out.println("before: " +before.size() + " locks found");
+            System.out.println("before: " + before.size() + " locks found");
             if (before.size() != 1) {
-                throw new RuntimeException("Unexpected number of lock files found: "+before+" expected ["
-                        +lock+"].");
+                throw new RuntimeException("Unexpected number of lock files found: "
+                        + before + " expected [" + lock + "].");
             }
             FileHandler handler2 = createFileHandler(writableDir);
-            System.out.println("handler created: "+handler2);
+            System.out.println("handler created: " + handler2);
             after = listLocks(writableDir, true);
             System.out.println("after creating handler: " + after.size() + " locks found");
             after.removeAll(before);
             if (!after.isEmpty()) {
-                throw new RuntimeException("Unexpected lock file found: "+after
+                throw new RuntimeException("Unexpected lock file found: " + after
                         + "\n\t" + lock + " should have been reused");
             }
             handler2.close();
-            System.out.println("handler closed: "+handler2);
+            System.out.println("handler closed: " + handler2);
             List afterClose = listLocks(writableDir, true);
             System.out.println("after closing handler: " + afterClose.size() + " locks found");
             if (!afterClose.isEmpty()) {
-                throw new RuntimeException("Zombie lock file detected: "+ afterClose);
+                throw new RuntimeException("Zombie lock file detected: " + afterClose);
             }
 
             if (supportsLocking) {
@@ -243,18 +245,19 @@ public class CheckZombieLockTest {
                     StandardOpenOption.WRITE);
                 try {
                     if (fc.tryLock() != null) {
-                        System.out.println("locked: "+lock);
+                        System.out.println("locked: " + lock);
                         handler2 = createFileHandler(writableDir);
-                        System.out.println("handler created: "+handler2);
+                        System.out.println("handler created: " + handler2);
                         after = listLocks(writableDir, true);
-                        System.out.println("after creating handler: " + after.size() + " locks found");
+                        System.out.println("after creating handler: " + after.size()
+                                + " locks found");
                         after.removeAll(before);
                         if (after.size() != 1) {
-                            throw new RuntimeException("Unexpected lock files found: "+after
+                            throw new RuntimeException("Unexpected lock files found: " + after
                                 + "\n\t" + lock + " should not have been reused");
                         }
                     } else {
-                        throw new RuntimeException("Failed to lock: "+lock);
+                        throw new RuntimeException("Failed to lock: " + lock);
                     }
                 } finally {
                     delete(lock);
@@ -271,22 +274,23 @@ public class CheckZombieLockTest {
     private static void testFileHandlerCreate(File writableDir, boolean first)
             throws IOException {
         List before = listLocks(writableDir, true);
-        System.out.println("before: " +before.size() + " locks found");
+        System.out.println("before: " + before.size() + " locks found");
         try {
             if (first && !before.isEmpty()) {
-                throw new RuntimeException("Expected no lock file! Found: "+before);
+                throw new RuntimeException("Expected no lock file! Found: " + before);
             } else if (!first && before.size() != 1) {
-                throw new RuntimeException("Expected a single lock file! Found: "+before);
+                throw new RuntimeException("Expected a single lock file! Found: " + before);
             }
         } finally {
             before.stream().forEach(CheckZombieLockTest::delete);
         }
         FileHandler handler = createFileHandler(writableDir);
-        System.out.println("handler created: "+handler);
+        System.out.println("handler created: " + handler);
         List after = listLocks(writableDir, true);
         System.out.println("after creating handler: " + after.size() + " locks found");
         if (after.size() != 1) {
-            throw new RuntimeException("Unexpected number of lock files found for "+handler+": "+after);
+            throw new RuntimeException("Unexpected number of lock files found for "
+                    + handler + ": " + after);
         }
     }
 
@@ -305,7 +309,7 @@ public class CheckZombieLockTest {
             tmpDir = System.getProperty("user.home");
         }
         File tmpOrHomeDir = new File(tmpDir);
-        // Create a writable directory here (%t/writable-dir)
+        // Create a writable directory here (%t/writable-lockfile-dir)
         File writableDir = new File(tmpOrHomeDir, WRITABLE_DIR);
         if (!createFile(writableDir, true)) {
             throw new RuntimeException("Test setup failed: unable to create"
@@ -314,9 +318,10 @@ public class CheckZombieLockTest {
         }
 
         // try to determine whether file locking is supported
+        final String uniqueFileName = UUID.randomUUID().toString()+".lck";
         try {
             FileChannel fc = FileChannel.open(Paths.get(writableDir.getAbsolutePath(),
-                    UUID.randomUUID().toString()+".lck"),
+                    uniqueFileName),
                     StandardOpenOption.CREATE_NEW, StandardOpenOption.APPEND,
                     StandardOpenOption.DELETE_ON_CLOSE);
             try {
@@ -326,9 +331,11 @@ public class CheckZombieLockTest {
             } finally {
                 fc.close();
             }
-        } catch(Throwable t) {
+        } catch (IOException t) {
             // should not happen
-            t.printStackTrace();
+            System.err.println("Failed to create new file " + uniqueFileName +
+                    " in " + writableDir.getAbsolutePath());
+            throw new RuntimeException("Test setup failed: unable to run test", t);
         }
         return writableDir;
     }
diff --git a/jdk/test/java/util/logging/TestLoggerBundleSync.java b/jdk/test/java/util/logging/TestLoggerBundleSync.java
index 48933c9adca..7f5e51470eb 100644
--- a/jdk/test/java/util/logging/TestLoggerBundleSync.java
+++ b/jdk/test/java/util/logging/TestLoggerBundleSync.java
@@ -58,6 +58,7 @@ import java.util.logging.Logger;
  */
 public class TestLoggerBundleSync {
 
+    static final boolean VERBOSE = false;
     static volatile Exception thrown = null;
     static volatile boolean goOn = true;
 
@@ -65,6 +66,7 @@ public class TestLoggerBundleSync {
     static final long TIME = 4 * 1000; // 4 sec.
     static final long STEP = 1 * 1000;  // message every 1 sec.
     static final int  LCOUNT = 50; // change bundle 50 times...
+    static final AtomicLong ignoreLogCount = new AtomicLong(0);
     static final AtomicLong setRBcount = new AtomicLong(0);
     static final AtomicLong setRBNameCount = new AtomicLong(0);
     static final AtomicLong getRBcount = new AtomicLong(0);
@@ -150,6 +152,7 @@ public class TestLoggerBundleSync {
           long sSetRBNameCount  = setRBNameCount.get();
           long sCheckCount = checkCount.get();
           long sNextLong = nextLong.get();
+          long sIgnoreLogCount = ignoreLogCount.get();
           List threads = new ArrayList<>();
           for (Class type : classes) {
               threads.add(new SetRB(type));
@@ -181,21 +184,58 @@ public class TestLoggerBundleSync {
                   + " resource bundles set by " + classes.size() + " Thread(s),");
           System.out.println("\t " + (setRBNameCount.get() - sSetRBNameCount)
                   + " resource bundle names set by " + classes.size() + " Thread(s),");
+          System.out.println("\t " + (ignoreLogCount.get() - sIgnoreLogCount)
+                  + " log messages emitted by other GetRB threads were ignored"
+                  + " to ensure MT test consistency,");
           System.out.println("\t ThreadMXBean.findDeadlockedThreads called "
                   + (checkCount.get() -sCheckCount) + " times by 1 Thread.");
 
     }
 
     final static class GetRB extends Thread {
-        final static class MyHandler extends Handler {
+        final class MyHandler extends Handler {
             volatile ResourceBundle rb;
             volatile String rbName;
             volatile int count = 0;
             @Override
             public synchronized void publish(LogRecord record) {
-                count++;
-                rb = record.getResourceBundle();
-                rbName = record.getResourceBundleName();
+                Object[] params = record.getParameters();
+                // Each GetRB thread has its own handler, but since they
+                // log into the same logger, each handler may receive
+                // messages emitted by other threads.
+                // This means that GetRB#2.handler may receive a message
+                // emitted by GetRB#1 at a time where the resource bundle
+                // was still null.
+                // To avoid falling into this trap, the GetRB thread passes
+                // 'this' as argument to the messages it logs - which does
+                // allow us here to ignore messages that where not emitted
+                // by our own GetRB.this thread...
+                if (params.length == 1) {
+                    if (params[0] == GetRB.this) {
+                        // The message was emitted by our thread.
+                        count++;
+                        rb = record.getResourceBundle();
+                        rbName = record.getResourceBundleName();
+                    } else {
+                        // The message was emitted by another thread: just
+                        // ignore it, as it may have been emitted at a time
+                        // where the resource bundle was still null, and
+                        // processing it may overwrite the 'rb' and 'rbName'
+                        // recorded from the message emitted by our own thread.
+                        if (VERBOSE) {
+                            System.out.println("Ignoring message logged by " + params[0]);
+                        }
+                        ignoreLogCount.incrementAndGet();
+                    }
+                } else {
+                    ignoreLogCount.incrementAndGet();
+                    System.err.println("Unexpected message received");
+                }
+            }
+
+            void reset() {
+                rbName = null;
+                rb = null;
             }
 
             @Override
@@ -207,6 +247,7 @@ public class TestLoggerBundleSync {
             }
         };
         final MyHandler handler = new MyHandler();
+
         @Override
         public void run() {
             try {
@@ -234,9 +275,10 @@ public class TestLoggerBundleSync {
                                     + handler.getLevel());
                         }
                         final int countBefore = handler.count;
+                        handler.reset();
                         ll.setLevel(Level.FINEST);
                         ll.addHandler(handler);
-                        ll.fine("dummy");
+                        ll.log(Level.FINE, "dummy {0}", this);
                         ll.removeHandler(handler);
                         final int countAfter = handler.count;
                         if (countBefore == countAfter) {
diff --git a/jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java b/jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java
index 954aefcc49d..2795b29f71d 100644
--- a/jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java
+++ b/jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java
@@ -126,7 +126,10 @@ public final class Utils {
      * GC specified by the framework must first be removed.
      * @return A copy of given opts with all GC options removed.
      */
-    private static final Pattern useGcPattern = Pattern.compile("\\-XX\\:[\\+\\-]Use.+GC");
+    private static final Pattern useGcPattern = Pattern.compile(
+            "(?:\\-XX\\:[\\+\\-]Use.+GC)"
+            + "|(?:\\-Xconcgc)"
+            + "|(?:\\-Xincgc)");
     public static List removeGcOpts(List opts) {
         List optsWithoutGC = new ArrayList();
         for (String opt : opts) {
diff --git a/jdk/test/sample/chatserver/ChatTest.java b/jdk/test/sample/chatserver/ChatTest.java
index 05d6f44e860..654819b9fa5 100644
--- a/jdk/test/sample/chatserver/ChatTest.java
+++ b/jdk/test/sample/chatserver/ChatTest.java
@@ -25,7 +25,7 @@
 /* @test
  * @summary Test chat server chatserver test
  *
- * @library ../../../src/share/sample/nio/chatserver
+ * @library ../../../src/sample/share/nio/chatserver
  * @build ChatTest ChatServer Client ClientReader DataReader MessageReader NameReader
  * @run main ChatTest
  */
diff --git a/jdk/test/sample/mergesort/MergeSortTest.java b/jdk/test/sample/mergesort/MergeSortTest.java
index 001e4f0a170..e38a0e03413 100644
--- a/jdk/test/sample/mergesort/MergeSortTest.java
+++ b/jdk/test/sample/mergesort/MergeSortTest.java
@@ -25,7 +25,7 @@
 /* @test
  * @summary Test MergeSort
  *
- * @library ../../../src/share/sample/forkjoin/mergesort
+ * @library ../../../src/sample/share/forkjoin/mergesort
  * @build MergeSortTest MergeDemo MergeSort
  * @run main MergeSortTest
  */
diff --git a/corba/src/share/classes/com/sun/org/omg/CORBA/IDLTypeOperations.java b/jdk/test/sun/security/krb5/ccache/DefaultFile.java
similarity index 53%
rename from corba/src/share/classes/com/sun/org/omg/CORBA/IDLTypeOperations.java
rename to jdk/test/sun/security/krb5/ccache/DefaultFile.java
index f0f3f6a476e..b2348e3507f 100644
--- a/corba/src/share/classes/com/sun/org/omg/CORBA/IDLTypeOperations.java
+++ b/jdk/test/sun/security/krb5/ccache/DefaultFile.java
@@ -1,12 +1,10 @@
 /*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
+ * 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
@@ -22,17 +20,28 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.sun.org.omg.CORBA;
 
+/*
+ * @test
+ * @bug 8054817
+ * @summary File ccache only recognizes Linux and Solaris defaults
+ */
 
-/**
-* com/sun/org/omg/CORBA/IDLTypeOperations.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from ir.idl
-* Thursday, May 6, 1999 1:51:45 AM PDT
-*/
+import sun.security.krb5.internal.ccache.FileCredentialsCache;
 
-public interface IDLTypeOperations  extends com.sun.org.omg.CORBA.IRObjectOperations
-{
-    org.omg.CORBA.TypeCode type ();
-} // interface IDLTypeOperations
+public class DefaultFile {
+    public static void main(String[] args) throws Exception {
+        // There are 2 cases where default ccache name is not
+        // /tmp/krb5cc_uid.
+        if (System.getenv("KRB5CCNAME") != null) {
+            return;
+        }
+        if (System.getProperty("os.name").startsWith("Windows")) {
+            return;
+        }
+        String name = FileCredentialsCache.getDefaultCacheName();
+        if (!name.startsWith("/tmp/krb5cc_")) {
+            throw new Exception("default name is " + name);
+        }
+    }
+}
diff --git a/jdk/test/sun/tools/jps/JpsBase.java b/jdk/test/sun/tools/jps/JpsBase.java
new file mode 100644
index 00000000000..59b293b7765
--- /dev/null
+++ b/jdk/test/sun/tools/jps/JpsBase.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.File;
+import java.net.URL;
+import java.util.List;
+
+import jdk.testlibrary.OutputAnalyzer;
+import jdk.testlibrary.ProcessTools;
+
+/**
+ * The base class for testing the jps utility.
+ * The test sequence is to start jps with different combinations of arguments
+ * and verify the output contains proper values.
+ */
+public final class JpsBase {
+
+    private static final String shortProcessName;
+    private static final String fullProcessName;
+
+    /**
+     * The jps output should contain processes' names
+     * (except when jps is started in quite mode).
+     * The expected name of the test process is prepared here.
+     */
+    static {
+        URL url = JpsBase.class.getResource("JpsBase.class");
+        boolean isJar = url.getProtocol().equals("jar");
+
+        if (isJar) {
+            shortProcessName = JpsBase.class.getSimpleName() + ".jar";
+            String urlPath = url.getPath();
+            File jar = new File(urlPath.substring(urlPath.indexOf("file:") + 5, urlPath.indexOf("jar!") + 3));
+            fullProcessName = jar.getAbsolutePath();
+        } else {
+            shortProcessName = JpsBase.class.getSimpleName();
+            fullProcessName = JpsBase.class.getName();
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        int pid = ProcessTools.getProcessId();
+
+        List> combinations = JpsHelper.JpsArg.generateCombinations();
+        for (List combination : combinations) {
+            OutputAnalyzer output = JpsHelper.jps(JpsHelper.JpsArg.asCmdArray(combination));
+            output.shouldHaveExitValue(0);
+
+            boolean isQuiet = false;
+            boolean isFull = false;
+            String pattern;
+            for (JpsHelper.JpsArg jpsArg : combination) {
+                switch (jpsArg) {
+                case q:
+                    // If '-q' is specified output should contain only a list of local VM identifiers:
+                    // 30673
+                    isQuiet = true;
+                    JpsHelper.verifyJpsOutput(output, "^\\d+$");
+                    output.shouldContain(Integer.toString(pid));
+                    break;
+                case l:
+                    // If '-l' is specified output should contain the full package name for the application's main class
+                    // or the full path name to the application's JAR file:
+                    // 30673 /tmp/jtreg/jtreg-workdir/scratch/JpsBase.jar ...
+                    isFull = true;
+                    pattern = "^" + pid + "\\s+" + replaceSpecialChars(fullProcessName) + ".*";
+                    output.shouldMatch(pattern);
+                    break;
+                case m:
+                    // If '-m' is specified output should contain the arguments passed to the main method:
+                    // 30673 JpsBase monkey ...
+                    for (String arg : args) {
+                        pattern = "^" + pid + ".*" + replaceSpecialChars(arg) + ".*";
+                        output.shouldMatch(pattern);
+                    }
+                    break;
+                case v:
+                    // If '-v' is specified output should contain VM arguments:
+                    // 30673 JpsBase -Xmx512m -XX:+UseParallelGC -XX:Flags=/tmp/jtreg/jtreg-workdir/scratch/vmflags ...
+                    for (String vmArg : JpsHelper.getVmArgs()) {
+                        pattern = "^" + pid + ".*" + replaceSpecialChars(vmArg) + ".*";
+                        output.shouldMatch(pattern);
+                    }
+                    break;
+                case V:
+                    // If '-V' is specified output should contain VM flags:
+                    // 30673 JpsBase +DisableExplicitGC ...
+                    pattern = "^" + pid + ".*" + replaceSpecialChars(JpsHelper.VM_FLAG) + ".*";
+                    output.shouldMatch(pattern);
+                    break;
+                }
+
+                if (isQuiet) {
+                    break;
+                }
+            }
+
+            if (!isQuiet) {
+                // Verify output line by line.
+                // Output should only contain lines with pids after the first line with pid.
+                JpsHelper.verifyJpsOutput(output, "^\\d+\\s+.*");
+                if (!isFull) {
+                    pattern = "^" + pid + "\\s+" + replaceSpecialChars(shortProcessName);
+                    if (combination.isEmpty()) {
+                        // If no arguments are specified output should only contain
+                        // pid and process name
+                        pattern += "$";
+                    } else {
+                        pattern += ".*";
+                    }
+                    output.shouldMatch(pattern);
+                }
+            }
+        }
+    }
+
+    private static String replaceSpecialChars(String str) {
+        String tmp = str.replace("\\", "\\\\");
+        tmp = tmp.replace("+", "\\+");
+        tmp = tmp.replace(".", "\\.");
+        return tmp;
+    }
+
+}
diff --git a/jdk/test/sun/tools/jps/JpsHelper.java b/jdk/test/sun/tools/jps/JpsHelper.java
new file mode 100644
index 00000000000..84bc6beccb8
--- /dev/null
+++ b/jdk/test/sun/tools/jps/JpsHelper.java
@@ -0,0 +1,238 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import static jdk.testlibrary.Asserts.assertGreaterThan;
+import static jdk.testlibrary.Asserts.assertTrue;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import jdk.testlibrary.Asserts;
+import jdk.testlibrary.JDKToolLauncher;
+import jdk.testlibrary.OutputAnalyzer;
+import jdk.testlibrary.Utils;
+
+/**
+ * The helper class for running jps utility and verifying output from it
+ */
+public final class JpsHelper {
+
+    /**
+     * Helper class for handling jps arguments
+     */
+    public enum JpsArg {
+        q,
+        l,
+        m,
+        v,
+        V;
+
+        /**
+         * Generate all possible combinations of {@link JpsArg}
+         * (31 argument combinations and no arguments case)
+         */
+        public static List> generateCombinations() {
+            final int argCount = JpsArg.values().length;
+            // If there are more than 30 args this algorithm will overflow.
+            Asserts.assertLessThan(argCount, 31, "Too many args");
+
+            List> combinations = new ArrayList<>();
+            int combinationCount = (int) Math.pow(2, argCount);
+            for (int currCombo = 0; currCombo < combinationCount; ++currCombo) {
+                List combination = new ArrayList<>();
+                for (int position = 0; position < argCount; ++position) {
+                    int bit = 1 << position;
+                    if ((bit & currCombo) != 0) {
+                        combination.add(JpsArg.values()[position]);
+                    }
+                }
+                combinations.add(combination);
+            }
+            return combinations;
+        }
+
+        /**
+         *  Return combination of {@link JpsArg} as a String array
+         */
+        public static String[] asCmdArray(List jpsArgs) {
+            List list = new ArrayList<>();
+            for (JpsArg jpsArg : jpsArgs) {
+                list.add("-" + jpsArg.toString());
+            }
+            return list.toArray(new String[list.size()]);
+        }
+
+    }
+
+    /**
+     * VM arguments to start test application with
+     */
+    public static final String[] VM_ARGS = {"-Xmx512m", "-XX:+UseParallelGC"};
+    /**
+     * VM flag to start test application with
+     */
+    public static final String VM_FLAG = "+DisableExplicitGC";
+
+    private static File vmFlagsFile = null;
+    private static List testVmArgs = null;
+    private static File manifestFile = null;
+
+    /**
+     * Create a file containing VM_FLAG in the working directory
+     */
+    public static File getVmFlagsFile() throws IOException {
+        if (vmFlagsFile == null) {
+            vmFlagsFile = new File("vmflags");
+            try (BufferedWriter output = new BufferedWriter(new FileWriter(vmFlagsFile))) {
+                output.write(VM_FLAG);
+            }
+            vmFlagsFile.deleteOnExit();
+        }
+        return vmFlagsFile;
+    }
+
+    /**
+     * Return a list of VM arguments
+     */
+    public static List getVmArgs() throws IOException {
+        if (testVmArgs == null) {
+            testVmArgs = new ArrayList<>();
+            testVmArgs.addAll(Arrays.asList(VM_ARGS));
+            testVmArgs.add("-XX:Flags=" + getVmFlagsFile().getAbsolutePath());
+        }
+        return testVmArgs;
+    }
+
+    /**
+     * Start jps utility without any arguments
+     */
+    public static OutputAnalyzer jps() throws Exception {
+        return jps(null, null);
+    }
+
+    /**
+     * Start jps utility with tool arguments
+     */
+    public static OutputAnalyzer jps(String... toolArgs) throws Exception {
+        return jps(null, Arrays.asList(toolArgs));
+    }
+
+    /**
+     * Start jps utility with VM args and tool arguments
+     */
+    public static OutputAnalyzer jps(List vmArgs, List toolArgs) throws Exception {
+        JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jps");
+        if (vmArgs != null) {
+            for (String vmArg : vmArgs) {
+                launcher.addVMArg(vmArg);
+            }
+        }
+        if (toolArgs != null) {
+            for (String toolArg : toolArgs) {
+                launcher.addToolArg(toolArg);
+            }
+        }
+
+        ProcessBuilder processBuilder = new ProcessBuilder(launcher.getCommand());
+        System.out.println(Arrays.toString(processBuilder.command().toArray()).replace(",", ""));
+        OutputAnalyzer output = new OutputAnalyzer(processBuilder.start());
+        System.out.println(output.getOutput());
+
+        return output;
+    }
+
+    /**
+     * Verify jps output contains pids and programs' name information.
+     * The function will discard any lines that come before the first line with pid.
+     * This can happen if the JVM outputs a warning message for some reason
+     * before running jps.
+     *
+     * The output can look like:
+     * 35536 Jps
+     * 35417 Main
+     * 31103 org.eclipse.equinox.launcher_1.3.0.v20120522-1813.jar
+     */
+    public static void verifyJpsOutput(OutputAnalyzer output, String regex) throws Exception {
+        output.shouldHaveExitValue(0);
+        int matchedCount = output.shouldMatchByLineFrom(regex, regex);
+        assertGreaterThan(matchedCount , 0, "Found no lines matching pattern: " + regex);
+    }
+
+    /**
+     * Compare jps output with a content in a file line by line
+     */
+    public static void verifyOutputAgainstFile(OutputAnalyzer output) throws IOException {
+        String testSrc = System.getProperty("test.src", "?");
+        File file = new File(testSrc, "usage.out");
+        List fileOutput = Utils.fileAsList(file);
+        List outputAsLines = output.asLines();
+        assertTrue(outputAsLines.containsAll(fileOutput),
+                "The ouput should contain all content of " + file.getAbsolutePath());
+    }
+
+    private static File getManifest(String className) throws IOException {
+        if (manifestFile == null) {
+            manifestFile = new File(className + ".mf");
+            try (BufferedWriter output = new BufferedWriter(new FileWriter(manifestFile))) {
+                output.write("Main-Class: " + className + Utils.NEW_LINE);
+            }
+        }
+        return manifestFile;
+    }
+
+    /**
+     * Build a jar of test classes in runtime
+     */
+    public static File buildJar(String className) throws Exception {
+        File jar = new File(className + ".jar");
+
+        List jarArgs = new ArrayList<>();
+        jarArgs.add("-cfm");
+        jarArgs.add(jar.getAbsolutePath());
+        File manifestFile = getManifest(className);
+        jarArgs.add(manifestFile.getAbsolutePath());
+        String testClassPath = System.getProperty("test.class.path", "?");
+        for (String path : testClassPath.split(File.pathSeparator)) {
+            jarArgs.add("-C");
+            jarArgs.add(path);
+            jarArgs.add(".");
+        }
+
+        System.out.println("Running jar " + jarArgs.toString());
+        sun.tools.jar.Main jarTool = new sun.tools.jar.Main(System.out, System.err, "jar");
+        if (!jarTool.run(jarArgs.toArray(new String[jarArgs.size()]))) {
+            throw new Exception("jar failed: args=" + jarArgs.toString());
+        }
+
+        manifestFile.delete();
+        jar.deleteOnExit();
+
+        return jar;
+    }
+
+}
diff --git a/jdk/test/sun/tools/jps/TestJpsClass.java b/jdk/test/sun/tools/jps/TestJpsClass.java
new file mode 100644
index 00000000000..0133e9c7c58
--- /dev/null
+++ b/jdk/test/sun/tools/jps/TestJpsClass.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.util.ArrayList;
+import java.util.List;
+
+import jdk.testlibrary.OutputAnalyzer;
+import jdk.testlibrary.ProcessTools;
+
+/*
+ * @test
+ * @summary The test application will be started with java class:
+ *          java JpsBase
+ *          For all possible combinations of jps arguments a jps process
+ *          will be started from within the test application.
+ *          The output should contain proper values.
+ * @library /lib/testlibrary
+ * @build jdk.testlibrary.* JpsHelper JpsBase
+ * @run driver TestJpsClass
+ */
+public class TestJpsClass {
+
+    public static void main(String[] args) throws Throwable {
+        String testJdk = System.getProperty("test.jdk", "?");
+        String testSrc = System.getProperty("test.src", "?");
+        String testClassPath = System.getProperty("test.class.path", "?");
+
+        List cmd = new ArrayList<>();
+        cmd.addAll(JpsHelper.getVmArgs());
+        cmd.add("-Dtest.jdk=" + testJdk);
+        cmd.add("-Dtest.src=" + testSrc);
+        cmd.add("-cp");
+        cmd.add(testClassPath);
+        cmd.add("JpsBase");
+        cmd.add("monkey");
+
+        ProcessBuilder processBuilder = ProcessTools.createJavaProcessBuilder(cmd.toArray(new String[cmd.size()]));
+        OutputAnalyzer output = new OutputAnalyzer(processBuilder.start());
+        System.out.println(output.getOutput());
+        output.shouldHaveExitValue(0);
+    }
+
+}
diff --git a/jdk/test/sun/tools/jps/TestJpsJar.java b/jdk/test/sun/tools/jps/TestJpsJar.java
new file mode 100644
index 00000000000..37230ae8e6a
--- /dev/null
+++ b/jdk/test/sun/tools/jps/TestJpsJar.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import jdk.testlibrary.OutputAnalyzer;
+import jdk.testlibrary.ProcessTools;
+
+/*
+ * @test
+ * @summary The test application will be started with absolute jar:
+ *          java -jar /tmp/jtreg/jtreg-workdir/scratch/JpsBase.jar
+ *          For all possible combinations of jps arguments a jps process
+ *          will be started from within the test application.
+ *          The output should contain proper values.
+ * @library /lib/testlibrary
+ * @build jdk.testlibrary.* JpsHelper JpsBase
+ * @run driver TestJpsJar
+ */
+public class TestJpsJar {
+
+    public static void main(String[] args) throws Throwable {
+        String testJdk = System.getProperty("test.jdk", "?");
+        String testSrc = System.getProperty("test.src", "?");
+        File jar = JpsHelper.buildJar("JpsBase");
+
+        List cmd = new ArrayList<>();
+        cmd.addAll(JpsHelper.getVmArgs());
+        cmd.add("-Dtest.jdk=" + testJdk);
+        cmd.add("-Dtest.src=" + testSrc);
+        cmd.add("-jar");
+        cmd.add(jar.getAbsolutePath());
+        cmd.add("monkey");
+
+        ProcessBuilder processBuilder = ProcessTools.createJavaProcessBuilder(cmd.toArray(new String[cmd.size()]));
+        OutputAnalyzer output = new OutputAnalyzer(processBuilder.start());
+        System.out.println(output.getOutput());
+        output.shouldHaveExitValue(0);
+    }
+
+}
diff --git a/jdk/test/sun/tools/jps/TestJpsJarRelative.java b/jdk/test/sun/tools/jps/TestJpsJarRelative.java
new file mode 100644
index 00000000000..8b7def59e9d
--- /dev/null
+++ b/jdk/test/sun/tools/jps/TestJpsJarRelative.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import jdk.testlibrary.OutputAnalyzer;
+import jdk.testlibrary.ProcessTools;
+
+/*
+ * @test
+ * @summary The test application will be started with relative jar:
+ *          java -jar ./JpsBase.jar
+ *          For all possible combinations of jps arguments a jps process
+ *          will be started from within the test application.
+ *          The output should contain proper values.
+ * @library /lib/testlibrary
+ * @build jdk.testlibrary.* JpsHelper JpsBase
+ * @run driver TestJpsJarRelative
+ */
+public class TestJpsJarRelative {
+
+    public static void main(String[] args) throws Throwable {
+        String testJdk = System.getProperty("test.jdk", "?");
+        String testSrc = System.getProperty("test.src", "?");
+        File jar = JpsHelper.buildJar("JpsBase");
+
+        List cmd = new ArrayList<>();
+        cmd.addAll(JpsHelper.getVmArgs());
+        cmd.add("-Dtest.jdk=" + testJdk);
+        cmd.add("-Dtest.src=" + testSrc);
+        cmd.add("-jar");
+        cmd.add("." + File.separator + jar.getName());
+        cmd.add("monkey");
+
+        ProcessBuilder processBuilder = ProcessTools.createJavaProcessBuilder(cmd.toArray(new String[cmd.size()]));
+        OutputAnalyzer output = new OutputAnalyzer(processBuilder.start());
+        System.out.println(output.getOutput());
+        output.shouldHaveExitValue(0);
+    }
+
+}
diff --git a/jdk/test/sun/tools/jps/TestJpsSanity.java b/jdk/test/sun/tools/jps/TestJpsSanity.java
new file mode 100644
index 00000000000..5a0868a89ab
--- /dev/null
+++ b/jdk/test/sun/tools/jps/TestJpsSanity.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import jdk.testlibrary.Asserts;
+import jdk.testlibrary.OutputAnalyzer;
+
+/*
+ * @test
+ * @summary This test verifies jps usage and checks that appropriate error message is shown
+ *          when running jps with illegal arguments.
+ * @library /lib/testlibrary
+ * @build jdk.testlibrary.* JpsHelper
+ * @run driver TestJpsSanity
+ */
+public class TestJpsSanity {
+
+    public static void main(String[] args) throws Throwable {
+        testJpsUsage();
+        testJpsVersion();
+        testJpsUnknownHost();
+    }
+
+    private static void testJpsUsage() throws Exception {
+        OutputAnalyzer output = JpsHelper.jps("-?");
+        JpsHelper.verifyOutputAgainstFile(output);
+
+        output = JpsHelper.jps("-help");
+        JpsHelper.verifyOutputAgainstFile(output);
+    }
+
+    private static void testJpsVersion() throws Exception {
+        OutputAnalyzer output = JpsHelper.jps("-version");
+        Asserts.assertNotEquals(output.getExitValue(), 0, "Exit code shouldn't be 0");
+        Asserts.assertFalse(output.getStderr().isEmpty(), "Error output should not be empty");
+        output.shouldContain("illegal argument: -version");
+    }
+
+    private static void testJpsUnknownHost() throws Exception {
+        String invalidHostName = "Oja781nh2ev7vcvbajdg-Sda1-C";
+        OutputAnalyzer output = JpsHelper.jps(invalidHostName);
+        Asserts.assertNotEquals(output.getExitValue(), 0, "Exit code shouldn't be 0");
+        Asserts.assertFalse(output.getStderr().isEmpty(), "Error output should not be empty");
+        output.shouldContain("Unknown host: " + invalidHostName);
+    }
+
+}
diff --git a/jdk/test/sun/tools/jps/jps-V_Output2.awk b/jdk/test/sun/tools/jps/jps-V_Output2.awk
deleted file mode 100644
index 3f1be046884..00000000000
--- a/jdk/test/sun/tools/jps/jps-V_Output2.awk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-BEGIN	{
-	    totallines=0; matched=0
-	}
-
-/^[0-9]+ Jps.* \+DisableExplicitGC$/	{
-	    matched++;
-	}
-
-	{ totallines++; print $0 }
-
-END	{
-	    if ((totallines > 0) && (matched >= 1)) {
-	        exit 0
-	    }
-	    else {
-	        exit 1
-	    }
-	}
diff --git a/jdk/test/sun/tools/jps/jps-Vm_Output2.awk b/jdk/test/sun/tools/jps/jps-Vm_Output2.awk
deleted file mode 100644
index 65f358b9cb3..00000000000
--- a/jdk/test/sun/tools/jps/jps-Vm_Output2.awk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-BEGIN	{
-	    totallines=0; matched=0
-	}
-
-/^[0-9]+ Jps -Vm.* \+DisableExplicitGC$/	{
-	    matched++;
-	}
-
-	{ totallines++; print $0 }
-
-END	{
-	    if ((totallines > 0) && (matched >= 1)) {
-	        exit 0
-	    }
-	    else {
-	        exit 1
-	    }
-	}
diff --git a/jdk/test/sun/tools/jps/jps-Vvm.sh b/jdk/test/sun/tools/jps/jps-Vvm.sh
deleted file mode 100644
index d60896a0b03..00000000000
--- a/jdk/test/sun/tools/jps/jps-Vvm.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 4990825
-# @run shell jps-Vvm.sh
-# @summary Test that output of 'jps -Vvm' shows JVM flags, arguments and main args
-
-. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh
-
-setup
-verify_os
-
-JPS="${TESTJAVA}/bin/jps"
-
-${JPS} -J-XX:+UsePerfData -J-XX:Flags=${TESTSRC}/vmflags -Vvm | awk -f ${TESTSRC}/jps-Vvm_Output1.awk
diff --git a/jdk/test/sun/tools/jps/jps-Vvm_Output1.awk b/jdk/test/sun/tools/jps/jps-Vvm_Output1.awk
deleted file mode 100644
index 99187dc0299..00000000000
--- a/jdk/test/sun/tools/jps/jps-Vvm_Output1.awk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-BEGIN	{
-	    totallines=0; matched=0
-	}
-
-/^[0-9]+ Jps -Vvm.*-XX:Flags=.*vmflags.* \+DisableExplicitGC$/	{
-	    matched++;
-	}
-
-	{ totallines++; print $0 }
-
-END	{
-	    if ((totallines > 0) && (matched >= 1)) {
-	        exit 0
-	    }
-	    else {
-	        exit 1
-	    }
-	}
diff --git a/jdk/test/sun/tools/jps/jps-Vvml.sh b/jdk/test/sun/tools/jps/jps-Vvml.sh
deleted file mode 100644
index f8d5fa3dc29..00000000000
--- a/jdk/test/sun/tools/jps/jps-Vvml.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 4990825
-# @run shell jps-Vvml.sh
-# @summary Test that output of 'jps -Vvml' shows JVM arguments, flags, and main args with long class names
-
-. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh
-
-setup
-verify_os
-
-JPS="${TESTJAVA}/bin/jps"
-
-${JPS} -J-XX:+UsePerfData -J-XX:Flags=${TESTSRC}/vmflags -Vvml | awk -f ${TESTSRC}/jps-Vvml_Output1.awk
diff --git a/jdk/test/sun/tools/jps/jps-Vvml_2.sh b/jdk/test/sun/tools/jps/jps-Vvml_2.sh
deleted file mode 100644
index 6fc88a38bb6..00000000000
--- a/jdk/test/sun/tools/jps/jps-Vvml_2.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 5009652
-# @library ../../jvmstat/testlibrary
-# @build Sleeper
-# @run shell jps-Vvml_2.sh
-# @summary Test that output of 'jps -Vvml' shows proper output when no JVM arguments, flags, or main args are present
-
-. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh
-
-setup
-verify_os
-
-cleanup() {
-  kill_proc ${SLEEPER_PID}
-}
-
-trap 'cleanup' 0 HUP INT QUIT TERM
-
-JPS="${TESTJAVA}/bin/jps"
-
-JAVA="${TESTJAVA}/bin/java"
-
-# fire up a Sleeper that block indefinitely - but don't pass
-# any args to Sleeper.main() or any jvm flags or options, as we
-# need to inspect jps output for the no args condition.
-#
-# Note: this test can not pass on a VM with UsePerfData disabled by default,
-# and we can not set -XX:+UsePerfData as that invalidates the test premise of
-# there being no jvm flags
-
-${JAVA} -cp ${TESTCLASSPATH:-${TESTCLASSES}} Sleeper &
-SLEEPER_PID=$!
-
-${JPS} -J-XX:Flags=${TESTSRC}/vmflags -Vvml | awk -f ${TESTSRC}/jps-Vvml_Output2.awk
-RC=$?
-
-cleanup
-
-exit ${RC}
-
diff --git a/jdk/test/sun/tools/jps/jps-Vvml_Output1.awk b/jdk/test/sun/tools/jps/jps-Vvml_Output1.awk
deleted file mode 100644
index b4d4191cb66..00000000000
--- a/jdk/test/sun/tools/jps/jps-Vvml_Output1.awk
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-
-BEGIN	{
-	    totallines=0; matched=0
-	}
-
-/^[0-9]+ sun.tools.jps.Jps -Vvml.*-XX:Flags=.*vmflags.* \+DisableExplicitGC$/	{
-	    matched++;
-	}
-
-	{ totallines++; print $0 }
-
-END	{
-	    if ((totallines > 0) && (matched >= 1)) {
-	        exit 0
-	    }
-	    else {
-	        exit 1
-	    }
-	}
diff --git a/jdk/test/sun/tools/jps/jps-Vvml_Output2.awk b/jdk/test/sun/tools/jps/jps-Vvml_Output2.awk
deleted file mode 100644
index e7cad7564a2..00000000000
--- a/jdk/test/sun/tools/jps/jps-Vvml_Output2.awk
+++ /dev/null
@@ -1,24 +0,0 @@
-# 1.1 04/03/08
-
-BEGIN	{
-	    totallines=0; matched=0
-	}
-
-/^[0-9]+ Sleeper$/	{
-	    matched++;
-	}
-
-/^[0-9]+ sun.tools.jps.Jps -Vvml.*-XX:Flags=.*vmflags.* \+DisableExplicitGC$/	{
-	    matched++;
-	}
-
-	{ totallines++; print $0 }
-
-END	{
-	    if ((totallines > 0) && (matched >= 2)) {
-	        exit 0
-	    }
-	    else {
-	        exit 1
-	    }
-	}
diff --git a/jdk/test/sun/tools/jps/jps-help.sh b/jdk/test/sun/tools/jps/jps-help.sh
deleted file mode 100644
index c6c1cbdd7d4..00000000000
--- a/jdk/test/sun/tools/jps/jps-help.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 4990825
-# @run shell jps-help.sh
-# @summary Test that output of 'jps -?' matches the usage.out file
-
-. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh
-
-setup
-
-JPS="${TESTJAVA}/bin/jps"
-
-rm -f jps.out 2>/dev/null
-${JPS} -J-XX:+UsePerfData -? > jps.out 2>&1
-
-diff -w jps.out ${TESTSRC}/usage.out
-if [ $? != 0 ]
-then
-  echo "Output of jps -? differ from expected output. Failed."
-  rm -f jps.out 2>/dev/null
-  exit 1
-fi
-
-rm -f jps.out 2>/dev/null
-${JPS} -J-XX:+UsePerfData -help > jps.out 2>&1
-
-diff -w jps.out ${TESTSRC}/usage.out
-if [ $? != 0 ]
-then
-  echo "Output of jps -help differ from expected output. Failed."
-  rm -f jps.out 2>/dev/null
-  exit 1
-fi
-
-exit 0
diff --git a/jdk/test/sun/tools/jps/jps-l_Output1.awk b/jdk/test/sun/tools/jps/jps-l_Output1.awk
deleted file mode 100644
index 08a48c17659..00000000000
--- a/jdk/test/sun/tools/jps/jps-l_Output1.awk
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-BEGIN	{
-	    totallines=0; matched=0
-	}
-
-# match on a fully qualified class name
-/^[0-9]+ [a-z|A-Z][a-z|A-Z|0-9|\.|\$|\+]*$/	{
-	    matched++;
-	}
-
-# or match on a jar or war file name - note, jar files ending with
-# ".jar" is only a convention , not a requirement. Theoretically,
-# any valid file name could occur here.
-/^[0-9]+ .*\.(jar|war)$/	{
-	    matched++;
-}
-
-# or match on the condition that the class name is not available
-/^[0-9]+ -- .*$/	{
-	    matched++;
-	}
-
-# or match an empty class name
-/^[0-9]+ $/	{
-	    matched++;
-	}
-
-	{ totallines++; print $0 }
-
-END	{
-	    if ((totallines > 0) && (matched == totallines)) {
-	        exit 0
-	    }
-	    else {
-	        exit 1
-	    }
-	}
diff --git a/jdk/test/sun/tools/jps/jps-l_Output2.awk b/jdk/test/sun/tools/jps/jps-l_Output2.awk
deleted file mode 100644
index 4df71f0af39..00000000000
--- a/jdk/test/sun/tools/jps/jps-l_Output2.awk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-BEGIN	{
-	    totallines=0; matched=0
-	}
-
-/^[0-9]+ sun.tools.jps.Jps$/	{
-	    matched++;
-	}
-
-	{ totallines++; print $0 }
-
-END	{
-	    if ((totallines > 0) && (matched >= 1)) {
-	        exit 0
-	    }
-	    else {
-	        exit 1
-	    }
-	}
diff --git a/jdk/test/sun/tools/jps/jps-lm.sh b/jdk/test/sun/tools/jps/jps-lm.sh
deleted file mode 100644
index 4a4551272c6..00000000000
--- a/jdk/test/sun/tools/jps/jps-lm.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 4990825
-# @run shell jps-lm.sh
-# @summary Test that output of 'jps -lm' shows the long class name and main args
-
-. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh
-
-setup
-verify_os
-
-JPS="${TESTJAVA}/bin/jps"
-
-${JPS} -J-XX:+UsePerfData -lm | awk -f ${TESTSRC}/jps-lm_Output1.awk
diff --git a/jdk/test/sun/tools/jps/jps-lm_Output1.awk b/jdk/test/sun/tools/jps/jps-lm_Output1.awk
deleted file mode 100644
index e3fcbeefe27..00000000000
--- a/jdk/test/sun/tools/jps/jps-lm_Output1.awk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-BEGIN	{
-	    totallines=0; matched=0
-	}
-
-/^[0-9]+ sun.tools.jps.Jps -lm$/	{
-	    matched++;
-	}
-
-	{ totallines++; print $0 }
-
-END	{
-	    if ((totallines > 0) && (matched >= 1)) {
-	        exit 0
-	    }
-	    else {
-	        exit 1
-	    }
-	}
diff --git a/jdk/test/sun/tools/jps/jps-m.sh b/jdk/test/sun/tools/jps/jps-m.sh
deleted file mode 100644
index f900b9f0d57..00000000000
--- a/jdk/test/sun/tools/jps/jps-m.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 4990825
-# @run shell jps-m.sh
-# @summary Test that output of 'jps -m' shows args to main
-
-. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh
-
-setup
-verify_os
-
-JPS="${TESTJAVA}/bin/jps"
-
-${JPS} -J-XX:+UsePerfData -m | awk -f ${TESTSRC}/jps-m_Output1.awk
diff --git a/jdk/test/sun/tools/jps/jps-m_2.sh b/jdk/test/sun/tools/jps/jps-m_2.sh
deleted file mode 100644
index b881c355244..00000000000
--- a/jdk/test/sun/tools/jps/jps-m_2.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 5009652
-# @library ../../jvmstat/testlibrary
-# @build Sleeper
-# @run shell jps-m_2.sh
-# @summary Test that output of 'jps -m' shows proper output for main with no args.
-
-. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh
-
-setup
-verify_os
-
-cleanup() {
-  kill_proc ${SLEEPER_PID}
-}
-
-trap 'cleanup' 0 HUP INT QUIT TERM
-
-JPS="${TESTJAVA}/bin/jps"
-JAVA="${TESTJAVA}/bin/java"
-
-# fire up a Sleeper that blocks indefinitely - but don't pass
-# any args to Sleeper.main(), as we need to inspect jps output
-# for the no args condition.
-#
-${JAVA} -XX:+UsePerfData -cp ${TESTCLASSPATH:-${TESTCLASSES}} Sleeper &
-SLEEPER_PID=$!
-
-${JPS} -J-XX:+UsePerfData -m | awk -f ${TESTSRC}/jps-m_Output2.awk
-RC=$?
-
-cleanup
-
-exit ${RC}
-
diff --git a/jdk/test/sun/tools/jps/jps-m_Output1.awk b/jdk/test/sun/tools/jps/jps-m_Output1.awk
deleted file mode 100644
index 560f6e8f68b..00000000000
--- a/jdk/test/sun/tools/jps/jps-m_Output1.awk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-BEGIN	{
-	    totallines=0; matched=0
-	}
-
-/^[0-9]+ Jps -m$/	{
-	    matched++;
-	}
-
-	{ totallines++; print $0 }
-
-END	{
-	    if ((totallines > 0) && (matched >= 1)) {
-	        exit 0
-	    }
-	    else {
-	        exit 1
-	    }
-	}
diff --git a/jdk/test/sun/tools/jps/jps-m_Output2.awk b/jdk/test/sun/tools/jps/jps-m_Output2.awk
deleted file mode 100644
index 0ba09ad1fc8..00000000000
--- a/jdk/test/sun/tools/jps/jps-m_Output2.awk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-BEGIN	{
-	    totallines=0; matched=0
-	}
-
-/^[0-9]+ Sleeper$/	{
-	    matched++;
-	}
-
-/^[0-9]+ Jps -m$/	{
-	    matched++;
-	}
-
-	{ totallines++; print $0 }
-
-END	{
-	    if ((totallines > 0) && (matched >= 2)) {
-	        exit 0
-	    }
-	    else {
-	        exit 1
-	    }
-	}
diff --git a/jdk/test/sun/tools/jps/jps-q.sh b/jdk/test/sun/tools/jps/jps-q.sh
deleted file mode 100644
index cd6a4ac8520..00000000000
--- a/jdk/test/sun/tools/jps/jps-q.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 4990825
-# @run shell jps-q.sh
-# @summary Test that output of 'jps -q' shows only the process ids
-
-. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh
-
-setup
-verify_os
-
-JPS="${TESTJAVA}/bin/jps"
-
-${JPS} -J-XX:+UsePerfData -q | awk -f ${TESTSRC}/jps-q_Output1.awk
diff --git a/jdk/test/sun/tools/jps/jps-q_Output1.awk b/jdk/test/sun/tools/jps/jps-q_Output1.awk
deleted file mode 100644
index 53ae3a87cc6..00000000000
--- a/jdk/test/sun/tools/jps/jps-q_Output1.awk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-BEGIN	{
-	    totallines=0; matched=0
-	}
-
-/^[0-9]+$/	{
-	    matched++;
-	}
-
-	{ totallines++; print $0 }
-
-END	{
-	    if ((totallines > 0) && (matched >= 1)) {
-	        exit 0
-	    }
-	    else {
-	        exit 1
-	    }
-	}
diff --git a/jdk/test/sun/tools/jps/jps-v_1.sh b/jdk/test/sun/tools/jps/jps-v_1.sh
deleted file mode 100644
index 21d08521104..00000000000
--- a/jdk/test/sun/tools/jps/jps-v_1.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 4990825
-# @run shell jps-v_1.sh
-# @summary Test that output of 'jps -v' shows JVM arguments
-
-. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh
-
-setup
-verify_os
-
-JPS="${TESTJAVA}/bin/jps"
-
-${JPS} -J-XX:+UsePerfData -J-XX:+UseParallelGC -v | awk -f ${TESTSRC}/jps-v_Output1.awk
diff --git a/jdk/test/sun/tools/jps/jps-v_Output1.awk b/jdk/test/sun/tools/jps/jps-v_Output1.awk
deleted file mode 100644
index 02ad298c3c1..00000000000
--- a/jdk/test/sun/tools/jps/jps-v_Output1.awk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-BEGIN	{
-	    totallines=0; matched=0
-	}
-
-/^[0-9]+ Jps.* -XX:\+UseParallelGC$/	{
-	    matched++;
-	}
-
-	{ totallines++; print $0 }
-
-END	{
-	    if ((totallines > 0) && (matched >= 1)) {
-	        exit 0
-	    }
-	    else {
-	        exit 1
-	    }
-	}
diff --git a/jdk/test/sun/tools/jps/jps-vm_1.sh b/jdk/test/sun/tools/jps/jps-vm_1.sh
deleted file mode 100644
index 80bb62e2ba2..00000000000
--- a/jdk/test/sun/tools/jps/jps-vm_1.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 4990825
-# @run shell jps-vm_1.sh
-# @summary Test that output of 'jps -vm' shows JVM arguments and main args
-
-. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh
-
-setup
-verify_os
-
-JPS="${TESTJAVA}/bin/jps"
-
-${JPS} -J-XX:+UsePerfData -J-XX:+UseParallelGC -vm | awk -f ${TESTSRC}/jps-vm_Output1.awk
diff --git a/jdk/test/sun/tools/jps/jps-vm_Output1.awk b/jdk/test/sun/tools/jps/jps-vm_Output1.awk
deleted file mode 100644
index 0cda3ca52b6..00000000000
--- a/jdk/test/sun/tools/jps/jps-vm_Output1.awk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-BEGIN	{
-	    totallines=0; matched=0
-	}
-
-/^[0-9]+ Jps -vm.* -XX:\+UseParallelGC$/	{
-	    matched++;
-	}
-
-	{ totallines++; print $0 }
-
-END	{
-	    if ((totallines > 0) && (matched >= 1)) {
-	        exit 0
-	    }
-	    else {
-	        exit 1
-	    }
-	}
diff --git a/jdk/test/sun/tools/jps/jps_Output1.awk b/jdk/test/sun/tools/jps/jps_Output1.awk
deleted file mode 100644
index c64b0f104f5..00000000000
--- a/jdk/test/sun/tools/jps/jps_Output1.awk
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-BEGIN	{
-	    totallines=0; matched=0
-	}
-
-# match on a main class name
-/^[0-9]+ [a-z|A-Z][a-z|A-Z|0-9|\$|\+]*$/	{
-	    matched++;
-	}
-
-# or match on a path name to a jar or war file - note, jar files ending with
-# ".jar" is only a convention, not a requirement. Theoretically,
-# any valid file name could occur here.
-/^[0-9]+ .*\.(jar|war)$/	{
-	    matched++;
-}
-
-# or match on the condition that the class name is not available
-/^[0-9]+ -- .*$/	{
-	    matched++;
-	}
-
-# or match an empty class name
-/^[0-9]+ $/	{
-	    matched++;
-	}
-
-	{ totallines++; print $0 }
-
-END	{
-	    if ((totallines > 0) && (matched == totallines)) {
-	        exit 0
-	    }
-	    else {
-	        exit 1
-	    }
-	}
diff --git a/jdk/test/sun/tools/jps/vmflags b/jdk/test/sun/tools/jps/vmflags
deleted file mode 100644
index be0e23c7125..00000000000
--- a/jdk/test/sun/tools/jps/vmflags
+++ /dev/null
@@ -1 +0,0 @@
-+DisableExplicitGC
diff --git a/langtools/.hgtags b/langtools/.hgtags
index 99000deb2a6..2b07047382b 100644
--- a/langtools/.hgtags
+++ b/langtools/.hgtags
@@ -268,3 +268,4 @@ aca19c52b24627a6b085cfeb433051a3e420cd81 jdk9-b22
 0402a91cd14b530b6e98452341ff853717948239 jdk9-b23
 980b18627fd3f4936be2d9e2b013abb461cb2ddb jdk9-b24
 d60b572d759449913d02478219ad87e0574a3909 jdk9-b25
+5b20a93f8db0b87b902bde48bb7cbb05e88e6e9c jdk9-b26
diff --git a/langtools/make/CompileInterim.gmk b/langtools/make/CompileInterim.gmk
index b425dc932b5..2d19f28e362 100644
--- a/langtools/make/CompileInterim.gmk
+++ b/langtools/make/CompileInterim.gmk
@@ -39,9 +39,12 @@ include CommonLangtools.gmk
 $(eval $(call SetupJavaCompilation,BUILD_INTERIM_LANGTOOLS, \
     SETUP := BOOT_JAVAC, \
     DISABLE_SJAVAC := true, \
-    SRC := $(LANGTOOLS_TOPDIR)/src/share/classes \
-        $(LANGTOOLS_OUTPUTDIR)/gensrc \
-        $(LANGTOOLS_TOPDIR)/make/tools, \
+    SRC := $(LANGTOOLS_TOPDIR)/src/java.compiler/share/classes \
+      $(LANGTOOLS_TOPDIR)/src/jdk.compiler/share/classes \
+      $(LANGTOOLS_TOPDIR)/src/jdk.javadoc/share/classes \
+      $(LANGTOOLS_TOPDIR)/src/java.base/share/classes \
+      $(LANGTOOLS_OUTPUTDIR)/gensrc/jdk.compiler \
+      $(LANGTOOLS_OUTPUTDIR)/gensrc/jdk.javadoc, \
     EXCLUDES := com/sun/tools/javac/nio compileproperties anttasks crules, \
     COPY := $(RESOURCE_SUFFIXES), \
     BIN := $(LANGTOOLS_OUTPUTDIR)/interim_classes, \
diff --git a/langtools/make/CompileLangtools.gmk b/langtools/make/CompileLangtools.gmk
deleted file mode 100644
index d15be9dde6a..00000000000
--- a/langtools/make/CompileLangtools.gmk
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# This must be the first rule
-default: all
-
-include $(SPEC)
-include MakeBase.gmk
-include JavaCompilation.gmk
-
-include CommonLangtools.gmk
-
-# Setup a compiler configuration using javac from the interim langtools jar
-# that generates code for the new jdk that is being built. The code compiled 
-# by this compiler setup, cannot necessarily be run with the bootstrap jvm.
-$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE, \
-    JVM := $(JAVA), \
-    JAVAC := $(NEW_JAVAC), \
-    FLAGS := -XDignore.symbol.file=true -Xlint:all$(COMMA)-deprecation -Werror, \
-    SERVER_DIR := $(SJAVAC_SERVER_DIR), \
-    SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
-
-$(eval $(call SetupJavaCompilation,BUILD_FULL_LANGTOOLS, \
-    SETUP := GENERATE_NEWBYTECODE, \
-    SRC := $(LANGTOOLS_TOPDIR)/src/share/classes \
-        $(LANGTOOLS_OUTPUTDIR)/gensrc \
-        $(LANGTOOLS_OUTPUTDIR)/genstubs, \
-    EXCLUDES := java/util java/io java/nio, \
-    COPY := $(RESOURCE_SUFFIXES), \
-    BIN := $(LANGTOOLS_OUTPUTDIR)/classes, \
-    JAR := $(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar))
-
-# Construct the source zip separately to avoid picking up the genstubs sources.
-$(eval $(call SetupZipArchive,ZIP_FULL_LANGTOOLS_SOURCE, \
-    SRC := $(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc, \
-    ZIP := $(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip))
-
-all: \
-    $(BUILD_FULL_LANGTOOLS) \
-    $(ZIP_FULL_LANGTOOLS_SOURCE)
diff --git a/langtools/make/GensrcLangtools.gmk b/langtools/make/GensrcLangtools.gmk
index e361a18cb10..7afde739408 100644
--- a/langtools/make/GensrcLangtools.gmk
+++ b/langtools/make/GensrcLangtools.gmk
@@ -34,10 +34,10 @@ include CommonLangtools.gmk
 
 ################################################################################
 # Setup the compilation of the properties compilation tool. You can depend
-# upon $(BUILD_TOOLS) to trigger a compilation of the tools. Note that we
-# add src/share/classes to the sourcepath. This is necessary since the GenStubs
-# program needs to be linked and run with the new javac sources.
-$(eval $(call SetupJavaCompilation,BUILD_TOOLS, \
+# upon $(BUILD_TOOLS_LANGTOOLS) to trigger a compilation of the tools. Note that 
+# we add src/share/classes to the sourcepath. This is necessary since the 
+# GenStubs program needs to be linked and run with the new javac sources.
+$(eval $(call SetupJavaCompilation,BUILD_TOOLS_LANGTOOLS, \
     SETUP := BOOT_JAVAC, \
     DISABLE_SJAVAC := true, \
     ADD_JAVAC_FLAGS := -Xprefer:source, \
@@ -51,17 +51,19 @@ TOOL_COMPILEPROPS_CMD := $(JAVA) -cp $(LANGTOOLS_OUTPUTDIR)/buildtools_classes \
     compileproperties.CompileProperties -quiet
 
 # Lookup the properties that need to be compiled into resource bundles.
-PROPSOURCES := $(shell $(FIND) $(LANGTOOLS_TOPDIR)/src/share/classes -name "*.properties")
+PROPSOURCES := $(shell $(FIND) $(LANGTOOLS_TOPDIR)/src/*/share/classes -name "*.properties")
 
+# Convert .../src//share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties
+# to .../langtools/gensrc//com/sun/tools/javac/resources/javac_zh_CN.java
 # Strip away prefix and suffix, leaving for example only: 
-# "com/sun/tools/javac/resources/javac_zh_CN"
-PROPPATHS := $(patsubst $(LANGTOOLS_TOPDIR)/src/share/classes/%.properties, %, $(PROPSOURCES))
+# "/share/classes/com/sun/tools/javac/resources/javac_zh_CN"
+PROPJAVAS := $(patsubst $(LANGTOOLS_TOPDIR)/src/%.properties, \
+    $(LANGTOOLS_OUTPUTDIR)/gensrc/%.java, \
+    $(subst /share/classes,,$(PROPSOURCES)))
 
-# Generate the list of java files to be created.
-PROPJAVAS := $(patsubst %, $(LANGTOOLS_OUTPUTDIR)/gensrc/%.java, $(PROPPATHS))
-
-# Generate the package dirs for the tobe generated java files.
-PROPDIRS := $(dir $(PROPJAVAS))
+# Generate the package dirs for the tobe generated java files. Sort to remove
+# duplicates.
+PROPDIRS := $(sort $(dir $(PROPJAVAS)))
 
 # Now generate a sequence of:
 # "-compile ...javac_zh_CN.properties ...javac_zh_CN.java java.util.ListResourceBundle"
@@ -69,40 +71,38 @@ PROPDIRS := $(dir $(PROPJAVAS))
 PROPCMDLINE := $(subst _SPACE_, $(SPACE), \
     $(join $(addprefix -compile_SPACE_, $(PROPSOURCES)), \
     $(addsuffix _SPACE_java.util.ListResourceBundle, \
-    $(addprefix _SPACE_$(LANGTOOLS_OUTPUTDIR)/gensrc/, \
-    $(addsuffix .java, $(PROPPATHS))))))
+    $(addprefix _SPACE_, $(PROPJAVAS)))))
 
 # Now setup the rule for the generation of the resource bundles.
-$(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props: $(PROPSOURCES) $(BUILD_TOOLS)
+$(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props: $(PROPSOURCES) $(BUILD_TOOLS_LANGTOOLS)
 	$(RM) -r $(@D)/*
 	$(MKDIR) -p $(@D) $(PROPDIRS)
 	$(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" \
-	    > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.properties
+	    > $(LANGTOOLS_OUTPUTDIR)/gensrc/jdk.compiler/com/sun/tools/javah/resources/version.properties
 	$(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" \
-	    > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.properties
+	    > $(LANGTOOLS_OUTPUTDIR)/gensrc/jdk.compiler/com/sun/tools/javap/resources/version.properties
 	$(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" \
-	    > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.properties
+	    > $(LANGTOOLS_OUTPUTDIR)/gensrc/jdk.compiler/com/sun/tools/javac/resources/version.properties
 	$(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" \
-	    > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.properties
+	    > $(LANGTOOLS_OUTPUTDIR)/gensrc/jdk.dev/com/sun/tools/jdeps/resources/version.properties
 	$(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" \
-	    > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javadoc/resources/version.properties
-	$(ECHO) Compiling $(words $(PROPSOURCES) javah javap javac jdeps javadoc) \
-	    properties into resource bundles
+	    > $(LANGTOOLS_OUTPUTDIR)/gensrc/jdk.javadoc/com/sun/tools/javadoc/resources/version.properties
+	$(ECHO) Compiling $(words $(PROPSOURCES) v1 v2 v3) properties into resource bundles
 	$(TOOL_COMPILEPROPS_CMD) $(PROPCMDLINE) \
-	    -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.properties \
-	        $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.java \
+	    -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/jdk.compiler/com/sun/tools/javah/resources/version.properties \
+	        $(LANGTOOLS_OUTPUTDIR)/gensrc/jdk.compiler/com/sun/tools/javah/resources/version.java \
 	        java.util.ListResourceBundle \
-	    -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.properties \
-	        $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.java \
+	    -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/jdk.compiler/com/sun/tools/javap/resources/version.properties \
+	        $(LANGTOOLS_OUTPUTDIR)/gensrc/jdk.compiler/com/sun/tools/javap/resources/version.java \
 	        java.util.ListResourceBundle \
-	    -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.properties \
-	        $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.java \
+	    -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/jdk.compiler/com/sun/tools/javac/resources/version.properties \
+	        $(LANGTOOLS_OUTPUTDIR)/gensrc/jdk.compiler/com/sun/tools/javac/resources/version.java \
 	        java.util.ListResourceBundle \
-	    -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.properties \
-	        $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.java \
+	    -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/jdk.dev/com/sun/tools/jdeps/resources/version.properties \
+	        $(LANGTOOLS_OUTPUTDIR)/gensrc/jdk.dev/com/sun/tools/jdeps/resources/version.java \
 	        java.util.ListResourceBundle \
-	    -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javadoc/resources/version.properties \
-	        $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javadoc/resources/version.java \
+	    -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/jdk.javadoc/com/sun/tools/javadoc/resources/version.properties \
+	        $(LANGTOOLS_OUTPUTDIR)/gensrc/jdk.javadoc/com/sun/tools/javadoc/resources/version.java \
 	        java.util.ListResourceBundle
 	$(TOUCH) $@
 
diff --git a/langtools/make/GenstubsLangtools.gmk b/langtools/make/GenstubsLangtools.gmk
deleted file mode 100644
index f7605ffc4f2..00000000000
--- a/langtools/make/GenstubsLangtools.gmk
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# This must be the first rule
-default: all
-
-include $(SPEC)
-include MakeBase.gmk
-
-include CommonLangtools.gmk
-
-# GenStubs is used to bootstrap any dependencies from javac to the new JDK that is not
-# yet built. It is currently not needed but might be again in the future. The following
-# exercises the functionality to verify that it works.
-TOOL_GENSTUBS_CMD = $(JAVA) \
-     "-Xbootclasspath/p:$(INTERIM_LANGTOOLS_JAR)" \
-     genstubs.GenStubs
-
-# We fetch source from the JDK...
-JDKS := $(JDK_TOPDIR)/src/share/classes
-
-# Build the list of classes to generate stubs from. java/util/function/Predicate.java isn't
-# currently needed, but is used as a demo for now.
-
-STUBSOURCES := $(shell $(FIND) $(JDKS) -name "*.java" | $(GREP) \
-    -e "$(JDKS)/java/util/function/Predicate.java")
-
-# Rewrite the file names into class names because the GenStubs tool require this.
-STUBCLASSES := $(subst /,., $(patsubst $(JDKS)/%.java, %, $(STUBSOURCES)))
-
-# Now setup the build recipe for genstubs.
-$(LANGTOOLS_OUTPUTDIR)/genstubs/_the_stubs: $(STUBSOURCES)
-	$(MKDIR) -p $(@D)
-	$(MKDIR) -p $(LANGTOOLS_OUTPUTDIR)/tmpstubs
-	$(ECHO) $(LOG_INFO) Generating stubs from JDK sources.
-	$(TOOL_GENSTUBS_CMD) -s $(LANGTOOLS_OUTPUTDIR)/tmpstubs -sourcepath $(JDKS) $(STUBCLASSES)
-	if $(DIFF) -x "_the*" -rq $(LANGTOOLS_OUTPUTDIR)/tmpstubs $(LANGTOOLS_OUTPUTDIR)/genstubs \
-	    > /dev/null 2>&1; then \
-	  $(ECHO) $(LOG_INFO) No changes in the stubs!; \
-	  $(RM) -r $(LANGTOOLS_OUTPUTDIR)/tmpstubs; \
-	else \
-	  $(ECHO) $(LOG_INFO) Changes in stubs detected!; \
-	  $(RM) -r $(@D); \
-	  $(MV) $(LANGTOOLS_OUTPUTDIR)/tmpstubs $(@D); \
-	fi
-	$(TOUCH) $@
-
-all: $(LANGTOOLS_OUTPUTDIR)/genstubs/_the_stubs
diff --git a/langtools/make/build.xml b/langtools/make/build.xml
index 208f1dd8d79..17894c8c076 100644
--- a/langtools/make/build.xml
+++ b/langtools/make/build.xml
@@ -138,9 +138,18 @@
     
     
     
-    
     
 
+    
+      
+      
+      
+      
+      
+    
+
+    
+
     
@@ -237,7 +246,9 @@
         
         
         
-        
+        
+            
+        
     
 
     
             
             
-                
+                
             
         
         
@@ -350,14 +361,24 @@
     
         
         
+            datafile="${build.coverage.dir}/cobertura.ser">
+            
+            
+            
+            
+            
+        
         
+            datafile="${build.coverage.dir}/cobertura.ser">
+            
+            
+            
+            
+            
+        
     
 
     
@@ -437,7 +458,6 @@
         
         
             
             
+            
+                
+                
+            
         
     
 
@@ -864,7 +888,7 @@
             
             
                 
-                
+                
                     
                         
                         
@@ -946,11 +970,14 @@
                 
                 
                 
-                
+                
+                    
+                        
+                    
+                
                 
-                    
+                    
                     
                     
                         
@@ -958,12 +985,14 @@
                         
                     
                 
-                
+                
+                    
+                        
+                    
+                
                 
                     
                     
+                    
+                        
+                        
+                    
                 
                 
-                    
+                    
                         
                         
                         
@@ -992,7 +1025,7 @@
                         
                         
                         
-                    
+                    
                 
             
         
@@ -1037,7 +1070,7 @@
                target="${boot.javac.target}"
                executable="${boot.java.home}/bin/javac"
                srcdir="${make.tools.dir}"
-               includes="compileproperties/* anttasks/CompileProperties*"
+               includes="compileproperties/* anttasks/CompileProperties* anttasks/PathFileSet*"
                destdir="${build.toolclasses.dir}/"
                classpath="${ant.core.lib}"
                bootclasspath="${boot.java.home}/jre/lib/rt.jar"
@@ -1099,11 +1132,11 @@
             
             
             
-             
+            
             
                  
                 
+                from source directories get javadoc'd; see packageset below -->
                  
                 
                     
          Unofficial Javadoc generated from developer sources for preview purposes only]]>
          
                     
+                    
+                    
                     
                         
                         
                     
                     
-                        
+                        
                     
                     
                     
                     
                     
-                    
+                    
+                        
+                            
+                            
+                            
+                            
+                        
+                    
+                    
+                        
+                            
+                            
+                            
+                            
+                        
+                    
+                    
+                        
+                            
+                            
+                            
+                            
+                        
+                    
+                    
+                        
+                            
+                            
+                            
+                            
+                        
+                    
+                    
                         
                             
                             
@@ -1235,7 +1302,7 @@
                         
                     
                     
-                        
+                        
                     
                 
             
diff --git a/langtools/src/share/bin/launcher.sh-template b/langtools/make/launcher.sh-template
similarity index 100%
rename from langtools/src/share/bin/launcher.sh-template
rename to langtools/make/launcher.sh-template
diff --git a/langtools/make/netbeans/langtools/build.xml b/langtools/make/netbeans/langtools/build.xml
index 0f7aeb2cee6..4e85a1e4790 100644
--- a/langtools/make/netbeans/langtools/build.xml
+++ b/langtools/make/netbeans/langtools/build.xml
@@ -79,11 +79,12 @@
     
         Must set property 'includes'
         
@@ -174,7 +175,7 @@
     
         Must set property 'debug.classname'
         
-        
+        
     
 
     
@@ -186,7 +187,7 @@
 
     
 
-    
+    
         Must set property 'class'
         
         
@@ -281,7 +282,7 @@
                         
                     
                     
-                        
+                        
                     
                 
                 ${root}/make
                 
                 
-                    
+                    
                     java
-                    ${root}/src/share/classes
+                    ${root}/src/java.base/share/classes
+                
+                
+                    
+                    java
+                    ${root}/src/java.compiler/share/classes
+                
+                
+                    
+                    java
+                    ${root}/src/jdk.compiler/share/classes
+                
+                
+                    
+                    java
+                    ${root}/src/jdk.dev/share/classes
+                
+                
+                    
+                    java
+                    ${root}/src/jdk.javadoc/share/classes
                 
                 
                     ${root}/build/classes
@@ -87,10 +107,62 @@
                 
                 
                     compile-single
-                    ${root}/src/share/classes
+                    src/java.base/share/classes
                     
                         includes
-                        ${root}/src/share/classes
+                        ${root}/src/java.base/share/classes
+                        \.java$
+                        relative-path
+                        
+                            ,
+                        
+                    
+                
+                
+                    compile-single
+                    src/java.compiler/share/classes
+                    
+                        includes
+                        ${root}/src/java.compiler/share/classes
+                        \.java$
+                        relative-path
+                        
+                            ,
+                        
+                    
+                
+                
+                    compile-single
+                    src/jdk.compiler/share/classes
+                    
+                        includes
+                        ${root}/src/jdk.compiler/share/classes
+                        \.java$
+                        relative-path
+                        
+                            ,
+                        
+                    
+                
+                
+                    compile-single
+                    src/jdk.dev/share/classes
+                    
+                        includes
+                        ${root}/src/jdk.dev/share/classes
+                        \.java$
+                        relative-path
+                        
+                            ,
+                        
+                    
+                
+                
+                    compile-single
+                    src/jdk.javadoc/share/classes
+                    
+                        includes
+                        ${root}/src/jdk.javadoc/share/classes
                         \.java$
                         relative-path
                         
@@ -105,7 +177,55 @@
                     run-single
                     
                         run.classname
-                        ${root}/src/share/classes
+                        ${root}/src/jdk.base/share/classes
+                        \.java$
+                        java-name
+                        
+                            
+                        
+                    
+                
+                
+                    run-single
+                    
+                        run.classname
+                        ${root}/src/java.compiler/share/classes
+                        \.java$
+                        java-name
+                        
+                            
+                        
+                    
+                
+                
+                    run-single
+                    
+                        run.classname
+                        ${root}/src/jdk.compiler/share/classes
+                        \.java$
+                        java-name
+                        
+                            
+                        
+                    
+                
+                
+                    run-single
+                    
+                        run.classname
+                        ${root}/src/jdk.dev/share/classes
+                        \.java$
+                        java-name
+                        
+                            
+                        
+                    
+                
+                
+                    run-single
+                    
+                        run.classname
+                        ${root}/src/jdk.javadoc/share/classes
                         \.java$
                         java-name
                         
@@ -139,7 +259,55 @@
                     debug-single
                     
                         debug.classname
-                        ${root}/src/share/classes
+                        ${root}/src/java.base/share/classes
+                        \.java$
+                        java-name
+                        
+                            
+                        
+                    
+                
+                
+                    debug-single
+                    
+                        debug.classname
+                        ${root}/src/java.compiler/share/classes
+                        \.java$
+                        java-name
+                        
+                            
+                        
+                    
+                
+                
+                    debug-single
+                    
+                        debug.classname
+                        ${root}/src/jdk.compiler/share/classes
+                        \.java$
+                        java-name
+                        
+                            
+                        
+                    
+                
+                
+                    debug-single
+                    
+                        debug.classname
+                        ${root}/src/jdk.dev/share/classes
+                        \.java$
+                        java-name
+                        
+                            
+                        
+                    
+                
+                
+                    debug-single
+                    
+                        debug.classname
+                        ${root}/src/jdk.javadoc/share/classes
                         \.java$
                         java-name
                         
@@ -165,10 +333,62 @@
                 
                 
                     debug-fix
-                    ${root}/src/share/classes
+                    src/java.base/share/classes
                     
                         class
-                        ${root}/src/share/classes
+                        ${root}/src/java.base/share/classes
+                        \.java$
+                        relative-path-noext
+                        
+                            
+                        
+                    
+                
+                
+                    debug-fix
+                    src/java.compiler/share/classes
+                    
+                        class
+                        ${root}/src/java.compiler/share/classes
+                        \.java$
+                        relative-path-noext
+                        
+                            
+                        
+                    
+                
+                
+                    debug-fix
+                    src/jdk.compiler/share/classes
+                    
+                        class
+                        ${root}/src/jdk.compiler/share/classes
+                        \.java$
+                        relative-path-noext
+                        
+                            
+                        
+                    
+                
+                
+                    debug-fix
+                    src/jdk.dev/share/classes
+                    
+                        class
+                        ${root}/src/jdk.dev/share/classes
+                        \.java$
+                        relative-path-noext
+                        
+                            
+                        
+                    
+                
+                
+                    debug-fix
+                    src/jdk.dev/share/classes
+                    
+                        class
+                        ${root}/src/jdk.javadoc/share/classes
                         \.java$
                         relative-path-noext
                         
@@ -197,8 +417,24 @@
             
                 
                     
-                        
-                        ${root}/src/share/classes
+                        
+                        ${root}/src/java.base/share/classes
+                    
+                    
+                        
+                        ${root}/src/java.compiler/share/classes
+                    
+                    
+                        
+                        ${root}/src/jdk.compiler/share/classes
+                    
+                    
+                        
+                        ${root}/src/jdk.dev/share/classes
+                    
+                    
+                        
+                        ${root}/src/jdk.javadoc/share/classes
                     
                     
                         
@@ -239,11 +475,15 @@
             
             
         
-        
+        
             
-                ${root}/src/share/classes
+                ${root}/src/java.base/share/classes
+                ${root}/src/java.compiler/share/classes
+                ${root}/src/jdk.compiler/share/classes
+                ${root}/src/jdk.dev/share/classes
+                ${root}/src/jdk.javadoc/share/classes
                 ${root}/build/classes
-                1.7
+                1.8
             
         
     
diff --git a/langtools/make/tools/anttasks/CompilePropertiesTask.java b/langtools/make/tools/anttasks/CompilePropertiesTask.java
index 7541c9f4764..d3bfe779108 100644
--- a/langtools/make/tools/anttasks/CompilePropertiesTask.java
+++ b/langtools/make/tools/anttasks/CompilePropertiesTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,20 +25,24 @@
 
 package anttasks;
 
-import compileproperties.CompileProperties;
-
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
+import compileproperties.CompileProperties;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.MatchingTask;
+import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.types.Resource;
 
 public class CompilePropertiesTask extends MatchingTask {
-    public void setSrcDir(File srcDir) {
-        this.srcDir = srcDir;
+    public void addSrc(Path src) {
+        if (srcDirs == null)
+            srcDirs = new Path(getProject());
+        srcDirs.add(src);
     }
 
     public void setDestDir(File destDir) {
@@ -64,25 +68,28 @@ public class CompilePropertiesTask extends MatchingTask {
         };
         List mainOpts = new ArrayList();
         int count = 0;
-        DirectoryScanner s = getDirectoryScanner(srcDir);
-        for (String path: s.getIncludedFiles()) {
-            if (path.endsWith(".properties")) {
-                String destPath =
-                        path.substring(0, path.length() - ".properties".length()) +
-                        ".java";
-                File srcFile = new File(srcDir, path);
-                File destFile = new File(destDir, destPath);
-                // Arguably, the comparison in the next line should be ">", not ">="
-                // but that assumes the resolution of the last modified time is fine
-                // grained enough; in practice, it is better to use ">=".
-                if (destFile.exists() && destFile.lastModified() >= srcFile.lastModified())
-                    continue;
-                destFile.getParentFile().mkdirs();
-                mainOpts.add("-compile");
-                mainOpts.add(srcFile.getPath());
-                mainOpts.add(destFile.getPath());
-                mainOpts.add(superclass);
-                count++;
+        for (String dir : srcDirs.list()) {
+            File baseDir = getProject().resolveFile(dir);
+            DirectoryScanner s = getDirectoryScanner(baseDir);
+            for (String path: s.getIncludedFiles()) {
+                if (path.endsWith(".properties")) {
+                    String destPath =
+                            path.substring(0, path.length() - ".properties".length()) +
+                            ".java";
+                    File srcFile = new File(baseDir, path);
+                    File destFile = new File(destDir, destPath);
+                    // Arguably, the comparison in the next line should be ">", not ">="
+                    // but that assumes the resolution of the last modified time is fine
+                    // grained enough; in practice, it is better to use ">=".
+                    if (destFile.exists() && destFile.lastModified() >= srcFile.lastModified())
+                        continue;
+                    destFile.getParentFile().mkdirs();
+                    mainOpts.add("-compile");
+                    mainOpts.add(srcFile.getPath());
+                    mainOpts.add(destFile.getPath());
+                    mainOpts.add(superclass);
+                    count++;
+                }
             }
         }
         if (mainOpts.size() > 0) {
@@ -95,7 +102,7 @@ public class CompilePropertiesTask extends MatchingTask {
         }
     }
 
-    private File srcDir;
+    private Path srcDirs;
     private File destDir;
     private String superclass = "java.util.ListResourceBundle";
 }
diff --git a/langtools/make/tools/compileproperties/CompileProperties.java b/langtools/make/tools/compileproperties/CompileProperties.java
index 7ee8b88d57f..49cfc8a4a4b 100644
--- a/langtools/make/tools/compileproperties/CompileProperties.java
+++ b/langtools/make/tools/compileproperties/CompileProperties.java
@@ -350,8 +350,11 @@ public class CompileProperties {
         int i = inEnd;
         int j = outEnd;
         while (i >= 0 && j >= 0) {
+            // If a dir contains a dot, it's not a valid package and most likely
+            // a module name.
             if (!inputs[i].equals(outputs[j]) ||
-                    (inputs[i].equals("gensrc") && inputs[j].equals("gensrc"))) {
+                    (inputs[i].equals("gensrc") && outputs[j].equals("gensrc")) ||
+                    (inputs[i].contains("."))) {
                 ++i;
                 ++j;
                 break;
@@ -363,9 +366,6 @@ public class CompileProperties {
         if (i < 0 || j < 0 || i >= inEnd || j >= outEnd) {
             result = "";
         } else {
-            if (inputs[i].equals("classes") && outputs[j].equals("classes")) {
-                ++i;
-            }
             inStart = i;
             StringBuffer buf = new StringBuffer();
             for (i = inStart; i <= inEnd; i++) {
diff --git a/langtools/src/share/classes/jdk/Exported.java b/langtools/src/java.base/share/classes/jdk/Exported.java
similarity index 100%
rename from langtools/src/share/classes/jdk/Exported.java
rename to langtools/src/java.base/share/classes/jdk/Exported.java
diff --git a/langtools/src/share/classes/javax/annotation/processing/AbstractProcessor.java b/langtools/src/java.compiler/share/classes/javax/annotation/processing/AbstractProcessor.java
similarity index 100%
rename from langtools/src/share/classes/javax/annotation/processing/AbstractProcessor.java
rename to langtools/src/java.compiler/share/classes/javax/annotation/processing/AbstractProcessor.java
diff --git a/langtools/src/share/classes/javax/annotation/processing/Completion.java b/langtools/src/java.compiler/share/classes/javax/annotation/processing/Completion.java
similarity index 100%
rename from langtools/src/share/classes/javax/annotation/processing/Completion.java
rename to langtools/src/java.compiler/share/classes/javax/annotation/processing/Completion.java
diff --git a/langtools/src/share/classes/javax/annotation/processing/Completions.java b/langtools/src/java.compiler/share/classes/javax/annotation/processing/Completions.java
similarity index 100%
rename from langtools/src/share/classes/javax/annotation/processing/Completions.java
rename to langtools/src/java.compiler/share/classes/javax/annotation/processing/Completions.java
diff --git a/langtools/src/share/classes/javax/annotation/processing/Filer.java b/langtools/src/java.compiler/share/classes/javax/annotation/processing/Filer.java
similarity index 100%
rename from langtools/src/share/classes/javax/annotation/processing/Filer.java
rename to langtools/src/java.compiler/share/classes/javax/annotation/processing/Filer.java
diff --git a/langtools/src/share/classes/javax/annotation/processing/FilerException.java b/langtools/src/java.compiler/share/classes/javax/annotation/processing/FilerException.java
similarity index 100%
rename from langtools/src/share/classes/javax/annotation/processing/FilerException.java
rename to langtools/src/java.compiler/share/classes/javax/annotation/processing/FilerException.java
diff --git a/langtools/src/share/classes/javax/annotation/processing/Messager.java b/langtools/src/java.compiler/share/classes/javax/annotation/processing/Messager.java
similarity index 100%
rename from langtools/src/share/classes/javax/annotation/processing/Messager.java
rename to langtools/src/java.compiler/share/classes/javax/annotation/processing/Messager.java
diff --git a/langtools/src/share/classes/javax/annotation/processing/ProcessingEnvironment.java b/langtools/src/java.compiler/share/classes/javax/annotation/processing/ProcessingEnvironment.java
similarity index 100%
rename from langtools/src/share/classes/javax/annotation/processing/ProcessingEnvironment.java
rename to langtools/src/java.compiler/share/classes/javax/annotation/processing/ProcessingEnvironment.java
diff --git a/langtools/src/share/classes/javax/annotation/processing/Processor.java b/langtools/src/java.compiler/share/classes/javax/annotation/processing/Processor.java
similarity index 100%
rename from langtools/src/share/classes/javax/annotation/processing/Processor.java
rename to langtools/src/java.compiler/share/classes/javax/annotation/processing/Processor.java
diff --git a/langtools/src/share/classes/javax/annotation/processing/RoundEnvironment.java b/langtools/src/java.compiler/share/classes/javax/annotation/processing/RoundEnvironment.java
similarity index 100%
rename from langtools/src/share/classes/javax/annotation/processing/RoundEnvironment.java
rename to langtools/src/java.compiler/share/classes/javax/annotation/processing/RoundEnvironment.java
diff --git a/langtools/src/share/classes/javax/annotation/processing/SupportedAnnotationTypes.java b/langtools/src/java.compiler/share/classes/javax/annotation/processing/SupportedAnnotationTypes.java
similarity index 100%
rename from langtools/src/share/classes/javax/annotation/processing/SupportedAnnotationTypes.java
rename to langtools/src/java.compiler/share/classes/javax/annotation/processing/SupportedAnnotationTypes.java
diff --git a/langtools/src/share/classes/javax/annotation/processing/SupportedOptions.java b/langtools/src/java.compiler/share/classes/javax/annotation/processing/SupportedOptions.java
similarity index 100%
rename from langtools/src/share/classes/javax/annotation/processing/SupportedOptions.java
rename to langtools/src/java.compiler/share/classes/javax/annotation/processing/SupportedOptions.java
diff --git a/langtools/src/share/classes/javax/annotation/processing/SupportedSourceVersion.java b/langtools/src/java.compiler/share/classes/javax/annotation/processing/SupportedSourceVersion.java
similarity index 100%
rename from langtools/src/share/classes/javax/annotation/processing/SupportedSourceVersion.java
rename to langtools/src/java.compiler/share/classes/javax/annotation/processing/SupportedSourceVersion.java
diff --git a/langtools/src/share/classes/javax/annotation/processing/package-info.java b/langtools/src/java.compiler/share/classes/javax/annotation/processing/package-info.java
similarity index 100%
rename from langtools/src/share/classes/javax/annotation/processing/package-info.java
rename to langtools/src/java.compiler/share/classes/javax/annotation/processing/package-info.java
diff --git a/langtools/src/share/classes/javax/lang/model/AnnotatedConstruct.java b/langtools/src/java.compiler/share/classes/javax/lang/model/AnnotatedConstruct.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/AnnotatedConstruct.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/AnnotatedConstruct.java
diff --git a/langtools/src/share/classes/javax/lang/model/SourceVersion.java b/langtools/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/SourceVersion.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java
diff --git a/langtools/src/share/classes/javax/lang/model/UnknownEntityException.java b/langtools/src/java.compiler/share/classes/javax/lang/model/UnknownEntityException.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/UnknownEntityException.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/UnknownEntityException.java
diff --git a/langtools/src/share/classes/javax/lang/model/element/AnnotationMirror.java b/langtools/src/java.compiler/share/classes/javax/lang/model/element/AnnotationMirror.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/element/AnnotationMirror.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/element/AnnotationMirror.java
diff --git a/langtools/src/share/classes/javax/lang/model/element/AnnotationValue.java b/langtools/src/java.compiler/share/classes/javax/lang/model/element/AnnotationValue.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/element/AnnotationValue.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/element/AnnotationValue.java
diff --git a/langtools/src/share/classes/javax/lang/model/element/AnnotationValueVisitor.java b/langtools/src/java.compiler/share/classes/javax/lang/model/element/AnnotationValueVisitor.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/element/AnnotationValueVisitor.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/element/AnnotationValueVisitor.java
diff --git a/langtools/src/share/classes/javax/lang/model/element/Element.java b/langtools/src/java.compiler/share/classes/javax/lang/model/element/Element.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/element/Element.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/element/Element.java
diff --git a/langtools/src/share/classes/javax/lang/model/element/ElementKind.java b/langtools/src/java.compiler/share/classes/javax/lang/model/element/ElementKind.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/element/ElementKind.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/element/ElementKind.java
diff --git a/langtools/src/share/classes/javax/lang/model/element/ElementVisitor.java b/langtools/src/java.compiler/share/classes/javax/lang/model/element/ElementVisitor.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/element/ElementVisitor.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/element/ElementVisitor.java
diff --git a/langtools/src/share/classes/javax/lang/model/element/ExecutableElement.java b/langtools/src/java.compiler/share/classes/javax/lang/model/element/ExecutableElement.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/element/ExecutableElement.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/element/ExecutableElement.java
diff --git a/langtools/src/share/classes/javax/lang/model/element/Modifier.java b/langtools/src/java.compiler/share/classes/javax/lang/model/element/Modifier.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/element/Modifier.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/element/Modifier.java
diff --git a/langtools/src/share/classes/javax/lang/model/element/Name.java b/langtools/src/java.compiler/share/classes/javax/lang/model/element/Name.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/element/Name.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/element/Name.java
diff --git a/langtools/src/share/classes/javax/lang/model/element/NestingKind.java b/langtools/src/java.compiler/share/classes/javax/lang/model/element/NestingKind.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/element/NestingKind.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/element/NestingKind.java
diff --git a/langtools/src/share/classes/javax/lang/model/element/PackageElement.java b/langtools/src/java.compiler/share/classes/javax/lang/model/element/PackageElement.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/element/PackageElement.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/element/PackageElement.java
diff --git a/langtools/src/share/classes/javax/lang/model/element/Parameterizable.java b/langtools/src/java.compiler/share/classes/javax/lang/model/element/Parameterizable.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/element/Parameterizable.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/element/Parameterizable.java
diff --git a/langtools/src/share/classes/javax/lang/model/element/QualifiedNameable.java b/langtools/src/java.compiler/share/classes/javax/lang/model/element/QualifiedNameable.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/element/QualifiedNameable.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/element/QualifiedNameable.java
diff --git a/langtools/src/share/classes/javax/lang/model/element/TypeElement.java b/langtools/src/java.compiler/share/classes/javax/lang/model/element/TypeElement.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/element/TypeElement.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/element/TypeElement.java
diff --git a/langtools/src/share/classes/javax/lang/model/element/TypeParameterElement.java b/langtools/src/java.compiler/share/classes/javax/lang/model/element/TypeParameterElement.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/element/TypeParameterElement.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/element/TypeParameterElement.java
diff --git a/langtools/src/share/classes/javax/lang/model/element/UnknownAnnotationValueException.java b/langtools/src/java.compiler/share/classes/javax/lang/model/element/UnknownAnnotationValueException.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/element/UnknownAnnotationValueException.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/element/UnknownAnnotationValueException.java
diff --git a/langtools/src/share/classes/javax/lang/model/element/UnknownElementException.java b/langtools/src/java.compiler/share/classes/javax/lang/model/element/UnknownElementException.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/element/UnknownElementException.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/element/UnknownElementException.java
diff --git a/langtools/src/share/classes/javax/lang/model/element/VariableElement.java b/langtools/src/java.compiler/share/classes/javax/lang/model/element/VariableElement.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/element/VariableElement.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/element/VariableElement.java
diff --git a/langtools/src/share/classes/javax/lang/model/element/package-info.java b/langtools/src/java.compiler/share/classes/javax/lang/model/element/package-info.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/element/package-info.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/element/package-info.java
diff --git a/langtools/src/share/classes/javax/lang/model/overview.html b/langtools/src/java.compiler/share/classes/javax/lang/model/overview.html
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/overview.html
rename to langtools/src/java.compiler/share/classes/javax/lang/model/overview.html
diff --git a/langtools/src/share/classes/javax/lang/model/package-info.java b/langtools/src/java.compiler/share/classes/javax/lang/model/package-info.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/package-info.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/package-info.java
diff --git a/langtools/src/share/classes/javax/lang/model/type/ArrayType.java b/langtools/src/java.compiler/share/classes/javax/lang/model/type/ArrayType.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/type/ArrayType.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/type/ArrayType.java
diff --git a/langtools/src/share/classes/javax/lang/model/type/DeclaredType.java b/langtools/src/java.compiler/share/classes/javax/lang/model/type/DeclaredType.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/type/DeclaredType.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/type/DeclaredType.java
diff --git a/langtools/src/share/classes/javax/lang/model/type/ErrorType.java b/langtools/src/java.compiler/share/classes/javax/lang/model/type/ErrorType.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/type/ErrorType.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/type/ErrorType.java
diff --git a/langtools/src/share/classes/javax/lang/model/type/ExecutableType.java b/langtools/src/java.compiler/share/classes/javax/lang/model/type/ExecutableType.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/type/ExecutableType.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/type/ExecutableType.java
diff --git a/langtools/src/share/classes/javax/lang/model/type/IntersectionType.java b/langtools/src/java.compiler/share/classes/javax/lang/model/type/IntersectionType.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/type/IntersectionType.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/type/IntersectionType.java
diff --git a/langtools/src/share/classes/javax/lang/model/type/MirroredTypeException.java b/langtools/src/java.compiler/share/classes/javax/lang/model/type/MirroredTypeException.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/type/MirroredTypeException.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/type/MirroredTypeException.java
diff --git a/langtools/src/share/classes/javax/lang/model/type/MirroredTypesException.java b/langtools/src/java.compiler/share/classes/javax/lang/model/type/MirroredTypesException.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/type/MirroredTypesException.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/type/MirroredTypesException.java
diff --git a/langtools/src/share/classes/javax/lang/model/type/NoType.java b/langtools/src/java.compiler/share/classes/javax/lang/model/type/NoType.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/type/NoType.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/type/NoType.java
diff --git a/langtools/src/share/classes/javax/lang/model/type/NullType.java b/langtools/src/java.compiler/share/classes/javax/lang/model/type/NullType.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/type/NullType.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/type/NullType.java
diff --git a/langtools/src/share/classes/javax/lang/model/type/PrimitiveType.java b/langtools/src/java.compiler/share/classes/javax/lang/model/type/PrimitiveType.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/type/PrimitiveType.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/type/PrimitiveType.java
diff --git a/langtools/src/share/classes/javax/lang/model/type/ReferenceType.java b/langtools/src/java.compiler/share/classes/javax/lang/model/type/ReferenceType.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/type/ReferenceType.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/type/ReferenceType.java
diff --git a/langtools/src/share/classes/javax/lang/model/type/TypeKind.java b/langtools/src/java.compiler/share/classes/javax/lang/model/type/TypeKind.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/type/TypeKind.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/type/TypeKind.java
diff --git a/langtools/src/share/classes/javax/lang/model/type/TypeMirror.java b/langtools/src/java.compiler/share/classes/javax/lang/model/type/TypeMirror.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/type/TypeMirror.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/type/TypeMirror.java
diff --git a/langtools/src/share/classes/javax/lang/model/type/TypeVariable.java b/langtools/src/java.compiler/share/classes/javax/lang/model/type/TypeVariable.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/type/TypeVariable.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/type/TypeVariable.java
diff --git a/langtools/src/share/classes/javax/lang/model/type/TypeVisitor.java b/langtools/src/java.compiler/share/classes/javax/lang/model/type/TypeVisitor.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/type/TypeVisitor.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/type/TypeVisitor.java
diff --git a/langtools/src/share/classes/javax/lang/model/type/UnionType.java b/langtools/src/java.compiler/share/classes/javax/lang/model/type/UnionType.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/type/UnionType.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/type/UnionType.java
diff --git a/langtools/src/share/classes/javax/lang/model/type/UnknownTypeException.java b/langtools/src/java.compiler/share/classes/javax/lang/model/type/UnknownTypeException.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/type/UnknownTypeException.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/type/UnknownTypeException.java
diff --git a/langtools/src/share/classes/javax/lang/model/type/WildcardType.java b/langtools/src/java.compiler/share/classes/javax/lang/model/type/WildcardType.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/type/WildcardType.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/type/WildcardType.java
diff --git a/langtools/src/share/classes/javax/lang/model/type/package-info.java b/langtools/src/java.compiler/share/classes/javax/lang/model/type/package-info.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/type/package-info.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/type/package-info.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor7.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor7.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor7.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor7.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor8.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor8.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor8.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor8.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor9.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor9.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor9.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor9.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor6.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor6.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor6.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor6.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor7.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor7.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor7.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor7.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor8.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor8.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor8.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor8.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor9.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor9.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor9.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor9.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/AbstractTypeVisitor7.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor7.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/AbstractTypeVisitor7.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor7.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/AbstractTypeVisitor8.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor8.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/AbstractTypeVisitor8.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor8.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/AbstractTypeVisitor9.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor9.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/AbstractTypeVisitor9.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor9.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/ElementFilter.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementFilter.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/ElementFilter.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementFilter.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor6.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor6.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor6.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor6.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor7.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor7.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor7.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor7.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor8.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor8.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor8.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor8.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor9.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor9.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor9.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor9.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/ElementScanner6.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/ElementScanner6.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/ElementScanner7.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner7.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/ElementScanner7.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner7.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/ElementScanner8.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner8.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/ElementScanner8.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner8.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/ElementScanner9.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner9.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/ElementScanner9.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner9.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/Elements.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/Elements.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/Elements.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/Elements.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor6.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor6.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor6.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor6.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor8.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor8.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor8.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor8.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor9.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor9.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor9.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor9.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor6.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor6.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor6.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor6.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor7.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor7.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor7.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor7.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor8.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor8.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor8.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor8.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor9.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor9.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor9.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor9.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/SimpleTypeVisitor7.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor7.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/SimpleTypeVisitor7.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor7.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/SimpleTypeVisitor8.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor8.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/SimpleTypeVisitor8.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor8.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/SimpleTypeVisitor9.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor9.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/SimpleTypeVisitor9.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor9.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor6.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor6.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor6.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor6.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor7.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor7.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor7.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor7.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor8.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor8.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor8.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor8.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor9.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor9.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor9.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor9.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/Types.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/Types.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/Types.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/Types.java
diff --git a/langtools/src/share/classes/javax/lang/model/util/package-info.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/package-info.java
similarity index 100%
rename from langtools/src/share/classes/javax/lang/model/util/package-info.java
rename to langtools/src/java.compiler/share/classes/javax/lang/model/util/package-info.java
diff --git a/langtools/src/share/classes/javax/tools/Diagnostic.java b/langtools/src/java.compiler/share/classes/javax/tools/Diagnostic.java
similarity index 100%
rename from langtools/src/share/classes/javax/tools/Diagnostic.java
rename to langtools/src/java.compiler/share/classes/javax/tools/Diagnostic.java
diff --git a/langtools/src/share/classes/javax/tools/DiagnosticCollector.java b/langtools/src/java.compiler/share/classes/javax/tools/DiagnosticCollector.java
similarity index 100%
rename from langtools/src/share/classes/javax/tools/DiagnosticCollector.java
rename to langtools/src/java.compiler/share/classes/javax/tools/DiagnosticCollector.java
diff --git a/langtools/src/share/classes/javax/tools/DiagnosticListener.java b/langtools/src/java.compiler/share/classes/javax/tools/DiagnosticListener.java
similarity index 100%
rename from langtools/src/share/classes/javax/tools/DiagnosticListener.java
rename to langtools/src/java.compiler/share/classes/javax/tools/DiagnosticListener.java
diff --git a/langtools/src/share/classes/javax/tools/DocumentationTool.java b/langtools/src/java.compiler/share/classes/javax/tools/DocumentationTool.java
similarity index 100%
rename from langtools/src/share/classes/javax/tools/DocumentationTool.java
rename to langtools/src/java.compiler/share/classes/javax/tools/DocumentationTool.java
diff --git a/langtools/src/share/classes/javax/tools/FileObject.java b/langtools/src/java.compiler/share/classes/javax/tools/FileObject.java
similarity index 100%
rename from langtools/src/share/classes/javax/tools/FileObject.java
rename to langtools/src/java.compiler/share/classes/javax/tools/FileObject.java
diff --git a/langtools/src/share/classes/javax/tools/ForwardingFileObject.java b/langtools/src/java.compiler/share/classes/javax/tools/ForwardingFileObject.java
similarity index 100%
rename from langtools/src/share/classes/javax/tools/ForwardingFileObject.java
rename to langtools/src/java.compiler/share/classes/javax/tools/ForwardingFileObject.java
diff --git a/langtools/src/share/classes/javax/tools/ForwardingJavaFileManager.java b/langtools/src/java.compiler/share/classes/javax/tools/ForwardingJavaFileManager.java
similarity index 100%
rename from langtools/src/share/classes/javax/tools/ForwardingJavaFileManager.java
rename to langtools/src/java.compiler/share/classes/javax/tools/ForwardingJavaFileManager.java
diff --git a/langtools/src/share/classes/javax/tools/ForwardingJavaFileObject.java b/langtools/src/java.compiler/share/classes/javax/tools/ForwardingJavaFileObject.java
similarity index 100%
rename from langtools/src/share/classes/javax/tools/ForwardingJavaFileObject.java
rename to langtools/src/java.compiler/share/classes/javax/tools/ForwardingJavaFileObject.java
diff --git a/langtools/src/share/classes/javax/tools/JavaCompiler.java b/langtools/src/java.compiler/share/classes/javax/tools/JavaCompiler.java
similarity index 100%
rename from langtools/src/share/classes/javax/tools/JavaCompiler.java
rename to langtools/src/java.compiler/share/classes/javax/tools/JavaCompiler.java
diff --git a/langtools/src/share/classes/javax/tools/JavaFileManager.java b/langtools/src/java.compiler/share/classes/javax/tools/JavaFileManager.java
similarity index 100%
rename from langtools/src/share/classes/javax/tools/JavaFileManager.java
rename to langtools/src/java.compiler/share/classes/javax/tools/JavaFileManager.java
diff --git a/langtools/src/share/classes/javax/tools/JavaFileObject.java b/langtools/src/java.compiler/share/classes/javax/tools/JavaFileObject.java
similarity index 100%
rename from langtools/src/share/classes/javax/tools/JavaFileObject.java
rename to langtools/src/java.compiler/share/classes/javax/tools/JavaFileObject.java
diff --git a/langtools/src/share/classes/javax/tools/OptionChecker.java b/langtools/src/java.compiler/share/classes/javax/tools/OptionChecker.java
similarity index 100%
rename from langtools/src/share/classes/javax/tools/OptionChecker.java
rename to langtools/src/java.compiler/share/classes/javax/tools/OptionChecker.java
diff --git a/langtools/src/share/classes/javax/tools/SimpleJavaFileObject.java b/langtools/src/java.compiler/share/classes/javax/tools/SimpleJavaFileObject.java
similarity index 100%
rename from langtools/src/share/classes/javax/tools/SimpleJavaFileObject.java
rename to langtools/src/java.compiler/share/classes/javax/tools/SimpleJavaFileObject.java
diff --git a/langtools/src/share/classes/javax/tools/StandardJavaFileManager.java b/langtools/src/java.compiler/share/classes/javax/tools/StandardJavaFileManager.java
similarity index 100%
rename from langtools/src/share/classes/javax/tools/StandardJavaFileManager.java
rename to langtools/src/java.compiler/share/classes/javax/tools/StandardJavaFileManager.java
diff --git a/langtools/src/share/classes/javax/tools/StandardLocation.java b/langtools/src/java.compiler/share/classes/javax/tools/StandardLocation.java
similarity index 100%
rename from langtools/src/share/classes/javax/tools/StandardLocation.java
rename to langtools/src/java.compiler/share/classes/javax/tools/StandardLocation.java
diff --git a/langtools/src/share/classes/javax/tools/Tool.java b/langtools/src/java.compiler/share/classes/javax/tools/Tool.java
similarity index 100%
rename from langtools/src/share/classes/javax/tools/Tool.java
rename to langtools/src/java.compiler/share/classes/javax/tools/Tool.java
diff --git a/langtools/src/share/classes/javax/tools/ToolProvider.java b/langtools/src/java.compiler/share/classes/javax/tools/ToolProvider.java
similarity index 100%
rename from langtools/src/share/classes/javax/tools/ToolProvider.java
rename to langtools/src/java.compiler/share/classes/javax/tools/ToolProvider.java
diff --git a/langtools/src/share/classes/javax/tools/overview.html b/langtools/src/java.compiler/share/classes/javax/tools/overview.html
similarity index 100%
rename from langtools/src/share/classes/javax/tools/overview.html
rename to langtools/src/java.compiler/share/classes/javax/tools/overview.html
diff --git a/langtools/src/share/classes/javax/tools/package-info.java b/langtools/src/java.compiler/share/classes/javax/tools/package-info.java
similarity index 100%
rename from langtools/src/share/classes/javax/tools/package-info.java
rename to langtools/src/java.compiler/share/classes/javax/tools/package-info.java
diff --git a/langtools/src/share/classes/com/sun/source/doctree/AttributeTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/AttributeTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/doctree/AttributeTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/AttributeTree.java
diff --git a/langtools/src/share/classes/com/sun/source/doctree/AuthorTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/AuthorTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/doctree/AuthorTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/AuthorTree.java
diff --git a/langtools/src/share/classes/com/sun/source/doctree/BlockTagTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/BlockTagTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/doctree/BlockTagTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/BlockTagTree.java
diff --git a/langtools/src/share/classes/com/sun/source/doctree/CommentTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/CommentTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/doctree/CommentTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/CommentTree.java
diff --git a/langtools/src/share/classes/com/sun/source/doctree/DeprecatedTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/DeprecatedTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/doctree/DeprecatedTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/DeprecatedTree.java
diff --git a/langtools/src/share/classes/com/sun/source/doctree/DocCommentTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/DocCommentTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/doctree/DocCommentTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/DocCommentTree.java
diff --git a/langtools/src/share/classes/com/sun/source/doctree/DocRootTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/DocRootTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/doctree/DocRootTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/DocRootTree.java
diff --git a/langtools/src/share/classes/com/sun/source/doctree/DocTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/doctree/DocTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTree.java
diff --git a/langtools/src/share/classes/com/sun/source/doctree/DocTreeVisitor.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTreeVisitor.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/doctree/DocTreeVisitor.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTreeVisitor.java
diff --git a/langtools/src/share/classes/com/sun/source/doctree/EndElementTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/EndElementTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/doctree/EndElementTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/EndElementTree.java
diff --git a/langtools/src/share/classes/com/sun/source/doctree/EntityTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/EntityTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/doctree/EntityTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/EntityTree.java
diff --git a/langtools/src/share/classes/com/sun/source/doctree/ErroneousTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ErroneousTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/doctree/ErroneousTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ErroneousTree.java
diff --git a/langtools/src/share/classes/com/sun/source/doctree/IdentifierTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/IdentifierTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/doctree/IdentifierTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/IdentifierTree.java
diff --git a/langtools/src/share/classes/com/sun/source/doctree/InheritDocTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/InheritDocTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/doctree/InheritDocTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/InheritDocTree.java
diff --git a/langtools/src/share/classes/com/sun/source/doctree/InlineTagTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/InlineTagTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/doctree/InlineTagTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/InlineTagTree.java
diff --git a/langtools/src/share/classes/com/sun/source/doctree/LinkTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/LinkTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/doctree/LinkTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/LinkTree.java
diff --git a/langtools/src/share/classes/com/sun/source/doctree/LiteralTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/LiteralTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/doctree/LiteralTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/LiteralTree.java
diff --git a/langtools/src/share/classes/com/sun/source/doctree/ParamTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ParamTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/doctree/ParamTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ParamTree.java
diff --git a/langtools/src/share/classes/com/sun/source/doctree/ReferenceTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ReferenceTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/doctree/ReferenceTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ReferenceTree.java
diff --git a/langtools/src/share/classes/com/sun/source/doctree/ReturnTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ReturnTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/doctree/ReturnTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ReturnTree.java
diff --git a/langtools/src/share/classes/com/sun/source/doctree/SeeTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/SeeTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/doctree/SeeTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/SeeTree.java
diff --git a/langtools/src/share/classes/com/sun/source/doctree/SerialDataTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/SerialDataTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/doctree/SerialDataTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/SerialDataTree.java
diff --git a/langtools/src/share/classes/com/sun/source/doctree/SerialFieldTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/SerialFieldTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/doctree/SerialFieldTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/SerialFieldTree.java
diff --git a/langtools/src/share/classes/com/sun/source/doctree/SerialTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/SerialTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/doctree/SerialTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/SerialTree.java
diff --git a/langtools/src/share/classes/com/sun/source/doctree/SinceTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/SinceTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/doctree/SinceTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/SinceTree.java
diff --git a/langtools/src/share/classes/com/sun/source/doctree/StartElementTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/StartElementTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/doctree/StartElementTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/StartElementTree.java
diff --git a/langtools/src/share/classes/com/sun/source/doctree/TextTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/TextTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/doctree/TextTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/TextTree.java
diff --git a/langtools/src/share/classes/com/sun/source/doctree/ThrowsTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ThrowsTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/doctree/ThrowsTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ThrowsTree.java
diff --git a/langtools/src/share/classes/com/sun/source/doctree/UnknownBlockTagTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/UnknownBlockTagTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/doctree/UnknownBlockTagTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/UnknownBlockTagTree.java
diff --git a/langtools/src/share/classes/com/sun/source/doctree/UnknownInlineTagTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/UnknownInlineTagTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/doctree/UnknownInlineTagTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/UnknownInlineTagTree.java
diff --git a/langtools/src/share/classes/com/sun/source/doctree/ValueTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ValueTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/doctree/ValueTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ValueTree.java
diff --git a/langtools/src/share/classes/com/sun/source/doctree/VersionTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/VersionTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/doctree/VersionTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/VersionTree.java
diff --git a/langtools/src/share/classes/com/sun/source/doctree/package-info.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/package-info.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/doctree/package-info.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/package-info.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/AnnotatedTypeTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/AnnotatedTypeTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/AnnotatedTypeTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/AnnotatedTypeTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/AnnotationTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/AnnotationTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/AnnotationTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/AnnotationTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/ArrayAccessTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ArrayAccessTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/ArrayAccessTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ArrayAccessTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/ArrayTypeTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ArrayTypeTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/ArrayTypeTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ArrayTypeTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/AssertTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/AssertTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/AssertTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/AssertTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/AssignmentTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/AssignmentTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/AssignmentTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/AssignmentTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/BinaryTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/BinaryTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/BinaryTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/BinaryTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/BlockTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/BlockTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/BlockTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/BlockTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/BreakTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/BreakTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/BreakTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/BreakTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/CaseTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/CaseTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/CaseTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/CaseTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/CatchTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/CatchTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/CatchTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/CatchTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/ClassTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ClassTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/ClassTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ClassTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/CompilationUnitTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/CompilationUnitTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/CompilationUnitTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/CompilationUnitTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/CompoundAssignmentTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/CompoundAssignmentTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/CompoundAssignmentTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/CompoundAssignmentTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/ConditionalExpressionTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ConditionalExpressionTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/ConditionalExpressionTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ConditionalExpressionTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/ContinueTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ContinueTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/ContinueTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ContinueTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/DoWhileLoopTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/DoWhileLoopTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/DoWhileLoopTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/DoWhileLoopTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/EmptyStatementTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/EmptyStatementTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/EmptyStatementTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/EmptyStatementTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/EnhancedForLoopTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/EnhancedForLoopTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/EnhancedForLoopTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/EnhancedForLoopTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/ErroneousTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ErroneousTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/ErroneousTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ErroneousTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/ExpressionStatementTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ExpressionStatementTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/ExpressionStatementTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ExpressionStatementTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/ExpressionTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ExpressionTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/ExpressionTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ExpressionTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/ForLoopTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ForLoopTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/ForLoopTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ForLoopTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/IdentifierTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/IdentifierTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/IdentifierTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/IdentifierTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/IfTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/IfTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/IfTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/IfTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/ImportTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ImportTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/ImportTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ImportTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/InstanceOfTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/InstanceOfTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/InstanceOfTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/InstanceOfTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/IntersectionTypeTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/IntersectionTypeTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/IntersectionTypeTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/IntersectionTypeTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/LabeledStatementTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/LabeledStatementTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/LabeledStatementTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/LabeledStatementTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/LambdaExpressionTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/LambdaExpressionTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/LambdaExpressionTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/LambdaExpressionTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/LineMap.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/LineMap.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/LineMap.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/LineMap.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/LiteralTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/LiteralTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/LiteralTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/LiteralTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/MemberReferenceTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/MemberReferenceTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/MemberReferenceTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/MemberReferenceTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/MemberSelectTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/MemberSelectTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/MemberSelectTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/MemberSelectTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/MethodInvocationTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/MethodInvocationTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/MethodInvocationTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/MethodInvocationTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/MethodTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/MethodTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/MethodTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/MethodTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/ModifiersTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ModifiersTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/ModifiersTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ModifiersTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/NewArrayTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/NewArrayTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/NewArrayTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/NewArrayTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/NewClassTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/NewClassTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/NewClassTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/NewClassTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/PackageTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/PackageTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/PackageTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/PackageTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/ParameterizedTypeTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ParameterizedTypeTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/ParameterizedTypeTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ParameterizedTypeTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/ParenthesizedTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ParenthesizedTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/ParenthesizedTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ParenthesizedTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/PrimitiveTypeTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/PrimitiveTypeTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/PrimitiveTypeTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/PrimitiveTypeTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/ReturnTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ReturnTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/ReturnTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ReturnTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/Scope.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/Scope.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/Scope.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/Scope.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/StatementTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/StatementTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/StatementTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/StatementTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/SwitchTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/SwitchTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/SwitchTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/SwitchTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/SynchronizedTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/SynchronizedTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/SynchronizedTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/SynchronizedTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/ThrowTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ThrowTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/ThrowTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ThrowTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/Tree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/Tree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/TreeVisitor.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/TreeVisitor.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/TryTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/TryTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/TryTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/TryTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/TypeCastTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/TypeCastTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/TypeCastTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/TypeCastTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/TypeParameterTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/TypeParameterTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/TypeParameterTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/TypeParameterTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/UnaryTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/UnaryTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/UnaryTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/UnaryTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/UnionTypeTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/UnionTypeTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/UnionTypeTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/UnionTypeTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/VariableTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/VariableTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/VariableTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/VariableTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/WhileLoopTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/WhileLoopTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/WhileLoopTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/WhileLoopTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/WildcardTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/WildcardTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/WildcardTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/WildcardTree.java
diff --git a/langtools/src/share/classes/com/sun/source/tree/package-info.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/package-info.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/tree/package-info.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/tree/package-info.java
diff --git a/langtools/src/share/classes/com/sun/source/util/DocSourcePositions.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocSourcePositions.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/util/DocSourcePositions.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocSourcePositions.java
diff --git a/langtools/src/share/classes/com/sun/source/util/DocTreePath.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocTreePath.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/util/DocTreePath.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocTreePath.java
diff --git a/langtools/src/share/classes/com/sun/source/util/DocTreePathScanner.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocTreePathScanner.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/util/DocTreePathScanner.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocTreePathScanner.java
diff --git a/langtools/src/share/classes/com/sun/source/util/DocTreeScanner.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeScanner.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/util/DocTreeScanner.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeScanner.java
diff --git a/langtools/src/share/classes/com/sun/source/util/DocTrees.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocTrees.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/util/DocTrees.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocTrees.java
diff --git a/langtools/src/share/classes/com/sun/source/util/JavacTask.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/util/JavacTask.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/util/JavacTask.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/util/JavacTask.java
diff --git a/langtools/src/share/classes/com/sun/source/util/Plugin.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/util/Plugin.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/util/Plugin.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/util/Plugin.java
diff --git a/langtools/src/share/classes/com/sun/source/util/SimpleDocTreeVisitor.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/util/SimpleDocTreeVisitor.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/util/SimpleDocTreeVisitor.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/util/SimpleDocTreeVisitor.java
diff --git a/langtools/src/share/classes/com/sun/source/util/SimpleTreeVisitor.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/util/SimpleTreeVisitor.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java
diff --git a/langtools/src/share/classes/com/sun/source/util/SourcePositions.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/util/SourcePositions.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/util/SourcePositions.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/util/SourcePositions.java
diff --git a/langtools/src/share/classes/com/sun/source/util/TaskEvent.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/util/TaskEvent.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/util/TaskEvent.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/util/TaskEvent.java
diff --git a/langtools/src/share/classes/com/sun/source/util/TaskListener.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/util/TaskListener.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/util/TaskListener.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/util/TaskListener.java
diff --git a/langtools/src/share/classes/com/sun/source/util/TreePath.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/util/TreePath.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/util/TreePath.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/util/TreePath.java
diff --git a/langtools/src/share/classes/com/sun/source/util/TreePathScanner.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/util/TreePathScanner.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/util/TreePathScanner.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/util/TreePathScanner.java
diff --git a/langtools/src/share/classes/com/sun/source/util/TreeScanner.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/util/TreeScanner.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java
diff --git a/langtools/src/share/classes/com/sun/source/util/Trees.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/util/Trees.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/util/Trees.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/util/Trees.java
diff --git a/langtools/src/share/classes/com/sun/source/util/package-info.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/util/package-info.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/source/util/package-info.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/source/util/package-info.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/AccessFlags.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/AccessFlags.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/AccessFlags.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/AccessFlags.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Annotation.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Annotation.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/Annotation.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Annotation.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/AnnotationDefault_attribute.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/AnnotationDefault_attribute.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/AnnotationDefault_attribute.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/AnnotationDefault_attribute.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Attribute.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Attribute.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/Attribute.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Attribute.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/AttributeException.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/AttributeException.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/AttributeException.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/AttributeException.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Attributes.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Attributes.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/Attributes.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Attributes.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/CharacterRangeTable_attribute.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/CharacterRangeTable_attribute.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/CharacterRangeTable_attribute.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/CharacterRangeTable_attribute.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/ClassFile.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/ClassFile.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/ClassFile.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/ClassFile.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/ClassReader.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/ClassReader.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/ClassReader.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/ClassReader.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/ClassTranslator.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/ClassTranslator.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/ClassTranslator.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/ClassTranslator.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/ClassWriter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/ClassWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/ClassWriter.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/ClassWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Code_attribute.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Code_attribute.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/Code_attribute.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Code_attribute.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/CompilationID_attribute.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/CompilationID_attribute.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/CompilationID_attribute.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/CompilationID_attribute.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/ConstantPool.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/ConstantPool.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/ConstantPool.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/ConstantPool.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/ConstantPoolException.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/ConstantPoolException.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/ConstantPoolException.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/ConstantPoolException.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/ConstantValue_attribute.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/ConstantValue_attribute.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/ConstantValue_attribute.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/ConstantValue_attribute.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/DefaultAttribute.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/DefaultAttribute.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/DefaultAttribute.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/DefaultAttribute.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Dependencies.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Dependencies.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/Dependencies.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Dependencies.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Dependency.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Dependency.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/Dependency.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Dependency.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Deprecated_attribute.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Deprecated_attribute.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/Deprecated_attribute.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Deprecated_attribute.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Descriptor.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Descriptor.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/Descriptor.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Descriptor.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/DescriptorException.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/DescriptorException.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/DescriptorException.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/DescriptorException.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/EnclosingMethod_attribute.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/EnclosingMethod_attribute.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/EnclosingMethod_attribute.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/EnclosingMethod_attribute.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Exceptions_attribute.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Exceptions_attribute.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/Exceptions_attribute.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Exceptions_attribute.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Field.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Field.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/Field.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Field.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/InnerClasses_attribute.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/InnerClasses_attribute.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/InnerClasses_attribute.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/InnerClasses_attribute.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Instruction.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Instruction.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/Instruction.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Instruction.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Method.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Method.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/Method.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Method.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/MethodParameters_attribute.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/MethodParameters_attribute.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/MethodParameters_attribute.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/MethodParameters_attribute.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Opcode.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Opcode.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/Opcode.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Opcode.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/ReferenceFinder.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/ReferenceFinder.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/ReferenceFinder.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/ReferenceFinder.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/RuntimeAnnotations_attribute.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/RuntimeAnnotations_attribute.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/RuntimeAnnotations_attribute.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/RuntimeAnnotations_attribute.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleAnnotations_attribute.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/RuntimeInvisibleAnnotations_attribute.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleAnnotations_attribute.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/RuntimeInvisibleAnnotations_attribute.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleParameterAnnotations_attribute.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/RuntimeInvisibleParameterAnnotations_attribute.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleParameterAnnotations_attribute.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/RuntimeInvisibleParameterAnnotations_attribute.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleTypeAnnotations_attribute.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/RuntimeInvisibleTypeAnnotations_attribute.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleTypeAnnotations_attribute.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/RuntimeInvisibleTypeAnnotations_attribute.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/RuntimeParameterAnnotations_attribute.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/RuntimeParameterAnnotations_attribute.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/RuntimeParameterAnnotations_attribute.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/RuntimeParameterAnnotations_attribute.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/RuntimeTypeAnnotations_attribute.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/RuntimeTypeAnnotations_attribute.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/RuntimeTypeAnnotations_attribute.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/RuntimeTypeAnnotations_attribute.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/RuntimeVisibleAnnotations_attribute.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/RuntimeVisibleAnnotations_attribute.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/RuntimeVisibleAnnotations_attribute.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/RuntimeVisibleAnnotations_attribute.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/RuntimeVisibleTypeAnnotations_attribute.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/RuntimeVisibleTypeAnnotations_attribute.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/RuntimeVisibleTypeAnnotations_attribute.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/RuntimeVisibleTypeAnnotations_attribute.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Signature.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Signature.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/Signature.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Signature.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Signature_attribute.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Signature_attribute.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/Signature_attribute.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Signature_attribute.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/SourceDebugExtension_attribute.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/SourceDebugExtension_attribute.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/SourceDebugExtension_attribute.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/SourceDebugExtension_attribute.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/SourceFile_attribute.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/SourceFile_attribute.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/SourceFile_attribute.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/SourceFile_attribute.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/SourceID_attribute.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/SourceID_attribute.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/SourceID_attribute.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/SourceID_attribute.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/StackMap_attribute.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/StackMap_attribute.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/StackMap_attribute.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/StackMap_attribute.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Synthetic_attribute.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Synthetic_attribute.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/Synthetic_attribute.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Synthetic_attribute.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Type.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Type.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/Type.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Type.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/TypeAnnotation.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/TypeAnnotation.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/TypeAnnotation.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/TypeAnnotation.java
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/package-info.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/package-info.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/classfile/package-info.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/package-info.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclint/Checker.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/Checker.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclint/Checker.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/Checker.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclint/DocLint.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/DocLint.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclint/DocLint.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/DocLint.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclint/Entity.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/Entity.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclint/Entity.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/Entity.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclint/Env.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/Env.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclint/Env.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/Env.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclint/HtmlTag.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/HtmlTag.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclint/HtmlTag.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/HtmlTag.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclint/Messages.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/Messages.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclint/Messages.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/Messages.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclint/resources/doclint.properties b/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/resources/doclint.properties
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclint/resources/doclint.properties
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/resources/doclint.properties
diff --git a/langtools/src/share/classes/com/sun/tools/doclint/resources/doclint_ja.properties b/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/resources/doclint_ja.properties
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclint/resources/doclint_ja.properties
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/resources/doclint_ja.properties
diff --git a/langtools/src/share/classes/com/sun/tools/doclint/resources/doclint_zh_CN.properties b/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/resources/doclint_zh_CN.properties
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclint/resources/doclint_zh_CN.properties
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/resources/doclint_zh_CN.properties
diff --git a/langtools/src/share/classes/com/sun/tools/javac/Main.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/Main.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/Main.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/Main.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/api/BasicJavacTask.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/BasicJavacTask.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/api/BasicJavacTask.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/BasicJavacTask.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/api/ClientCodeWrapper.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/ClientCodeWrapper.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/api/ClientCodeWrapper.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/ClientCodeWrapper.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/api/Formattable.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/Formattable.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/api/Formattable.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/Formattable.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/api/JavacScope.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacScope.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/api/JavacScope.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacScope.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/api/JavacTool.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTool.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/api/JavacTool.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTool.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/api/Messages.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/Messages.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/api/Messages.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/Messages.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/api/MultiTaskListener.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/MultiTaskListener.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/api/MultiTaskListener.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/MultiTaskListener.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/api/WrappingJavaFileManager.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/WrappingJavaFileManager.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/api/WrappingJavaFileManager.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/WrappingJavaFileManager.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/AnnoConstruct.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/AnnoConstruct.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/code/AnnoConstruct.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/AnnoConstruct.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Attribute.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Attribute.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/code/Attribute.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Attribute.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/BoundKind.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/BoundKind.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/code/BoundKind.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/BoundKind.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/ClassFinder.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/code/ClassFinder.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/DeferredLintHandler.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/DeferredLintHandler.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/code/DeferredLintHandler.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/DeferredLintHandler.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Flags.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/code/Flags.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Kinds.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Kinds.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/code/Kinds.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Kinds.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Lint.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/code/Lint.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Printer.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Printer.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/code/Printer.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Printer.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Scope.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Scope.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/code/Scope.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Scope.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Source.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/code/Source.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/SymbolMetadata.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/SymbolMetadata.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/code/SymbolMetadata.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/SymbolMetadata.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Symtab.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/code/Symtab.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/TargetType.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TargetType.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/code/TargetType.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TargetType.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Type.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/code/Type.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/TypeTag.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeTag.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/code/TypeTag.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeTag.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Types.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/code/Types.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/AttrContext.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/AttrContext.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/comp/AttrContext.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/AttrContext.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/AttrContextEnv.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/AttrContextEnv.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/comp/AttrContextEnv.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/AttrContextEnv.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/comp/Check.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/CompileStates.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/CompileStates.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/comp/CompileStates.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/CompileStates.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/ConstFold.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ConstFold.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/comp/ConstFold.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ConstFold.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/DeferredAttr.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/DeferredAttr.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Enter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Enter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/comp/Enter.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Enter.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Env.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Env.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/comp/Env.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Env.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/MemberEnter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/MemberEnter.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Todo.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Todo.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/comp/Todo.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Todo.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/TypeEnvs.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnvs.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/comp/TypeEnvs.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnvs.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/file/BaseFileObject.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/BaseFileObject.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/file/BaseFileObject.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/BaseFileObject.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/file/CacheFSInfo.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/CacheFSInfo.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/file/CacheFSInfo.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/CacheFSInfo.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/file/FSInfo.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/FSInfo.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/file/FSInfo.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/FSInfo.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/file/Locations.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/file/Locations.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/file/RegularFileObject.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/RegularFileObject.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/file/RegularFileObject.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/RegularFileObject.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/file/RelativePath.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/RelativePath.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/file/RelativePath.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/RelativePath.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/file/SymbolArchive.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/SymbolArchive.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/file/SymbolArchive.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/SymbolArchive.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/file/ZipArchive.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/ZipArchive.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/file/ZipArchive.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/ZipArchive.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/ZipFileIndex.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/ZipFileIndex.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/file/ZipFileIndexArchive.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/ZipFileIndexArchive.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/file/ZipFileIndexArchive.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/ZipFileIndexArchive.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/file/ZipFileIndexCache.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/ZipFileIndexCache.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/file/ZipFileIndexCache.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/ZipFileIndexCache.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/jvm/ByteCodes.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ByteCodes.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/jvm/ByteCodes.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ByteCodes.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/jvm/CRTFlags.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/CRTFlags.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/jvm/CRTFlags.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/CRTFlags.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/jvm/CRTable.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/CRTable.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/jvm/CRTable.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/CRTable.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassFile.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/jvm/ClassFile.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/jvm/Code.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Code.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/jvm/Code.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Code.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/jvm/Items.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Items.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/jvm/Items.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Items.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/jvm/JNIWriter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/JNIWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/jvm/JNIWriter.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/JNIWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/jvm/LVTRanges.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/LVTRanges.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/jvm/LVTRanges.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/LVTRanges.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/jvm/Pool.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Pool.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/jvm/Pool.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Pool.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/jvm/Profile.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Profile.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/jvm/Profile.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Profile.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/jvm/Target.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/jvm/Target.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/jvm/UninitializedType.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/UninitializedType.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/jvm/UninitializedType.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/UninitializedType.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/main/CommandLine.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/CommandLine.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/main/CommandLine.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/CommandLine.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/main/Main.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Main.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/main/Main.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Main.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/main/Option.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/main/Option.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/main/OptionHelper.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/OptionHelper.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/main/OptionHelper.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/OptionHelper.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/model/FilteredMemberList.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/model/FilteredMemberList.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/model/FilteredMemberList.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/model/FilteredMemberList.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/model/JavacElements.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/model/JavacElements.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/model/JavacSourcePosition.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacSourcePosition.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/model/JavacSourcePosition.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacSourcePosition.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/model/JavacTypes.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacTypes.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/model/JavacTypes.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacTypes.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/nio/PathFileManager.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/nio/PathFileManager.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/nio/PathFileManager.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/nio/PathFileManager.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/nio/PathFileObject.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/nio/PathFileObject.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/nio/PathFileObject.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/nio/PathFileObject.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/DocCommentParser.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/DocCommentParser.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/parser/DocCommentParser.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/DocCommentParser.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/JavadocTokenizer.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavadocTokenizer.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/parser/JavadocTokenizer.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavadocTokenizer.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/LazyDocCommentTable.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/LazyDocCommentTable.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/parser/LazyDocCommentTable.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/LazyDocCommentTable.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/Lexer.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Lexer.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/parser/Lexer.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Lexer.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/Parser.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Parser.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/parser/Parser.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Parser.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/ParserFactory.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ParserFactory.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/parser/ParserFactory.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ParserFactory.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/Scanner.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Scanner.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/parser/Scanner.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Scanner.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/ScannerFactory.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ScannerFactory.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/parser/ScannerFactory.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ScannerFactory.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/Tokens.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Tokens.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/parser/Tokens.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Tokens.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/UnicodeReader.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/UnicodeReader.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/parser/UnicodeReader.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/UnicodeReader.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/processing/AnnotationProcessingError.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/AnnotationProcessingError.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/processing/AnnotationProcessingError.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/AnnotationProcessingError.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/processing/JavacFiler.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacFiler.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/processing/JavacFiler.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacFiler.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/processing/JavacMessager.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacMessager.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/processing/JavacMessager.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacMessager.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/processing/JavacRoundEnvironment.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacRoundEnvironment.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/processing/JavacRoundEnvironment.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacRoundEnvironment.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/processing/ServiceProxy.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/ServiceProxy.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/processing/ServiceProxy.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/ServiceProxy.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
diff --git a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties
diff --git a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties
diff --git a/langtools/src/share/classes/com/sun/tools/javac/resources/javac.properties b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/resources/javac.properties
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
diff --git a/langtools/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_ja.properties
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_ja.properties
diff --git a/langtools/src/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties
diff --git a/langtools/src/share/classes/com/sun/tools/javac/resources/legacy.properties b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/legacy.properties
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/resources/legacy.properties
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/legacy.properties
diff --git a/langtools/src/share/classes/com/sun/tools/javac/resources/version.properties-template b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/version.properties-template
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/resources/version.properties-template
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/version.properties-template
diff --git a/langtools/src/share/classes/com/sun/tools/javac/services/javax.tools.JavaCompilerTool b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/services/javax.tools.JavaCompilerTool
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/services/javax.tools.JavaCompilerTool
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/services/javax.tools.JavaCompilerTool
diff --git a/langtools/src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/sym/CreateSymbols.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/sym/CreateSymbols.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/sym/Profiles.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/sym/Profiles.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/sym/Profiles.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/sym/Profiles.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/DCTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DCTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/tree/DCTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DCTree.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/DocCommentTable.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocCommentTable.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/tree/DocCommentTable.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocCommentTable.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/DocPretty.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocPretty.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/tree/DocPretty.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocPretty.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/DocTreeMaker.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocTreeMaker.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/tree/DocTreeMaker.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocTreeMaker.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/EndPosTable.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/EndPosTable.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/tree/EndPosTable.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/EndPosTable.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/Pretty.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/tree/Pretty.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeCopier.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeCopier.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeScanner.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeScanner.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/tree/TreeScanner.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeScanner.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeTranslator.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeTranslator.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/tree/TreeTranslator.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeTranslator.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/Abort.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Abort.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/Abort.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Abort.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/AbstractLog.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/AbstractLog.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/AbstractLog.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/AbstractLog.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/ArrayUtils.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ArrayUtils.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/ArrayUtils.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ArrayUtils.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/Assert.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Assert.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/Assert.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Assert.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/BaseFileManager.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/BaseFileManager.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/BaseFileManager.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/BaseFileManager.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/Bits.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Bits.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/Bits.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Bits.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/ByteBuffer.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ByteBuffer.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/ByteBuffer.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ByteBuffer.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/ClientCodeException.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ClientCodeException.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/ClientCodeException.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ClientCodeException.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/Constants.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Constants.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/Constants.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Constants.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/Context.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Context.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/Context.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Context.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/Convert.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Convert.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/Convert.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Convert.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/Dependencies.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Dependencies.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/Dependencies.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Dependencies.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/DiagnosticSource.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/DiagnosticSource.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/DiagnosticSource.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/DiagnosticSource.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/FatalError.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/FatalError.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/FatalError.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/FatalError.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/Filter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Filter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/Filter.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Filter.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/ForwardingDiagnosticFormatter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ForwardingDiagnosticFormatter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/ForwardingDiagnosticFormatter.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ForwardingDiagnosticFormatter.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/GraphUtils.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/GraphUtils.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/GraphUtils.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/GraphUtils.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/IntHashTable.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/IntHashTable.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/IntHashTable.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/IntHashTable.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JCDiagnostic.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JCDiagnostic.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/JavacMessages.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JavacMessages.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/JavacMessages.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JavacMessages.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/LayoutCharacters.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/LayoutCharacters.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/LayoutCharacters.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/LayoutCharacters.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/List.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/List.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/List.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/List.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/ListBuffer.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ListBuffer.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/ListBuffer.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ListBuffer.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/Log.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/Log.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/MandatoryWarningHandler.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/MandatoryWarningHandler.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/MandatoryWarningHandler.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/MandatoryWarningHandler.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/Name.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Name.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/Name.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Name.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/Names.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/Names.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/Options.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Options.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/Options.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Options.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/Pair.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Pair.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/Pair.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Pair.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/Position.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Position.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/Position.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Position.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/PropagatedException.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/PropagatedException.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/PropagatedException.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/PropagatedException.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/ServiceLoader.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ServiceLoader.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/ServiceLoader.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ServiceLoader.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/SharedNameTable.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/SharedNameTable.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/SharedNameTable.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/SharedNameTable.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/StringUtils.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/StringUtils.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/StringUtils.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/StringUtils.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/UnsharedNameTable.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/UnsharedNameTable.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/UnsharedNameTable.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/UnsharedNameTable.java
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/Warner.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Warner.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javac/util/Warner.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Warner.java
diff --git a/langtools/src/share/classes/com/sun/tools/javah/Gen.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/Gen.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javah/Gen.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/Gen.java
diff --git a/langtools/src/share/classes/com/sun/tools/javah/InternalError.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/InternalError.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javah/InternalError.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/InternalError.java
diff --git a/langtools/src/share/classes/com/sun/tools/javah/JNI.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/JNI.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javah/JNI.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/JNI.java
diff --git a/langtools/src/share/classes/com/sun/tools/javah/JavahFileManager.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/JavahFileManager.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javah/JavahFileManager.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/JavahFileManager.java
diff --git a/langtools/src/share/classes/com/sun/tools/javah/JavahTask.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/JavahTask.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javah/JavahTask.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/JavahTask.java
diff --git a/langtools/src/share/classes/com/sun/tools/javah/JavahTool.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/JavahTool.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javah/JavahTool.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/JavahTool.java
diff --git a/langtools/src/share/classes/com/sun/tools/javah/LLNI.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/LLNI.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javah/LLNI.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/LLNI.java
diff --git a/langtools/src/share/classes/com/sun/tools/javah/Main.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/Main.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javah/Main.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/Main.java
diff --git a/langtools/src/share/classes/com/sun/tools/javah/Mangle.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/Mangle.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javah/Mangle.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/Mangle.java
diff --git a/langtools/src/share/classes/com/sun/tools/javah/NativeHeaderTool.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/NativeHeaderTool.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javah/NativeHeaderTool.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/NativeHeaderTool.java
diff --git a/langtools/src/share/classes/com/sun/tools/javah/TypeSignature.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/TypeSignature.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javah/TypeSignature.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/TypeSignature.java
diff --git a/langtools/src/share/classes/com/sun/tools/javah/Util.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/Util.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javah/Util.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/Util.java
diff --git a/langtools/src/share/classes/com/sun/tools/javah/resources/l10n.properties b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n.properties
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javah/resources/l10n.properties
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n.properties
diff --git a/langtools/src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n_ja.properties
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n_ja.properties
diff --git a/langtools/src/share/classes/com/sun/tools/javah/resources/l10n_zh_CN.properties b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n_zh_CN.properties
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javah/resources/l10n_zh_CN.properties
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n_zh_CN.properties
diff --git a/langtools/src/share/classes/com/sun/tools/javah/resources/version.properties-template b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/version.properties-template
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javah/resources/version.properties-template
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/version.properties-template
diff --git a/langtools/src/share/classes/com/sun/tools/javap/AnnotationWriter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/AnnotationWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javap/AnnotationWriter.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/AnnotationWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/javap/AttributeWriter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/AttributeWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javap/AttributeWriter.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/AttributeWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/javap/BasicWriter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/BasicWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javap/BasicWriter.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/BasicWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/javap/ClassWriter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/ClassWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javap/ClassWriter.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/ClassWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/javap/CodeWriter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/CodeWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javap/CodeWriter.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/CodeWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/javap/ConstantWriter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/ConstantWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javap/ConstantWriter.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/ConstantWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/javap/Context.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/Context.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javap/Context.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/Context.java
diff --git a/langtools/src/share/classes/com/sun/tools/javap/DisassemblerTool.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/DisassemblerTool.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javap/DisassemblerTool.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/DisassemblerTool.java
diff --git a/langtools/src/share/classes/com/sun/tools/javap/InstructionDetailWriter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/InstructionDetailWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javap/InstructionDetailWriter.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/InstructionDetailWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/javap/InternalError.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/InternalError.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javap/InternalError.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/InternalError.java
diff --git a/langtools/src/share/classes/com/sun/tools/javap/JavapFileManager.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/JavapFileManager.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javap/JavapFileManager.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/JavapFileManager.java
diff --git a/langtools/src/share/classes/com/sun/tools/javap/JavapTask.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/JavapTask.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javap/JavapTask.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/JavapTask.java
diff --git a/langtools/src/share/classes/com/sun/tools/javap/LocalVariableTableWriter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/LocalVariableTableWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javap/LocalVariableTableWriter.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/LocalVariableTableWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/javap/LocalVariableTypeTableWriter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/LocalVariableTypeTableWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javap/LocalVariableTypeTableWriter.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/LocalVariableTypeTableWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/javap/Main.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/Main.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javap/Main.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/Main.java
diff --git a/langtools/src/share/classes/com/sun/tools/javap/Messages.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/Messages.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javap/Messages.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/Messages.java
diff --git a/langtools/src/share/classes/com/sun/tools/javap/Options.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/Options.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javap/Options.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/Options.java
diff --git a/langtools/src/share/classes/com/sun/tools/javap/SourceWriter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/SourceWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javap/SourceWriter.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/SourceWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/javap/StackMapWriter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/StackMapWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javap/StackMapWriter.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/StackMapWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/javap/TryBlockWriter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/TryBlockWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javap/TryBlockWriter.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/TryBlockWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/javap/overview.html b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/overview.html
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javap/overview.html
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/overview.html
diff --git a/langtools/src/share/classes/com/sun/tools/javap/package-info.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/package-info.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javap/package-info.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/package-info.java
diff --git a/langtools/src/share/classes/com/sun/tools/javap/resources/javap.properties b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/resources/javap.properties
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javap/resources/javap.properties
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/resources/javap.properties
diff --git a/langtools/src/share/classes/com/sun/tools/javap/resources/javap_ja.properties b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/resources/javap_ja.properties
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javap/resources/javap_ja.properties
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/resources/javap_ja.properties
diff --git a/langtools/src/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties
diff --git a/langtools/src/share/classes/com/sun/tools/javap/resources/version.properties-template b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/resources/version.properties-template
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javap/resources/version.properties-template
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/resources/version.properties-template
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/BuildState.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/BuildState.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/BuildState.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/BuildState.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/CleanProperties.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CleanProperties.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/CleanProperties.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CleanProperties.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/CompileChunk.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileChunk.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/CompileChunk.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileChunk.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/CompileJavaPackages.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileJavaPackages.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/CompileJavaPackages.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileJavaPackages.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/CompileProperties.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileProperties.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/CompileProperties.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileProperties.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/CopyFile.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CopyFile.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/CopyFile.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CopyFile.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/JavacState.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/JavacState.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/JavacState.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/JavacState.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/Log.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Log.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/Log.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Log.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/Main.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Main.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/Main.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Main.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/Module.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Module.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/Module.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Module.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/Package.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Package.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/Package.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Package.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/ProblemException.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/ProblemException.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/ProblemException.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/ProblemException.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/Source.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Source.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/Source.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Source.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/Transformer.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Transformer.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/Transformer.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Transformer.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/Util.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Util.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/Util.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Util.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/comp/AttrWithDeps.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/AttrWithDeps.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/comp/AttrWithDeps.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/AttrWithDeps.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/comp/Dependencies.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/Dependencies.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/comp/Dependencies.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/Dependencies.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/comp/JavaCompilerWithDeps.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/JavaCompilerWithDeps.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/comp/JavaCompilerWithDeps.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/JavaCompilerWithDeps.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/comp/JavacServiceImpl.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/JavacServiceImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/comp/JavacServiceImpl.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/JavacServiceImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/comp/PubapiVisitor.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PubapiVisitor.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/comp/PubapiVisitor.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PubapiVisitor.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/comp/ResolveWithDeps.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/ResolveWithDeps.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/comp/ResolveWithDeps.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/ResolveWithDeps.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/comp/SmartFileManager.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartFileManager.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/comp/SmartFileManager.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartFileManager.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/comp/SmartFileObject.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartFileObject.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/comp/SmartFileObject.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartFileObject.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/comp/SmartWriter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/comp/SmartWriter.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/options/ArgumentIterator.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/ArgumentIterator.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/options/ArgumentIterator.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/ArgumentIterator.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/options/Option.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Option.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/options/Option.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Option.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/options/OptionHelper.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/OptionHelper.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/options/OptionHelper.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/OptionHelper.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/options/Options.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Options.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/options/Options.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Options.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/options/SourceLocation.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/SourceLocation.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/options/SourceLocation.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/SourceLocation.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/server/CompilationResult.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/CompilationResult.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/server/CompilationResult.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/CompilationResult.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/server/CompilerPool.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/CompilerPool.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/server/CompilerPool.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/CompilerPool.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/server/CompilerThread.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/CompilerThread.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/server/CompilerThread.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/CompilerThread.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/server/JavacServer.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/JavacServer.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/server/JavacServer.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/JavacServer.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/server/JavacService.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/JavacService.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/server/JavacService.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/JavacService.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/server/JavacServiceClient.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/JavacServiceClient.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/server/JavacServiceClient.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/JavacServiceClient.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/server/PortFile.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/PortFile.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/server/PortFile.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/PortFile.java
diff --git a/langtools/src/share/classes/com/sun/tools/sjavac/server/SysInfo.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/SysInfo.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/sjavac/server/SysInfo.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/SysInfo.java
diff --git a/langtools/src/share/classes/com/sun/tools/jdeps/Analyzer.java b/langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/Analyzer.java
similarity index 64%
rename from langtools/src/share/classes/com/sun/tools/jdeps/Analyzer.java
rename to langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/Analyzer.java
index c999c3c58dd..d69b8019cc8 100644
--- a/langtools/src/share/classes/com/sun/tools/jdeps/Analyzer.java
+++ b/langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/Analyzer.java
@@ -24,6 +24,7 @@
  */
 package com.sun.tools.jdeps;
 
+import java.io.PrintStream;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -34,7 +35,6 @@ import java.util.Set;
 import java.util.stream.Collectors;
 
 import com.sun.tools.classfile.Dependency.Location;
-import com.sun.tools.jdeps.PlatformClassPath.JDKArchive;
 
 /**
  * Dependency Analyzer.
@@ -59,11 +59,11 @@ public class Analyzer {
         boolean accepts(Location origin, Archive originArchive, Location target, Archive targetArchive);
     }
 
-    private final Type type;
-    private final Filter filter;
-    private final Map results = new HashMap<>();
-    private final Map map = new HashMap<>();
-    private final Archive NOT_FOUND
+    protected final Type type;
+    protected final Filter filter;
+    protected final Map results = new HashMap<>();
+    protected final Map map = new HashMap<>();
+    private static final Archive NOT_FOUND
         = new Archive(JdepsTask.getMessage("artifact.not.found"));
 
     /**
@@ -80,7 +80,7 @@ public class Analyzer {
     /**
      * Performs the dependency analysis on the given archives.
      */
-    public void run(List archives) {
+    public boolean run(List archives) {
         // build a map from Location to Archive
         buildLocationArchiveMap(archives);
 
@@ -90,9 +90,10 @@ public class Analyzer {
             archive.visitDependences(deps);
             results.put(archive, deps);
         }
+        return true;
     }
 
-    private void buildLocationArchiveMap(List archives) {
+    protected void buildLocationArchiveMap(List archives) {
         // build a map from Location to Archive
         for (Archive archive: archives) {
             for (Location l: archive.getClasses()) {
@@ -187,7 +188,11 @@ public class Analyzer {
         }
 
         Profile getTargetProfile(Archive target) {
-            return JDKArchive.isProfileArchive(target) ? profile : null;
+            if (target instanceof Module) {
+                return Profile.getProfile((Module) target);
+            } else {
+                return null;
+            }
         }
 
         Archive findArchive(Location t) {
@@ -217,7 +222,7 @@ public class Analyzer {
                     requires.add(targetArchive);
                 }
             }
-            if (targetArchive instanceof JDKArchive) {
+            if (targetArchive instanceof Module) {
                 Profile p = Profile.getProfile(t.getPackageName());
                 if (profile == null || (p != null && p.compareTo(profile) > 0)) {
                     profile = p;
@@ -307,5 +312,131 @@ public class Analyzer {
                            + Objects.hashCode(this.targetArchive);
             return hash;
         }
+
+        public String toString() {
+            return String.format("%s (%s) -> %s (%s)%n",
+                    origin, originArchive.getName(),
+                    target, targetArchive.getName());
+        }
+    }
+
+    static Analyzer getExportedAPIsAnalyzer() {
+        return new ModuleAccessAnalyzer(ModuleAccessAnalyzer.reexportsFilter, true);
+    }
+
+    static Analyzer getModuleAccessAnalyzer() {
+        return new ModuleAccessAnalyzer(ModuleAccessAnalyzer.accessCheckFilter, false);
+    }
+
+    private static class ModuleAccessAnalyzer extends Analyzer {
+        private final boolean apionly;
+        ModuleAccessAnalyzer(Filter filter, boolean apionly) {
+            super(Type.VERBOSE, filter);
+            this.apionly = apionly;
+        }
+        /**
+         * Verify module access
+         */
+        public boolean run(List archives) {
+            // build a map from Location to Archive
+            buildLocationArchiveMap(archives);
+
+            // traverse and analyze all dependencies
+            int count = 0;
+            for (Archive archive : archives) {
+                ArchiveDeps checker = new ArchiveDeps(archive, type);
+                archive.visitDependences(checker);
+                count += checker.dependencies().size();
+                // output if any error
+                Module m = (Module)archive;
+                printDependences(System.err, m, checker.dependencies());
+                results.put(archive, checker);
+            }
+            return count == 0;
+        }
+
+        private void printDependences(PrintStream out, Module m, Set deps) {
+            if (deps.isEmpty())
+                return;
+
+            String msg = apionly ? "API reference:" : "inaccessible reference:";
+            deps.stream().sorted(Comparator.comparing(Dep::origin)
+                                           .thenComparing(Dep::target))
+                .forEach(d -> out.format("%s %s (%s) -> %s (%s)%n", msg,
+                                         d.origin(), d.originArchive().getName(),
+                                         d.target(), d.targetArchive().getName()));
+            if (apionly) {
+                out.format("Dependences missing re-exports=\"true\" attribute:%n");
+                deps.stream()
+                        .map(Dep::targetArchive)
+                        .map(Archive::getName)
+                        .distinct()
+                        .sorted()
+                        .forEach(d -> out.format("  %s -> %s%n", m.name(), d));
+            }
+        }
+
+        private static Module findModule(Archive archive) {
+            if (Module.class.isInstance(archive)) {
+                return (Module) archive;
+            } else {
+                return null;
+            }
+        }
+
+        // returns true if target is accessible by origin
+        private static boolean canAccess(Location o, Archive originArchive, Location t, Archive targetArchive) {
+            Module origin = findModule(originArchive);
+            Module target = findModule(targetArchive);
+
+            if (targetArchive == Analyzer.NOT_FOUND) {
+                return false;
+            }
+
+            // unnamed module
+            // ## should check public type?
+            if (target == null)
+                return true;
+
+            // module-private
+            if (origin == target)
+                return true;
+
+            return target.isAccessibleTo(t.getClassName(), origin);
+        }
+
+        static final Filter accessCheckFilter = new Filter() {
+            @Override
+            public boolean accepts(Location o, Archive originArchive, Location t, Archive targetArchive) {
+                return !canAccess(o, originArchive, t, targetArchive);
+            }
+        };
+
+        static final Filter reexportsFilter = new Filter() {
+            @Override
+            public boolean accepts(Location o, Archive originArchive, Location t, Archive targetArchive) {
+                Module origin = findModule(originArchive);
+                Module target = findModule(targetArchive);
+                if (!origin.isExportedPackage(o.getPackageName())) {
+                    // filter non-exported classes
+                    return false;
+                }
+
+                boolean accessible = canAccess(o, originArchive, t, targetArchive);
+                if (!accessible)
+                    return true;
+
+                String mn = target.name();
+                // skip checking re-exports for java.base
+                if (origin == target || "java.base".equals(mn))
+                    return false;
+
+                assert origin.requires().containsKey(mn);  // otherwise, should not be accessible
+                if (origin.requires().get(mn)) {
+                    return false;
+                }
+                return true;
+            }
+        };
     }
 }
diff --git a/langtools/src/share/classes/com/sun/tools/jdeps/Archive.java b/langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/Archive.java
similarity index 95%
rename from langtools/src/share/classes/com/sun/tools/jdeps/Archive.java
rename to langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/Archive.java
index 669575d106c..ebb07741db3 100644
--- a/langtools/src/share/classes/com/sun/tools/jdeps/Archive.java
+++ b/langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/Archive.java
@@ -24,6 +24,7 @@
  */
 package com.sun.tools.jdeps;
 
+import com.sun.tools.classfile.ClassFile;
 import com.sun.tools.classfile.Dependency.Location;
 
 import java.io.IOException;
@@ -47,11 +48,13 @@ public class Archive {
     protected Map> deps = new ConcurrentHashMap<>();
 
     protected Archive(String name) {
+        this(name, null);
+    }
+    protected Archive(String name, ClassFileReader reader) {
         this.path = null;
         this.filename = name;
-        this.reader = null;
+        this.reader = reader;
     }
-
     protected Archive(Path p, ClassFileReader reader) {
         this.path = p;
         this.filename = path.getFileName().toString();
diff --git a/langtools/src/share/classes/com/sun/tools/jdeps/ClassFileReader.java b/langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/ClassFileReader.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/jdeps/ClassFileReader.java
rename to langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/ClassFileReader.java
diff --git a/langtools/src/share/classes/com/sun/tools/jdeps/JdepsTask.java b/langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/JdepsTask.java
similarity index 86%
rename from langtools/src/share/classes/com/sun/tools/jdeps/JdepsTask.java
rename to langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/JdepsTask.java
index 621d8108b0a..cf4a7a9d0fd 100644
--- a/langtools/src/share/classes/com/sun/tools/jdeps/JdepsTask.java
+++ b/langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/JdepsTask.java
@@ -31,7 +31,6 @@ import com.sun.tools.classfile.Dependencies;
 import com.sun.tools.classfile.Dependencies.ClassFileError;
 import com.sun.tools.classfile.Dependency;
 import com.sun.tools.classfile.Dependency.Location;
-import com.sun.tools.jdeps.PlatformClassPath.JDKArchive;
 import static com.sun.tools.jdeps.Analyzer.Type.*;
 import java.io.*;
 import java.nio.file.DirectoryStream;
@@ -194,9 +193,13 @@ class JdepsTask {
         new Option(false, "-P", "-profile") {
             void process(JdepsTask task, String opt, String arg) throws BadArgs {
                 task.options.showProfile = true;
-                if (Profile.getProfileCount() == 0) {
-                    throw new BadArgs("err.option.unsupported", opt, getMessage("err.profiles.msg"));
-                }
+                task.options.showModule = false;
+            }
+        },
+        new Option(false, "-M", "-module") {
+            void process(JdepsTask task, String opt, String arg) throws BadArgs {
+                task.options.showModule = true;
+                task.options.showProfile = false;
             }
         },
         new Option(false, "-apionly") {
@@ -221,6 +224,25 @@ class JdepsTask {
                 }
             }
         },
+            new HiddenOption(false, "-verify:access") {
+                void process(JdepsTask task, String opt, String arg) {
+                    task.options.verifyAccess = true;
+                    task.options.verbose = VERBOSE;
+                    task.options.filterSameArchive = false;
+                    task.options.filterSamePackage = false;
+                }
+            },
+            new HiddenOption(true, "-mp") {
+                void process(JdepsTask task, String opt, String arg) throws BadArgs {
+                    task.options.mpath = Paths.get(arg);
+                    if (!Files.isDirectory(task.options.mpath)) {
+                        throw new BadArgs("err.invalid.path", arg);
+                    }
+                    if (task.options.includePattern == null) {
+                        task.options.includePattern = Pattern.compile(".*");
+                    }
+                }
+            },
         new Option(false, "-version") {
             void process(JdepsTask task, String opt, String arg) {
                 task.options.version = true;
@@ -294,7 +316,7 @@ class JdepsTask {
                 showHelp();
                 return EXIT_CMDERR;
             }
-            if (options.findJDKInternals &&
+            if ((options.findJDKInternals || options.verifyAccess) &&
                    (options.regex != null || options.packageNames.size() > 0 || options.showSummary)) {
                 showHelp();
                 return EXIT_CMDERR;
@@ -303,6 +325,7 @@ class JdepsTask {
                 showHelp();
                 return EXIT_CMDERR;
             }
+
             boolean ok = run();
             return ok ? EXIT_OK : EXIT_ERROR;
         } catch (BadArgs e) {
@@ -319,10 +342,19 @@ class JdepsTask {
     }
 
     private final List sourceLocations = new ArrayList<>();
+    private final List classpaths = new ArrayList<>();
+    private final List initialArchives = new ArrayList<>();
     private boolean run() throws IOException {
-        // parse classfiles and find all dependencies
-        findDependencies();
+        buildArchives();
 
+        if (options.verifyAccess) {
+            return verifyModuleAccess();
+        } else {
+            return analyzeDeps();
+        }
+    }
+
+    private boolean analyzeDeps() throws IOException {
         Analyzer analyzer = new Analyzer(options.verbose, new Analyzer.Filter() {
             @Override
             public boolean accepts(Location origin, Archive originArchive,
@@ -330,8 +362,8 @@ class JdepsTask {
             {
                 if (options.findJDKInternals) {
                     // accepts target that is JDK class but not exported
-                    return isJDKArchive(targetArchive) &&
-                              !((JDKArchive) targetArchive).isExported(target.getClassName());
+                    return isJDKModule(targetArchive) &&
+                              !((Module) targetArchive).isExported(target.getClassName());
                 } else if (options.filterSameArchive) {
                     // accepts origin and target that from different archive
                     return originArchive != targetArchive;
@@ -340,6 +372,9 @@ class JdepsTask {
             }
         });
 
+        // parse classfiles and find all dependencies
+        findDependencies(options.apiOnly);
+
         // analyze the dependencies
         analyzer.run(sourceLocations);
 
@@ -358,6 +393,31 @@ class JdepsTask {
         return true;
     }
 
+    private boolean verifyModuleAccess() throws IOException {
+        // two passes
+        // 1. check API dependences where the types of dependences must be re-exported
+        // 2. check all dependences where types must be accessible
+
+        // pass 1
+        findDependencies(true /* api only */);
+        Analyzer analyzer = Analyzer.getExportedAPIsAnalyzer();
+        boolean pass1 = analyzer.run(sourceLocations);
+        if (!pass1) {
+            System.out.println("ERROR: Failed API access verification");
+        }
+        // pass 2
+        findDependencies(false);
+        analyzer =  Analyzer.getModuleAccessAnalyzer();
+        boolean pass2 = analyzer.run(sourceLocations);
+        if (!pass2) {
+            System.out.println("ERROR: Failed module access verification");
+        }
+        if (pass1 & pass2) {
+            System.out.println("Access verification succeeded.");
+        }
+        return pass1 & pass2;
+    }
+
     private void generateSummaryDotFile(Path dir, Analyzer analyzer) throws IOException {
         // If verbose mode (-v or -verbose option),
         // the summary.dot file shows package-level dependencies.
@@ -469,31 +529,46 @@ class JdepsTask {
 
     /**
      * Tests if the given class matches the pattern given in the -include option
-     * or if it's a public class if -apionly option is specified
      */
-    private boolean matches(String classname, AccessFlags flags) {
-        if (options.apiOnly && !flags.is(AccessFlags.ACC_PUBLIC)) {
-            return false;
-        } else if (options.includePattern != null) {
+    private boolean matches(String classname) {
+        if (options.includePattern != null) {
             return options.includePattern.matcher(classname.replace('/', '.')).matches();
         } else {
             return true;
         }
     }
 
-    private void findDependencies() throws IOException {
-        Dependency.Finder finder =
-            options.apiOnly ? Dependencies.getAPIFinder(AccessFlags.ACC_PROTECTED)
-                            : Dependencies.getClassDependencyFinder();
-        Dependency.Filter filter = new DependencyFilter();
-
-        List archives = new ArrayList<>();
-        Deque roots = new LinkedList<>();
+    private void buildArchives() throws IOException {
         for (String s : classes) {
             Path p = Paths.get(s);
             if (Files.exists(p)) {
-                archives.add(Archive.getInstance(p));
-            } else {
+                initialArchives.add(Archive.getInstance(p));
+            }
+        }
+        sourceLocations.addAll(initialArchives);
+
+        classpaths.addAll(getClassPathArchives(options.classpath));
+        if (options.includePattern != null) {
+            initialArchives.addAll(classpaths);
+        }
+        classpaths.addAll(PlatformClassPath.getArchives(options.mpath));
+        if (options.mpath != null) {
+            initialArchives.addAll(PlatformClassPath.getArchives(options.mpath));
+        }
+        // add all classpath archives to the source locations for reporting
+        sourceLocations.addAll(classpaths);
+    }
+
+    private void findDependencies(boolean apiOnly) throws IOException {
+        Dependency.Finder finder =
+            apiOnly ? Dependencies.getAPIFinder(AccessFlags.ACC_PROTECTED)
+                    : Dependencies.getClassDependencyFinder();
+        Dependency.Filter filter = new DependencyFilter();
+
+        Deque roots = new LinkedList<>();
+        for (String s : classes) {
+            Path p = Paths.get(s);
+            if (!Files.exists(p)) {
                 if (isValidClassName(s)) {
                     roots.add(s);
                 } else {
@@ -501,17 +576,6 @@ class JdepsTask {
                 }
             }
         }
-        sourceLocations.addAll(archives);
-
-        List classpaths = new ArrayList<>(); // for class file lookup
-        classpaths.addAll(getClassPathArchives(options.classpath));
-        if (options.includePattern != null) {
-            archives.addAll(classpaths);
-        }
-        classpaths.addAll(PlatformClassPath.getArchives());
-
-        // add all classpath archives to the source locations for reporting
-        sourceLocations.addAll(classpaths);
 
         // Work queue of names of classfiles to be searched.
         // Entries will be unique, and for classes that do not yet have
@@ -520,7 +584,7 @@ class JdepsTask {
         Set doneClasses = new HashSet<>();
 
         // get the immediate dependencies of the input files
-        for (Archive a : archives) {
+        for (Archive a : initialArchives) {
             for (ClassFile cf : a.reader().getClassFiles()) {
                 String classFileName;
                 try {
@@ -530,7 +594,7 @@ class JdepsTask {
                 }
 
                 // tests if this class matches the -include or -apiOnly option if specified
-                if (!matches(classFileName, cf.access_flags)) {
+                if (!matches(classFileName) || (apiOnly && !cf.access_flags.is(AccessFlags.ACC_PUBLIC))) {
                     continue;
                 }
 
@@ -577,10 +641,6 @@ class JdepsTask {
                             // if name is a fully-qualified class name specified
                             // from command-line, this class might already be parsed
                             doneClasses.add(classFileName);
-                            // process @jdk.Exported for JDK classes
-                            if (isJDKArchive(a)) {
-                                ((JDKArchive)a).processJdkExported(cf);
-                            }
                             for (Dependency d : finder.findDependencies(cf)) {
                                 if (depth == 0) {
                                     // ignore the dependency
@@ -700,6 +760,7 @@ class JdepsTask {
         boolean version;
         boolean fullVersion;
         boolean showProfile;
+        boolean showModule;
         boolean showSummary;
         boolean apiOnly;
         boolean showLabel;
@@ -717,6 +778,9 @@ class JdepsTask {
         Set packageNames = new HashSet<>();
         String regex;             // apply to the dependences
         Pattern includePattern;   // apply to classes
+        // module boundary access check
+        boolean verifyAccess;
+        Path mpath;
     }
     private static class ResourceBundleHelper {
         static final ResourceBundle versionRB;
@@ -803,8 +867,12 @@ class JdepsTask {
         @Override
         public void visitDependence(String origin, Archive originArchive,
                                     String target, Archive targetArchive) {
-            writer.format("%s -> %s", originArchive.getName(), targetArchive.getPathName());
-            if (options.showProfile && JDKArchive.isProfileArchive(targetArchive)) {
+            String targetName =  targetArchive.getPathName();
+            if (options.showModule && isJDKModule(targetArchive)) {
+                targetName = ((Module)targetArchive).name();
+            }
+            writer.format("%s -> %s", originArchive.getName(), targetName);
+            if (options.showProfile && isJDKModule(targetArchive)) {
                 writer.format(" (%s)", target);
             }
             writer.format("%n");
@@ -856,12 +924,14 @@ class JdepsTask {
         public void visitDependence(String origin, Archive originArchive,
                                     String target, Archive targetArchive) {
             String targetName = type == PACKAGE ? target : targetArchive.getName();
-            if (type == PACKAGE) {
-                String tag = toTag(target, targetArchive, type);
-                if (!tag.isEmpty())
-                    targetName += " (" + tag + ")";
-            } else if (options.showProfile && JDKArchive.isProfileArchive(targetArchive)) {
-                targetName += " (" + target + ")";
+            if (isJDKModule(targetArchive)) {
+                Module m = (Module)targetArchive;
+                String n = showProfileOrModule(m);
+                if (!n.isEmpty()) {
+                    targetName += " (" + n + ")";
+                }
+            } else if (type == PACKAGE) {
+                targetName += " (" + targetArchive.getName() + ")";
             }
             String label = getLabel(originArchive, targetArchive);
             writer.format("  %-50s -> \"%s\"%s;%n",
@@ -884,7 +954,7 @@ class JdepsTask {
                     edges.putIfAbsent(originArchive, new HashMap<>());
                     edges.get(originArchive).putIfAbsent(targetArchive, new StringBuilder());
                     StringBuilder sb = edges.get(originArchive).get(targetArchive);
-                    String tag = toTag(target, targetArchive, PACKAGE);
+                    String tag = toTag(target, targetArchive);
                     addLabel(sb, origin, target, tag);
                 }
 
@@ -902,8 +972,8 @@ class JdepsTask {
     /**
      * Test if the given archive is part of the JDK
      */
-    private boolean isJDKArchive(Archive archive) {
-        return JDKArchive.class.isInstance(archive);
+    private boolean isJDKModule(Archive archive) {
+        return Module.class.isInstance(archive);
     }
 
     /**
@@ -913,34 +983,42 @@ class JdepsTask {
      *
      * For non-JDK archives, this method returns the file name of the archive.
      */
-    private String toTag(String name, Archive source, Analyzer.Type type) {
-        if (!isJDKArchive(source)) {
+    private String toTag(String name, Archive source) {
+        if (!isJDKModule(source)) {
             return source.getName();
         }
 
-        JDKArchive jdk = (JDKArchive)source;
+        Module module = (Module)source;
         boolean isExported = false;
-        if (type == CLASS || type == VERBOSE) {
-            isExported = jdk.isExported(name);
+        if (options.verbose == CLASS || options.verbose == VERBOSE) {
+            isExported = module.isExported(name);
         } else {
-            isExported = jdk.isExportedPackage(name);
+            isExported = module.isExportedPackage(name);
         }
-        Profile p = getProfile(name, type);
         if (isExported) {
             // exported API
-            return options.showProfile && p != null ? p.profileName() : "";
+            return showProfileOrModule(module);
         } else {
             return "JDK internal API (" + source.getName() + ")";
         }
     }
 
-    private String toTag(String name, Archive source) {
-        return toTag(name, source, options.verbose);
+    private String showProfileOrModule(Module m) {
+        String tag = "";
+        if (options.showProfile) {
+            Profile p = Profile.getProfile(m);
+            if (p != null) {
+                tag = p.profileName();
+            }
+        } else if (options.showModule) {
+            tag = m.name();
+        }
+        return tag;
     }
 
-    private Profile getProfile(String name, Analyzer.Type type) {
+    private Profile getProfile(String name) {
         String pn = name;
-        if (type == CLASS || type == VERBOSE) {
+        if (options.verbose == CLASS || options.verbose == VERBOSE) {
             int i = name.lastIndexOf('.');
             pn = i > 0 ? name.substring(0, i) : "";
         }
diff --git a/langtools/src/share/classes/com/sun/tools/jdeps/Main.java b/langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/Main.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/jdeps/Main.java
rename to langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/Main.java
diff --git a/langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/Module.java b/langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/Module.java
new file mode 100644
index 00000000000..bb046292ffb
--- /dev/null
+++ b/langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/Module.java
@@ -0,0 +1,196 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.sun.tools.jdeps;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+
+/**
+ * JDeps internal representation of module for dependency analysis.
+ */
+final class Module extends Archive {
+    private final String moduleName;
+    private final Map requires;
+    private final Map> exports;
+    private final Set packages;
+
+    private Module(ClassFileReader reader, String name,
+                   Map requires,
+                   Map> exports,
+                   Set packages) {
+        super(name, reader);
+        this.moduleName = name;
+        this.requires = Collections.unmodifiableMap(requires);
+        this.exports = Collections.unmodifiableMap(exports);
+        this.packages = Collections.unmodifiableSet(packages);
+    }
+
+    public String name() {
+        return moduleName;
+    }
+
+    public Map requires() {
+        return requires;
+    }
+
+    public Map> exports() {
+        return exports;
+    }
+
+    public Set packages() {
+        return packages;
+    }
+
+    /**
+     * Tests if this module can read m
+     */
+    public boolean canRead(Module m) {
+        // ## TODO: handle "re-exported=true"
+        // all JDK modules require all modules containing its direct dependences
+        // should not be an issue
+        return requires.containsKey(m.name());
+    }
+
+    /**
+     * Tests if a given fully-qualified name is an exported type.
+     */
+    public boolean isExported(String cn) {
+        int i = cn.lastIndexOf('.');
+        String pn = i > 0 ? cn.substring(0, i) : "";
+
+        return isExportedPackage(pn);
+    }
+
+    /**
+     * Tests if a given package name is exported.
+     */
+    public boolean isExportedPackage(String pn) {
+        return exports.containsKey(pn) ? exports.get(pn).isEmpty() : false;
+    }
+
+    /**
+     * Tests if the given classname is accessible to module m
+     */
+    public boolean isAccessibleTo(String classname, Module m) {
+        int i = classname.lastIndexOf('.');
+        String pn = i > 0 ? classname.substring(0, i) : "";
+        if (!packages.contains(pn)) {
+            throw new IllegalArgumentException(classname + " is not a member of module " + name());
+        }
+
+        if (m != null && !m.canRead(this)) {
+            trace("%s not readable by %s%n", this.name(), m.name());
+            return false;
+        }
+
+        // exported API
+        Set ms = exports().get(pn);
+        String mname = m != null ? m.name() : "unnamed";
+        if (ms == null) {
+            trace("%s not exported in %s%n", classname, this.name());
+        } else if (!(ms.isEmpty() || ms.contains(mname))) {
+            trace("%s not permit to %s %s%n", classname, mname, ms);
+        }
+        return ms != null && (ms.isEmpty() || ms.contains(mname));
+    }
+
+    private static final boolean traceOn = Boolean.getBoolean("jdeps.debug");
+    private void trace(String fmt, Object... args) {
+        if (traceOn) {
+            System.err.format(fmt, args);
+        }
+    }
+
+    @Override
+    public boolean equals(Object ob) {
+        if (!(ob instanceof Module))
+            return false;
+        Module that = (Module)ob;
+        return (moduleName.equals(that.moduleName)
+                && requires.equals(that.requires)
+                && exports.equals(that.exports)
+                && packages.equals(that.packages));
+    }
+
+    @Override
+    public int hashCode() {
+        int hc = moduleName.hashCode();
+        hc = hc * 43 + requires.hashCode();
+        hc = hc * 43 + exports.hashCode();
+        hc = hc * 43 + packages.hashCode();
+        return hc;
+    }
+
+    @Override
+    public String toString() {
+        return name();
+    }
+
+    public final static class Builder {
+        String name;
+        ClassFileReader reader;
+        final Map requires = new HashMap<>();
+        final Map> exports = new HashMap<>();
+        final Set packages = new HashSet<>();
+
+        public Builder() {
+        }
+
+        public Builder name(String n) {
+            name = n;
+            return this;
+        }
+
+        public Builder require(String d, boolean reexport) {
+         //   System.err.format("%s depend %s reexports %s%n", name, d, reexport);
+            requires.put(d, reexport);
+            return this;
+        }
+
+        public Builder include(String p) {
+            packages.add(p);
+            return this;
+        }
+
+        public Builder export(String p, Set ms) {
+            Objects.requireNonNull(p);
+            Objects.requireNonNull(ms);
+            exports.put(p, new HashSet<>(ms));
+            return this;
+        }
+        public Builder classes(ClassFileReader reader) {
+            this.reader = reader;
+            return this;
+        }
+        public Module build() {
+            Module m = new Module(reader, name, requires, exports, packages);
+            return m;
+        }
+    }
+}
diff --git a/langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/ModulesXmlReader.java b/langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/ModulesXmlReader.java
new file mode 100644
index 00000000000..6a2e95f434c
--- /dev/null
+++ b/langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/ModulesXmlReader.java
@@ -0,0 +1,225 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.sun.tools.jdeps;
+
+import com.sun.tools.classfile.ClassFile;
+import com.sun.tools.jdeps.PlatformClassPath.LegacyImageHelper;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLEventReader;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.events.Attribute;
+import javax.xml.stream.events.XMLEvent;
+
+abstract class ModulesXmlReader {
+    abstract ClassFileReader getClassFileReader(String modulename, Set packages)
+        throws IOException;
+
+    static class ImageReader extends ModulesXmlReader {
+        final LegacyImageHelper helper;
+        ImageReader(LegacyImageHelper helper) {
+            this.helper = helper;
+        }
+        ClassFileReader getClassFileReader(String modulename, Set packages)
+            throws IOException
+        {
+            return helper.getClassReader(modulename, packages);
+        }
+    }
+
+    static class ModulePathReader extends ModulesXmlReader {
+        final Path mpath;
+        final ClassFileReader defaultReader;
+        ModulePathReader(Path mp) throws IOException {
+            this.mpath = mp;
+            this.defaultReader = new NonExistModuleReader(mpath);
+        }
+        ClassFileReader getClassFileReader(String modulename, Set packages)
+            throws IOException
+        {
+            Path mdir = mpath.resolve(modulename);
+            if (Files.exists(mdir) && Files.isDirectory(mdir)) {
+                return ClassFileReader.newInstance(mdir);
+            } else {
+                // aggregator module or os-specific module in modules.xml
+                // mdir not exist
+                return defaultReader;
+            }
+        }
+        class NonExistModuleReader extends ClassFileReader {
+            private final List classes = Collections.emptyList();
+            private NonExistModuleReader(Path mpath) {
+                super(mpath);
+            }
+
+            public ClassFile getClassFile(String name) throws IOException {
+                return null;
+            }
+            public Iterable getClassFiles() throws IOException {
+                return classes;
+            }
+        }
+    }
+
+    public static Set load(Path mpath, InputStream in)
+        throws IOException
+    {
+        try {
+            ModulePathReader reader = new ModulePathReader(mpath);
+            return reader.load(in);
+        } catch (XMLStreamException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static Set loadFromImage(LegacyImageHelper helper, InputStream in)
+        throws IOException
+    {
+        try {
+            ImageReader reader = new ImageReader(helper);
+            return reader.load(in);
+        } catch (XMLStreamException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static final String MODULES   = "modules";
+    private static final String MODULE    = "module";
+    private static final String NAME      = "name";
+    private static final String DEPEND    = "depend";
+    private static final String EXPORT    = "export";
+    private static final String TO        = "to";
+    private static final String INCLUDE   = "include";
+    private static final QName  REEXPORTS = new QName("re-exports");
+    public Set load(InputStream in) throws XMLStreamException, IOException {
+        Set modules = new HashSet<>();
+        if (in == null) {
+            System.err.println("WARNING: modules.xml doesn't exist");
+            return modules;
+        }
+        XMLInputFactory factory = XMLInputFactory.newInstance();
+        XMLEventReader reader = factory.createXMLEventReader(in, "UTF-8");
+        Module.Builder mb = null;
+        String modulename = null;
+        String exportedPackage = null;
+        Set permits = new HashSet<>();
+        while (reader.hasNext()) {
+            XMLEvent event = reader.nextEvent();
+            if (event.isStartElement()) {
+                String startTag = event.asStartElement().getName().getLocalPart();
+                switch (startTag) {
+                    case MODULES:
+                        break;
+                    case MODULE:
+                        if (mb != null) {
+                            throw new RuntimeException("end tag for module is missing");
+                        }
+                        modulename = getNextTag(reader, NAME);
+                        mb = new Module.Builder();
+                        mb.name(modulename);
+                        break;
+                    case NAME:
+                        throw new RuntimeException(event.toString());
+                    case DEPEND:
+                        boolean reexports = false;
+                        Attribute attr = event.asStartElement().getAttributeByName(REEXPORTS);
+                        if (attr != null) {
+                            String value = attr.getValue();
+                            if (value.equals("true") || value.equals("false")) {
+                                reexports = Boolean.parseBoolean(value);
+                            } else {
+                                throw new RuntimeException("unexpected attribute " + attr.toString());
+                            }
+                        }
+                        mb.require(getData(reader), reexports);
+                        break;
+                    case INCLUDE:
+                        mb.include(getData(reader));
+                        break;
+                    case EXPORT:
+                        exportedPackage = getNextTag(reader, NAME);
+                        break;
+                    case TO:
+                        permits.add(getData(reader));
+                        break;
+                    default:
+                        throw new RuntimeException("invalid element: " + event);
+                }
+            } else if (event.isEndElement()) {
+                String endTag = event.asEndElement().getName().getLocalPart();
+                switch (endTag) {
+                    case MODULE:
+                        ClassFileReader cfr = getClassFileReader(modulename, mb.packages);
+                        mb.classes(cfr);
+                        modules.add(mb.build());
+                        mb = null;
+                        break;
+                    case EXPORT:
+                        if (exportedPackage == null) {
+                            throw new RuntimeException("export's name is missing");
+                        }
+                        mb.export(exportedPackage, permits);
+                        exportedPackage = null;
+                        permits.clear();
+                        break;
+                    default:
+                }
+            } else if (event.isCharacters()) {
+                String s = event.asCharacters().getData();
+                if (!s.trim().isEmpty()) {
+                    throw new RuntimeException("export-to is malformed");
+                }
+            }
+        }
+        return modules;
+    }
+    private String getData(XMLEventReader reader) throws XMLStreamException {
+        XMLEvent e = reader.nextEvent();
+        if (e.isCharacters()) {
+            return e.asCharacters().getData();
+        }
+        throw new RuntimeException(e.toString());
+    }
+
+    private String getNextTag(XMLEventReader reader, String tag) throws XMLStreamException {
+        XMLEvent e = reader.nextTag();
+        if (e.isStartElement()) {
+            String t = e.asStartElement().getName().getLocalPart();
+            if (!tag.equals(t)) {
+                throw new RuntimeException(e + " expected: " + tag);
+            }
+            return getData(reader);
+        }
+        throw new RuntimeException("export-to name is missing:" + e);
+    }
+}
diff --git a/langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/PlatformClassPath.java b/langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/PlatformClassPath.java
new file mode 100644
index 00000000000..4711978474c
--- /dev/null
+++ b/langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/PlatformClassPath.java
@@ -0,0 +1,303 @@
+/*
+ * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.sun.tools.jdeps;
+
+import com.sun.tools.classfile.Annotation;
+import com.sun.tools.classfile.ClassFile;
+import com.sun.tools.classfile.ConstantPool;
+import com.sun.tools.classfile.ConstantPoolException;
+import com.sun.tools.classfile.RuntimeAnnotations_attribute;
+import com.sun.tools.classfile.Dependencies.ClassFileError;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.*;
+import java.util.jar.*;
+
+import static com.sun.tools.classfile.Attribute.*;
+import static com.sun.tools.jdeps.ClassFileReader.*;
+
+/**
+ * ClassPath for Java SE and JDK
+ */
+class PlatformClassPath {
+    private static List modules;
+    static synchronized List getArchives(Path mpath) throws IOException {
+        if (modules == null) {
+            initPlatformArchives(mpath);
+        }
+        return modules;
+    }
+
+    /**
+     * Finds the module with the given name. Returns null
+     * if such module doesn't exist.
+     *
+     * @param mn module name
+     */
+    static Module findModule(String mn) {
+        for (Archive a : modules) {
+            if (Module.class.isInstance(a)) {
+                Module m = (Module)a;
+                if (mn.equals(m.name())) {
+                    return m;
+                }
+            }
+        }
+        return null;
+    }
+
+    private static List initPlatformArchives(Path mpath) throws IOException {
+        Path home = Paths.get(System.getProperty("java.home"));
+        if (mpath == null && !home.endsWith("jre")) {
+            // jdk build
+            Path p = home.resolve("modules");
+            if (Files.isDirectory(p)) {
+                mpath = p;
+            }
+        }
+        modules = mpath != null ? initModules(mpath) : initLegacyImage(home);
+        if (findModule("java.base") != null) {
+            Profile.initProfiles();
+        }
+        return modules;
+    }
+
+    private static List initModules(Path mpath) throws IOException {
+        try (InputStream in = PlatformClassPath.class
+                .getResourceAsStream("resources/modules.xml")) {
+            return new ArrayList(ModulesXmlReader.load(mpath, in));
+        }
+    }
+
+    private static List initLegacyImage(Path home) throws IOException {
+        LegacyImageHelper cfr = new LegacyImageHelper(home);
+        List archives = new ArrayList<>(cfr.nonPlatformArchives);
+        try (InputStream in = PlatformClassPath.class
+                .getResourceAsStream("resources/modules.xml")) {
+            archives.addAll(ModulesXmlReader.loadFromImage(cfr, in));
+            return archives;
+        }
+    }
+
+    static class LegacyImageHelper {
+        private static final List NON_PLATFORM_JARFILES =
+                Arrays.asList("alt-rt.jar", "jfxrt.jar", "ant-javafx.jar", "javafx-mx.jar");
+        final List nonPlatformArchives = new ArrayList<>();
+        final List jarfiles = new ArrayList<>();
+        final Path home;
+
+        LegacyImageHelper(Path home) {
+            this.home = home;
+            try {
+                if (home.endsWith("jre")) {
+                    // jar files in /jre/lib
+                    addJarFiles(home.resolve("lib"));
+                    if (home.getParent() != null) {
+                        // add tools.jar and other JDK jar files
+                        Path lib = home.getParent().resolve("lib");
+                        if (Files.exists(lib)) {
+                            addJarFiles(lib);
+                        }
+                    }
+                } else if (Files.exists(home.resolve("lib"))) {
+                    // add other JAR files
+                    addJarFiles(home.resolve("lib"));
+                } else {
+                    throw new RuntimeException("\"" + home + "\" not a JDK home");
+                }
+            } catch (IOException e) {
+                throw new Error(e);
+            }
+        }
+
+        /**
+         * Returns a ClassFileReader that only reads classes for the given modulename.
+         */
+        ClassFileReader getClassReader(String modulename, Set packages) throws IOException {
+            return new ModuleClassReader(modulename, packages);
+        }
+
+        private void addJarFiles(final Path root) throws IOException {
+            final Path ext = root.resolve("ext");
+            Files.walkFileTree(root, new SimpleFileVisitor() {
+                @Override
+                public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs)
+                    throws IOException
+                {
+                    if (dir.equals(root) || dir.equals(ext)) {
+                        return FileVisitResult.CONTINUE;
+                    } else {
+                        // skip other cobundled JAR files
+                        return FileVisitResult.SKIP_SUBTREE;
+                    }
+                }
+
+                @Override
+                public FileVisitResult visitFile(Path p, BasicFileAttributes attrs)
+                    throws IOException
+                {
+                    String fn = p.getFileName().toString();
+                    if (fn.endsWith(".jar")) {
+                        // JDK may cobundle with JavaFX that doesn't belong to any profile
+                        // Treat jfxrt.jar as regular Archive
+                        if (NON_PLATFORM_JARFILES.contains(fn)) {
+                            nonPlatformArchives.add(Archive.getInstance(p));
+                        } else {
+                            jarfiles.add(new JarFile(p.toFile()));
+                        }
+                    }
+                    return FileVisitResult.CONTINUE;
+                }
+            });
+        }
+
+        /**
+         * ModuleClassFile reads classes for the specified module from the legacy image.
+         *
+         */
+        class ModuleClassReader extends JarFileReader {
+            private JarFile cachedJarFile = getJarFile(0);
+            private final Set packages;
+            private final String module;
+            ModuleClassReader(String module, Set packages) throws IOException {
+                super(home, null);
+                this.module = module;
+                this.packages = packages;
+            }
+
+            private boolean includes(String name) {
+                String cn = name.replace('/', '.');
+                int i = cn.lastIndexOf('.');
+                String pn = i > 0 ? cn.substring(0, i) : "";
+                return packages.contains(pn);
+            }
+
+            private JarEntry findJarEntry(JarFile jarfile, String entryName1, String entryName2) {
+                JarEntry e = jarfile.getJarEntry(entryName1);
+                if (e == null) {
+                    e = jarfile.getJarEntry(entryName2);
+                }
+                return e;
+            }
+
+            public String toString() {
+                return module + " " + packages.size() + " " + packages;
+            }
+
+            @Override
+            public ClassFile getClassFile(String name) throws IOException {
+                if (jarfiles.isEmpty() || !includes(name)) {
+                    return null;
+                }
+
+                if (name.indexOf('.') > 0) {
+                    int i = name.lastIndexOf('.');
+                    String entryName = name.replace('.', '/') + ".class";
+                    String innerClassName = entryName.substring(0, i) + "$"
+                            + entryName.substring(i + 1, entryName.length());
+                    JarEntry e = findJarEntry(cachedJarFile, entryName, innerClassName);
+                    if (e != null) {
+                        return readClassFile(cachedJarFile, e);
+                    }
+                    for (JarFile jf : jarfiles) {
+                        if (jf == cachedJarFile) {
+                            continue;
+                        }
+                        System.err.format("find jar entry %s at %s%n", entryName, jf);
+                        e = findJarEntry(jf, entryName, innerClassName);
+                        if (e != null) {
+                            cachedJarFile = jf;
+                            return readClassFile(jf, e);
+                        }
+                    }
+                } else {
+                    String entryName = name + ".class";
+                    JarEntry e = cachedJarFile.getJarEntry(entryName);
+                    if (e != null) {
+                        return readClassFile(cachedJarFile, e);
+                    }
+                    for (JarFile jf : jarfiles) {
+                        if (jf == cachedJarFile) {
+                            continue;
+                        }
+                        e = jf.getJarEntry(entryName);
+                        if (e != null) {
+                            cachedJarFile = jf;
+                            return readClassFile(jf, e);
+                        }
+                    }
+                }
+                return null;
+            }
+
+            @Override
+            public Iterable getClassFiles() throws IOException {
+                final Iterator iter = new ModuleClassIterator(this);
+                return new Iterable() {
+                    public Iterator iterator() {
+                        return iter;
+                    }
+                };
+            }
+
+            private JarFile getJarFile(int index) {
+                return index < jarfiles.size() ? jarfiles.get(index) : null;
+            }
+
+            class ModuleClassIterator extends JarFileIterator {
+                private int index;
+                ModuleClassIterator(ModuleClassReader reader) {
+                    super(reader);
+                    this.index = 0;
+                    this.jf = getJarFile(0);
+                    this.entries = jf != null ? jf.entries() : null;
+                    this.nextEntry = nextEntry();
+                }
+
+                @Override
+                protected JarEntry nextEntry() {
+                    while (jf != null) {
+                        while (entries.hasMoreElements()) {
+                            JarEntry e = entries.nextElement();
+                            String name = e.getName();
+                            if (name.endsWith(".class") && includes(name)) {
+                                return e;
+                            }
+                        }
+                        jf = getJarFile(++index);
+                        entries = jf != null ? jf.entries() : null;
+                    }
+                    return null;
+                }
+            }
+        }
+    }
+}
diff --git a/langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/Profile.java b/langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/Profile.java
new file mode 100644
index 00000000000..14660e2a541
--- /dev/null
+++ b/langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/Profile.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.sun.tools.jdeps;
+
+import java.io.IOException;
+import java.util.*;
+
+/**
+ * Build the profile information from ct.sym if exists.
+ */
+enum Profile {
+    COMPACT1("compact1", 1, "java.compact1"),
+    COMPACT2("compact2", 2, "java.compact2"),
+    COMPACT3("compact3", 3, "java.compact3"),
+    FULL_JRE("Full JRE", 4, "java.se");
+
+    final String name;
+    final int profile;
+    final String moduleName;
+    final Set modules = new HashSet<>();
+
+    Profile(String name, int profile, String moduleName) {
+        this.name = name;
+        this.profile = profile;
+        this.moduleName = moduleName;
+    }
+
+    public String profileName() {
+        return name;
+    }
+
+    @Override
+    public String toString() {
+        return moduleName;
+    }
+
+    public static int getProfileCount() {
+        return JDK.isEmpty() ? 0 : Profile.values().length;
+    }
+
+    /**
+     * Returns the Profile for the given package name; null if not found.
+     */
+    public static Profile getProfile(String pn) {
+        for (Profile p : Profile.values()) {
+            for (Module m : p.modules) {
+                if (m.packages().contains(pn)) {
+                    return p;
+                }
+            }
+        }
+        return null;
+    }
+
+    /*
+     * Returns the Profile for a given Module; null if not found.
+     */
+    public static Profile getProfile(Module m) {
+        for (Profile p : Profile.values()) {
+            if (p.modules.contains(m)) {
+                return p;
+            }
+        }
+        return null;
+    }
+
+    final static Set JDK = new HashSet<>();
+    static void initProfiles() {
+        for (Profile p : Profile.values()) {
+            Module m = PlatformClassPath.findModule(p.moduleName);
+            if (m == null)
+                throw new Error(p.moduleName + " doesn't exist");
+            p.modules.add(m);
+            JDK.add(m);
+            for (String n : m.requires().keySet()) {
+                Module d = PlatformClassPath.findModule(n);
+                if (d == null)
+                    throw new Error(n + " doesn't exist");
+                p.modules.add(d);
+                JDK.add(d);
+            }
+        }
+    }
+    // for debugging
+    public static void main(String[] args) throws IOException {
+        // find platform modules
+        PlatformClassPath.getArchives(null);
+        if (Profile.getProfileCount() == 0) {
+            System.err.println("No profile is present in this JDK");
+        }
+        for (Profile p : Profile.values()) {
+            String profileName = p.name;
+            System.out.format("%2d: %-10s  %s%n", p.profile, profileName, p.modules);
+            for (Module m: p.modules) {
+                System.out.format("module %s%n", m.name());
+                System.out.format("   requires %s%n", m.requires());
+                for (Map.Entry> e: m.exports().entrySet()) {
+                    System.out.format("   exports %s %s%n", e.getKey(),
+                        e.getValue().isEmpty() ? "" : "to " + e.getValue());
+                }
+            }
+        }
+        System.out.println("All JDK modules:-");
+        JDK.stream().sorted(Comparator.comparing(Module::name))
+           .forEach(m -> System.out.println(m));
+    }
+}
diff --git a/langtools/src/share/classes/com/sun/tools/jdeps/resources/jdeps.properties b/langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/resources/jdeps.properties
similarity index 98%
rename from langtools/src/share/classes/com/sun/tools/jdeps/resources/jdeps.properties
rename to langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/resources/jdeps.properties
index ccd14abe43a..5da866718f6 100644
--- a/langtools/src/share/classes/com/sun/tools/jdeps/resources/jdeps.properties
+++ b/langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/resources/jdeps.properties
@@ -52,6 +52,9 @@ main.opt.include=\
 main.opt.P=\
 \  -P           -profile              Show profile or the file containing a package
 
+main.opt.M=\
+\  -M           -module               Show module containing the package
+
 main.opt.cp=\
 \  -cp    -classpath      Specify where to find class files
 
diff --git a/langtools/src/share/classes/com/sun/tools/jdeps/resources/jdeps_ja.properties b/langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/resources/jdeps_ja.properties
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/jdeps/resources/jdeps_ja.properties
rename to langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/resources/jdeps_ja.properties
diff --git a/langtools/src/share/classes/com/sun/tools/jdeps/resources/jdeps_zh_CN.properties b/langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/resources/jdeps_zh_CN.properties
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/jdeps/resources/jdeps_zh_CN.properties
rename to langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/resources/jdeps_zh_CN.properties
diff --git a/langtools/src/share/classes/com/sun/tools/jdeps/resources/jdkinternals.properties b/langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/resources/jdkinternals.properties
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/jdeps/resources/jdkinternals.properties
rename to langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/resources/jdkinternals.properties
diff --git a/langtools/src/share/classes/com/sun/tools/jdeps/resources/version.properties-template b/langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/resources/version.properties-template
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/jdeps/resources/version.properties-template
rename to langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/resources/version.properties-template
diff --git a/langtools/src/share/classes/com/sun/javadoc/AnnotatedType.java b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotatedType.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/javadoc/AnnotatedType.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotatedType.java
diff --git a/langtools/src/share/classes/com/sun/javadoc/AnnotationDesc.java b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationDesc.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/javadoc/AnnotationDesc.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationDesc.java
diff --git a/langtools/src/share/classes/com/sun/javadoc/AnnotationTypeDoc.java b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationTypeDoc.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/javadoc/AnnotationTypeDoc.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationTypeDoc.java
diff --git a/langtools/src/share/classes/com/sun/javadoc/AnnotationTypeElementDoc.java b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationTypeElementDoc.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/javadoc/AnnotationTypeElementDoc.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationTypeElementDoc.java
diff --git a/langtools/src/share/classes/com/sun/javadoc/AnnotationValue.java b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationValue.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/javadoc/AnnotationValue.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationValue.java
diff --git a/langtools/src/share/classes/com/sun/javadoc/ClassDoc.java b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ClassDoc.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/javadoc/ClassDoc.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ClassDoc.java
diff --git a/langtools/src/share/classes/com/sun/javadoc/ConstructorDoc.java b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ConstructorDoc.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/javadoc/ConstructorDoc.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ConstructorDoc.java
diff --git a/langtools/src/share/classes/com/sun/javadoc/Doc.java b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Doc.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/javadoc/Doc.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Doc.java
diff --git a/langtools/src/share/classes/com/sun/javadoc/DocErrorReporter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/DocErrorReporter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/javadoc/DocErrorReporter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/DocErrorReporter.java
diff --git a/langtools/src/share/classes/com/sun/javadoc/Doclet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Doclet.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/javadoc/Doclet.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Doclet.java
diff --git a/langtools/src/share/classes/com/sun/javadoc/ExecutableMemberDoc.java b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ExecutableMemberDoc.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/javadoc/ExecutableMemberDoc.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ExecutableMemberDoc.java
diff --git a/langtools/src/share/classes/com/sun/javadoc/FieldDoc.java b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/FieldDoc.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/javadoc/FieldDoc.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/FieldDoc.java
diff --git a/langtools/src/share/classes/com/sun/javadoc/LanguageVersion.java b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/LanguageVersion.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/javadoc/LanguageVersion.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/LanguageVersion.java
diff --git a/langtools/src/share/classes/com/sun/javadoc/MemberDoc.java b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/MemberDoc.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/javadoc/MemberDoc.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/MemberDoc.java
diff --git a/langtools/src/share/classes/com/sun/javadoc/MethodDoc.java b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/MethodDoc.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/javadoc/MethodDoc.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/MethodDoc.java
diff --git a/langtools/src/share/classes/com/sun/javadoc/PackageDoc.java b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/PackageDoc.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/javadoc/PackageDoc.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/PackageDoc.java
diff --git a/langtools/src/share/classes/com/sun/javadoc/ParamTag.java b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ParamTag.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/javadoc/ParamTag.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ParamTag.java
diff --git a/langtools/src/share/classes/com/sun/javadoc/Parameter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Parameter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/javadoc/Parameter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Parameter.java
diff --git a/langtools/src/share/classes/com/sun/javadoc/ParameterizedType.java b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ParameterizedType.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/javadoc/ParameterizedType.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ParameterizedType.java
diff --git a/langtools/src/share/classes/com/sun/javadoc/ProgramElementDoc.java b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ProgramElementDoc.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/javadoc/ProgramElementDoc.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ProgramElementDoc.java
diff --git a/langtools/src/share/classes/com/sun/javadoc/RootDoc.java b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/RootDoc.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/javadoc/RootDoc.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/RootDoc.java
diff --git a/langtools/src/share/classes/com/sun/javadoc/SeeTag.java b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/SeeTag.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/javadoc/SeeTag.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/SeeTag.java
diff --git a/langtools/src/share/classes/com/sun/javadoc/SerialFieldTag.java b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/SerialFieldTag.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/javadoc/SerialFieldTag.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/SerialFieldTag.java
diff --git a/langtools/src/share/classes/com/sun/javadoc/SourcePosition.java b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/SourcePosition.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/javadoc/SourcePosition.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/SourcePosition.java
diff --git a/langtools/src/share/classes/com/sun/javadoc/Tag.java b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Tag.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/javadoc/Tag.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Tag.java
diff --git a/langtools/src/share/classes/com/sun/javadoc/ThrowsTag.java b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ThrowsTag.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/javadoc/ThrowsTag.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ThrowsTag.java
diff --git a/langtools/src/share/classes/com/sun/javadoc/Type.java b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Type.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/javadoc/Type.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Type.java
diff --git a/langtools/src/share/classes/com/sun/javadoc/TypeVariable.java b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/TypeVariable.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/javadoc/TypeVariable.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/TypeVariable.java
diff --git a/langtools/src/share/classes/com/sun/javadoc/WildcardType.java b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/WildcardType.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/javadoc/WildcardType.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/WildcardType.java
diff --git a/langtools/src/share/classes/com/sun/javadoc/package-info.java b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/package-info.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/javadoc/package-info.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/package-info.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/Taglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/Taglet.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/Taglet.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/Taglet.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractProfileIndexWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractProfileIndexWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractProfileIndexWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractProfileIndexWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeFieldWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeFieldWriterImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeFieldWriterImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeFieldWriterImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialMethodWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialMethodWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialMethodWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialMethodWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkInfoImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/LinkInfoImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkInfoImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/LinkInfoImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkOutputImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/LinkOutputImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkOutputImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/LinkOutputImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ProfileIndexFrameWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ProfileIndexFrameWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/ProfileIndexFrameWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ProfileIndexFrameWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageFrameWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageFrameWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageFrameWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageFrameWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageIndexFrameWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageIndexFrameWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageIndexFrameWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageIndexFrameWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageWriterImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageWriterImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageWriterImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ProfileWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ProfileWriterImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/ProfileWriterImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ProfileWriterImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PropertyWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PropertyWriterImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/PropertyWriterImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PropertyWriterImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SectionName.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SectionName.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/SectionName.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SectionName.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/WriterFactoryImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/WriterFactoryImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/WriterFactoryImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/WriterFactoryImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/Comment.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/Comment.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/Comment.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/Comment.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/ContentBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/ContentBuilder.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/ContentBuilder.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/ContentBuilder.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/DocType.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/DocType.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/DocType.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/DocType.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlAttr.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlAttr.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlAttr.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlAttr.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlConstants.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlConstants.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlConstants.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlConstants.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocument.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocument.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocument.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocument.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTag.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTag.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTag.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTag.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/RawHtml.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/RawHtml.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/RawHtml.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/RawHtml.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/StringContent.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/StringContent.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/StringContent.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/StringContent.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/package-info.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/package-info.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/package-info.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/package-info.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/package-info.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/package-info.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/package-info.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/package-info.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeFieldWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeFieldWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeFieldWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeFieldWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeOptionalMemberWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeOptionalMemberWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeOptionalMemberWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeOptionalMemberWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeRequiredMemberWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeRequiredMemberWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeRequiredMemberWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeRequiredMemberWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ClassWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ClassWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ClassWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ClassWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstructorWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ConstructorWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstructorWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ConstructorWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Content.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/Content.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Content.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/Content.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/EnumConstantWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/EnumConstantWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/EnumConstantWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/EnumConstantWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/FieldWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/FieldWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/FieldWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/FieldWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/MemberSummaryWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/MemberSummaryWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/MemberSummaryWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/MemberSummaryWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/MethodWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/MethodWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/MethodWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/MethodWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/NestedClassWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/NestedClassWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/NestedClassWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/NestedClassWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ProfilePackageSummaryWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ProfilePackageSummaryWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ProfilePackageSummaryWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ProfilePackageSummaryWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ProfileSummaryWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ProfileSummaryWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ProfileSummaryWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ProfileSummaryWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/PropertyWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/PropertyWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/PropertyWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/PropertyWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/SerializedFormWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/SerializedFormWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/SerializedFormWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/SerializedFormWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/WriterFactory.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/WriterFactory.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/WriterFactory.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/WriterFactory.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeFieldBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeFieldBuilder.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeFieldBuilder.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeFieldBuilder.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/BuilderFactory.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/BuilderFactory.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/BuilderFactory.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/BuilderFactory.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ProfilePackageSummaryBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ProfilePackageSummaryBuilder.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ProfilePackageSummaryBuilder.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ProfilePackageSummaryBuilder.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ProfileSummaryBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ProfileSummaryBuilder.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ProfileSummaryBuilder.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ProfileSummaryBuilder.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PropertyBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PropertyBuilder.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PropertyBuilder.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PropertyBuilder.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/XMLNode.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/XMLNode.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/XMLNode.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/XMLNode.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/package-info.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/package-info.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/package-info.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/package-info.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/package-info.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/package-info.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/package-info.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/package-info.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets.properties b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets.properties
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets.properties
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets.properties
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/script.js b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/script.js
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/script.js
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/script.js
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseExecutableMemberTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseExecutableMemberTaglet.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseExecutableMemberTaglet.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseExecutableMemberTaglet.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseInlineTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseInlineTaglet.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseInlineTaglet.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseInlineTaglet.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BasePropertyTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BasePropertyTaglet.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BasePropertyTaglet.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BasePropertyTaglet.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseTaglet.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseTaglet.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseTaglet.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/CodeTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/CodeTaglet.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/CodeTaglet.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/CodeTaglet.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DeprecatedTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DeprecatedTaglet.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DeprecatedTaglet.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DeprecatedTaglet.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DocRootTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DocRootTaglet.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DocRootTaglet.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DocRootTaglet.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritDocTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritDocTaglet.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritDocTaglet.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritDocTaglet.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritableTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritableTaglet.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritableTaglet.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritableTaglet.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LegacyTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LegacyTaglet.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LegacyTaglet.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LegacyTaglet.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LiteralTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LiteralTaglet.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LiteralTaglet.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LiteralTaglet.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/PropertyGetterTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/PropertyGetterTaglet.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/PropertyGetterTaglet.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/PropertyGetterTaglet.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/PropertySetterTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/PropertySetterTaglet.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/PropertySetterTaglet.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/PropertySetterTaglet.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ReturnTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ReturnTaglet.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ReturnTaglet.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ReturnTaglet.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SeeTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SeeTaglet.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SeeTaglet.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SeeTaglet.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SimpleTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SimpleTaglet.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SimpleTaglet.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SimpleTaglet.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/Taglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/Taglet.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/Taglet.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/Taglet.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ThrowsTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ThrowsTaglet.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ThrowsTaglet.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ThrowsTaglet.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/package-info.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/package-info.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/package-info.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/package-info.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFile.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFile.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFile.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFile.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFileFactory.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFileFactory.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFileFactory.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFileFactory.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFinder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFinder.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFinder.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFinder.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocLink.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocLink.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocLink.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocLink.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPath.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPath.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPath.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPath.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPaths.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPaths.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPaths.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPaths.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletAbortException.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletAbortException.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletAbortException.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletAbortException.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletConstants.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletConstants.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletConstants.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletConstants.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Group.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/Group.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Group.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/Group.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ImplementedMethods.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ImplementedMethods.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ImplementedMethods.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ImplementedMethods.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MetaKeywords.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/MetaKeywords.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MetaKeywords.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/MetaKeywords.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MethodTypes.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/MethodTypes.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MethodTypes.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/MethodTypes.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PathDocFileFactory.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/PathDocFileFactory.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PathDocFileFactory.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/PathDocFileFactory.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/SimpleDocFileFactory.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/SimpleDocFileFactory.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/SimpleDocFileFactory.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/SimpleDocFileFactory.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/StandardDocFileFactory.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/StandardDocFileFactory.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/StandardDocFileFactory.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/StandardDocFileFactory.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/TextTag.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/TextTag.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/TextTag.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/TextTag.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Utils.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/Utils.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Utils.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/Utils.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkFactory.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkFactory.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkFactory.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkFactory.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkInfo.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkInfo.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkInfo.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkInfo.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkOutput.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkOutput.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkOutput.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkOutput.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/package-info.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/package-info.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/package-info.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/package-info.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/package-info.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/package-info.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/package-info.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/package-info.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/package-info.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/package-info.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/package-info.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/package-info.java
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/standard/Standard.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/standard/Standard.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/doclets/standard/Standard.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/standard/Standard.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/AbstractTypeImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/AbstractTypeImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/AbstractTypeImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/AbstractTypeImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/AnnotatedTypeImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/AnnotatedTypeImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/AnnotatedTypeImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/AnnotatedTypeImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationDescImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/AnnotationDescImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/AnnotationDescImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/AnnotationDescImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationTypeDocImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/AnnotationTypeDocImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/AnnotationTypeDocImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/AnnotationTypeDocImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationTypeElementDocImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/AnnotationTypeElementDocImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/AnnotationTypeElementDocImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/AnnotationTypeElementDocImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationValueImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/AnnotationValueImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/AnnotationValueImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/AnnotationValueImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/ClassDocImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/ClassDocImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/Comment.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/Comment.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/Comment.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/Comment.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/ConstructorDocImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/ConstructorDocImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/ConstructorDocImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/ConstructorDocImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/DocEnv.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/DocEnv.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/DocImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/DocImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/DocImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/DocImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/DocLocale.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/DocLocale.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/DocLocale.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/DocLocale.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/DocletInvoker.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/DocletInvoker.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/ExecutableMemberDocImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/ExecutableMemberDocImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/ExecutableMemberDocImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/ExecutableMemberDocImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/FieldDocImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/FieldDocImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/FieldDocImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/FieldDocImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/JavadocClassFinder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/JavadocClassFinder.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/JavadocClassFinder.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/JavadocClassFinder.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/JavadocEnter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/JavadocEnter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/JavadocEnter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/JavadocEnter.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/JavadocMemberEnter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/JavadocMemberEnter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/JavadocMemberEnter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/JavadocMemberEnter.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/JavadocTodo.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/JavadocTodo.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/JavadocTodo.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/JavadocTodo.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/JavadocTool.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/JavadocTool.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/JavadocTool.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/JavadocTool.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/Main.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/Main.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/Main.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/Main.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/MemberDocImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/MemberDocImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/MemberDocImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/MemberDocImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/Messager.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/Messager.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/Messager.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/Messager.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/MethodDocImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/MethodDocImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/MethodDocImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/MethodDocImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/ModifierFilter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/ModifierFilter.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/ModifierFilter.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/ModifierFilter.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/PackageDocImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/PackageDocImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/PackageDocImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/PackageDocImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/ParamTagImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/ParamTagImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/ParamTagImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/ParamTagImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/ParameterImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/ParameterImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/ParameterImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/ParameterImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/ParameterizedTypeImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/ParameterizedTypeImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/ParameterizedTypeImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/ParameterizedTypeImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/PrimitiveType.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/PrimitiveType.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/PrimitiveType.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/PrimitiveType.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/ProgramElementDocImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/ProgramElementDocImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/ProgramElementDocImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/ProgramElementDocImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/RootDocImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/RootDocImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/RootDocImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/RootDocImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/SeeTagImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/SeeTagImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/SeeTagImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/SeeTagImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/SerialFieldTagImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/SerialFieldTagImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/SerialFieldTagImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/SerialFieldTagImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/SerializedForm.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/SerializedForm.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/SerializedForm.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/SerializedForm.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/SourcePositionImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/SourcePositionImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/SourcePositionImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/SourcePositionImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/Start.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/Start.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/Start.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/Start.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/TagImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/TagImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/TagImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/TagImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/ThrowsTagImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/ThrowsTagImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/ThrowsTagImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/ThrowsTagImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/ToolOption.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/ToolOption.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/ToolOption.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/ToolOption.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/TypeMaker.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/TypeMaker.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/TypeMaker.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/TypeMaker.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/TypeVariableImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/TypeVariableImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/TypeVariableImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/TypeVariableImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/WildcardTypeImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/WildcardTypeImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/WildcardTypeImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/WildcardTypeImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/api/JavadocTaskImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/api/JavadocTaskImpl.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/api/JavadocTaskImpl.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/api/JavadocTaskImpl.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/api/JavadocTool.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/api/JavadocTool.java
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/api/JavadocTool.java
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/api/JavadocTool.java
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc.properties b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/resources/javadoc.properties
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc.properties
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/resources/javadoc.properties
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties
similarity index 100%
rename from langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties
rename to langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties
diff --git a/langtools/src/share/sample/javac/processing/src/CheckNamesProcessor.java b/langtools/src/sample/share/javac/processing/src/CheckNamesProcessor.java
similarity index 100%
rename from langtools/src/share/sample/javac/processing/src/CheckNamesProcessor.java
rename to langtools/src/sample/share/javac/processing/src/CheckNamesProcessor.java
diff --git a/langtools/src/share/sample/language/model/CoreReflectionFactory.java b/langtools/src/sample/share/language/model/CoreReflectionFactory.java
similarity index 100%
rename from langtools/src/share/sample/language/model/CoreReflectionFactory.java
rename to langtools/src/sample/share/language/model/CoreReflectionFactory.java
diff --git a/langtools/src/share/classes/com/sun/tools/jdeps/PlatformClassPath.java b/langtools/src/share/classes/com/sun/tools/jdeps/PlatformClassPath.java
deleted file mode 100644
index 55b9e8ab393..00000000000
--- a/langtools/src/share/classes/com/sun/tools/jdeps/PlatformClassPath.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.sun.tools.jdeps;
-
-import com.sun.tools.classfile.Annotation;
-import com.sun.tools.classfile.ClassFile;
-import com.sun.tools.classfile.ConstantPool;
-import com.sun.tools.classfile.ConstantPoolException;
-import com.sun.tools.classfile.RuntimeAnnotations_attribute;
-import com.sun.tools.classfile.Dependencies.ClassFileError;
-import java.io.IOException;
-import java.nio.file.FileVisitResult;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.SimpleFileVisitor;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.util.*;
-
-import static com.sun.tools.classfile.Attribute.*;
-
-/**
- * ClassPath for Java SE and JDK
- */
-class PlatformClassPath {
-    private static final List NON_PLATFORM_JARFILES =
-        Arrays.asList("alt-rt.jar", "jfxrt.jar", "ant-javafx.jar", "javafx-mx.jar");
-    private static final List javaHomeArchives = init();
-
-    static List getArchives() {
-        return javaHomeArchives;
-    }
-
-    private static List init() {
-        List result = new ArrayList<>();
-        Path home = Paths.get(System.getProperty("java.home"));
-        try {
-            if (home.endsWith("jre")) {
-                // jar files in /jre/lib
-                result.addAll(addJarFiles(home.resolve("lib")));
-                if (home.getParent() != null) {
-                    // add tools.jar and other JDK jar files
-                    Path lib = home.getParent().resolve("lib");
-                    if (Files.exists(lib)) {
-                        result.addAll(addJarFiles(lib));
-                    }
-                }
-            } else if (Files.exists(home.resolve("lib"))) {
-                // either a JRE or a jdk build image
-                Path classes = home.resolve("classes");
-                if (Files.isDirectory(classes)) {
-                    // jdk build outputdir
-                    result.add(new JDKArchive(classes));
-                }
-                // add other JAR files
-                result.addAll(addJarFiles(home.resolve("lib")));
-            } else {
-                throw new RuntimeException("\"" + home + "\" not a JDK home");
-            }
-            return result;
-        } catch (IOException e) {
-            throw new Error(e);
-        }
-    }
-
-    private static List addJarFiles(final Path root) throws IOException {
-        final List result = new ArrayList<>();
-        final Path ext = root.resolve("ext");
-        Files.walkFileTree(root, new SimpleFileVisitor() {
-            @Override
-            public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs)
-                throws IOException
-            {
-                if (dir.equals(root) || dir.equals(ext)) {
-                    return FileVisitResult.CONTINUE;
-                } else {
-                    // skip other cobundled JAR files
-                    return FileVisitResult.SKIP_SUBTREE;
-                }
-            }
-            @Override
-            public FileVisitResult visitFile(Path p, BasicFileAttributes attrs)
-                throws IOException
-            {
-                String fn = p.getFileName().toString();
-                if (fn.endsWith(".jar")) {
-                    // JDK may cobundle with JavaFX that doesn't belong to any profile
-                    // Treat jfxrt.jar as regular Archive
-                    result.add(NON_PLATFORM_JARFILES.contains(fn)
-                                   ? Archive.getInstance(p)
-                                   : new JDKArchive(p));
-                }
-                return FileVisitResult.CONTINUE;
-            }
-        });
-        return result;
-    }
-
-    /**
-     * A JDK archive is part of the JDK containing the Java SE API
-     * or implementation classes (i.e. JDK internal API)
-     */
-    static class JDKArchive extends Archive {
-        private static List PROFILE_JARS = Arrays.asList("rt.jar", "jce.jar");
-        public static boolean isProfileArchive(Archive archive) {
-            if (archive instanceof JDKArchive) {
-                return PROFILE_JARS.contains(archive.getName());
-            }
-            return false;
-        }
-
-        private final Map exportedPackages = new HashMap<>();
-        private final Map exportedTypes = new HashMap<>();
-        JDKArchive(Path p) throws IOException {
-            super(p, ClassFileReader.newInstance(p));
-        }
-
-        /**
-         * Tests if a given fully-qualified name is an exported type.
-         */
-        public boolean isExported(String cn) {
-            int i = cn.lastIndexOf('.');
-            String pn = i > 0 ? cn.substring(0, i) : "";
-
-            boolean isJdkExported = isExportedPackage(pn);
-            if (exportedTypes.containsKey(cn)) {
-                return exportedTypes.get(cn);
-            }
-            return isJdkExported;
-        }
-
-        /**
-         * Tests if a given package name is exported.
-         */
-        public boolean isExportedPackage(String pn) {
-            if (Profile.getProfile(pn) != null) {
-                return true;
-            }
-            return exportedPackages.containsKey(pn) ? exportedPackages.get(pn) : false;
-        }
-
-        private static final String JDK_EXPORTED_ANNOTATION = "Ljdk/Exported;";
-        private Boolean isJdkExported(ClassFile cf) throws ConstantPoolException {
-            RuntimeAnnotations_attribute attr = (RuntimeAnnotations_attribute)
-                    cf.attributes.get(RuntimeVisibleAnnotations);
-            if (attr != null) {
-                for (int i = 0; i < attr.annotations.length; i++) {
-                    Annotation ann = attr.annotations[i];
-                    String annType = cf.constant_pool.getUTF8Value(ann.type_index);
-                    if (JDK_EXPORTED_ANNOTATION.equals(annType)) {
-                        boolean isJdkExported = true;
-                        for (int j = 0; j < ann.num_element_value_pairs; j++) {
-                            Annotation.element_value_pair pair = ann.element_value_pairs[j];
-                            Annotation.Primitive_element_value ev = (Annotation.Primitive_element_value) pair.value;
-                            ConstantPool.CONSTANT_Integer_info info = (ConstantPool.CONSTANT_Integer_info)
-                                    cf.constant_pool.get(ev.const_value_index);
-                            isJdkExported = info.value != 0;
-                        }
-                        return Boolean.valueOf(isJdkExported);
-                    }
-                }
-            }
-            return null;
-        }
-
-        void processJdkExported(ClassFile cf) throws IOException {
-            try {
-                String cn = cf.getName();
-                String pn = cn.substring(0, cn.lastIndexOf('/')).replace('/', '.');
-
-                Boolean b = isJdkExported(cf);
-                if (b != null) {
-                    exportedTypes.put(cn.replace('/', '.'), b);
-                }
-                if (!exportedPackages.containsKey(pn)) {
-                    // check if package-info.class has @jdk.Exported
-                    Boolean isJdkExported = null;
-                    ClassFile pcf = reader().getClassFile(cn.substring(0, cn.lastIndexOf('/')+1) + "package-info");
-                    if (pcf != null) {
-                        isJdkExported = isJdkExported(pcf);
-                    }
-                    if (isJdkExported != null) {
-                        exportedPackages.put(pn, isJdkExported);
-                    }
-                }
-            } catch (ConstantPoolException e) {
-                throw new ClassFileError(e);
-            }
-        }
-    }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/jdeps/Profile.java b/langtools/src/share/classes/com/sun/tools/jdeps/Profile.java
deleted file mode 100644
index d78b5c45e1b..00000000000
--- a/langtools/src/share/classes/com/sun/tools/jdeps/Profile.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.sun.tools.jdeps;
-
-import com.sun.tools.classfile.Annotation;
-import com.sun.tools.classfile.Annotation.*;
-import com.sun.tools.classfile.Attribute;
-import com.sun.tools.classfile.ClassFile;
-import com.sun.tools.classfile.ConstantPool.*;
-import com.sun.tools.classfile.ConstantPoolException;
-import com.sun.tools.classfile.RuntimeAnnotations_attribute;
-import java.io.FileReader;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.*;
-import java.util.jar.JarFile;
-
-/**
- * Build the profile information from ct.sym if exists.
- */
-enum Profile {
-    COMPACT1("compact1", 1),
-    COMPACT2("compact2", 2),
-    COMPACT3("compact3", 3),
-    FULL_JRE("Full JRE", 4);
-
-    final String name;
-    final int profile;
-    final Set packages;
-    final Set proprietaryPkgs;
-
-    Profile(String name, int profile) {
-        this.name = name;
-        this.profile = profile;
-        this.packages = new HashSet<>();
-        this.proprietaryPkgs = new HashSet<>();
-    }
-
-    public String profileName() {
-        return name;
-    }
-
-    public static int getProfileCount() {
-        return PackageToProfile.map.values().size();
-    }
-
-    /**
-     * Returns the Profile for the given package name. It returns an empty
-     * string if the given package is not in any profile.
-     */
-    public static Profile getProfile(String pn) {
-        Profile profile = PackageToProfile.map.get(pn);
-        return (profile != null && profile.packages.contains(pn))
-                    ? profile : null;
-    }
-
-    static class PackageToProfile {
-        static String[] JAVAX_CRYPTO_PKGS = new String[] {
-            "javax.crypto",
-            "javax.crypto.interfaces",
-            "javax.crypto.spec"
-        };
-        static Map map = initProfiles();
-        private static Map initProfiles() {
-            try {
-                String profilesProps = System.getProperty("jdeps.profiles");
-                if (profilesProps != null) {
-                    // for testing for JDK development build where ct.sym doesn't exist
-                    initProfilesFromProperties(profilesProps);
-                } else {
-                    Path home = Paths.get(System.getProperty("java.home"));
-                    if (home.endsWith("jre")) {
-                        home = home.getParent();
-                    }
-                    Path ctsym = home.resolve("lib").resolve("ct.sym");
-                    if (Files.exists(ctsym)) {
-                        // parse ct.sym and load information about profiles
-                        try (JarFile jf = new JarFile(ctsym.toFile())) {
-                            ClassFileReader reader = ClassFileReader.newInstance(ctsym, jf);
-                            for (ClassFile cf : reader.getClassFiles()) {
-                                findProfile(cf);
-                            }
-                        }
-                        // special case for javax.crypto.* classes that are not
-                        // included in ct.sym since they are in jce.jar
-                        Collections.addAll(Profile.COMPACT1.packages, JAVAX_CRYPTO_PKGS);
-                    }
-                }
-            } catch (IOException | ConstantPoolException e) {
-                throw new Error(e);
-            }
-            HashMap map = new HashMap<>();
-            for (Profile profile : Profile.values()) {
-                for (String pn : profile.packages) {
-                    if (!map.containsKey(pn)) {
-                        // split packages in the JRE: use the smaller compact
-                        map.put(pn, profile);
-                    }
-                }
-                for (String pn : profile.proprietaryPkgs) {
-                    if (!map.containsKey(pn)) {
-                        map.put(pn, profile);
-                    }
-                }
-            }
-            return map;
-        }
-        private static final String PROFILE_ANNOTATION = "Ljdk/Profile+Annotation;";
-        private static final String PROPRIETARY_ANNOTATION = "Lsun/Proprietary+Annotation;";
-        private static Profile findProfile(ClassFile cf) throws ConstantPoolException {
-            RuntimeAnnotations_attribute attr = (RuntimeAnnotations_attribute)
-                cf.attributes.get(Attribute.RuntimeInvisibleAnnotations);
-            int index = 0;
-            boolean proprietary = false;
-            if (attr != null) {
-                for (int i = 0; i < attr.annotations.length; i++) {
-                    Annotation ann = attr.annotations[i];
-                    String annType = cf.constant_pool.getUTF8Value(ann.type_index);
-                    if (PROFILE_ANNOTATION.equals(annType)) {
-                        for (int j = 0; j < ann.num_element_value_pairs; j++) {
-                            Annotation.element_value_pair pair = ann.element_value_pairs[j];
-                            Primitive_element_value ev = (Primitive_element_value) pair.value;
-                            CONSTANT_Integer_info info = (CONSTANT_Integer_info)
-                                cf.constant_pool.get(ev.const_value_index);
-                            index = info.value;
-                            break;
-                        }
-                    } else if (PROPRIETARY_ANNOTATION.equals(annType)) {
-                        proprietary = true;
-                    }
-                }
-            }
-
-            Profile p = null;  // default
-            switch (index) {
-                case 1:
-                    p = Profile.COMPACT1; break;
-                case 2:
-                    p = Profile.COMPACT2; break;
-                case 3:
-                    p = Profile.COMPACT3; break;
-                case 4:
-                    p = Profile.FULL_JRE; break;
-                default:
-                    // skip classes with profile=0
-                    // Inner classes are not annotated with the profile annotation
-                    return null;
-            }
-
-            String name = cf.getName();
-            int i = name.lastIndexOf('/');
-            name = (i > 0) ? name.substring(0, i).replace('/', '.') : "";
-            if (proprietary) {
-                p.proprietaryPkgs.add(name);
-            } else {
-                p.packages.add(name);
-            }
-            return p;
-        }
-
-        private static void initProfilesFromProperties(String path) throws IOException {
-            Properties props = new Properties();
-            try (FileReader reader = new FileReader(path)) {
-                props.load(reader);
-            }
-            for (Profile prof : Profile.values()) {
-                int i = prof.profile;
-                String key = props.getProperty("profile." + i + ".name");
-                if (key == null) {
-                    throw new RuntimeException(key + " missing in " + path);
-                }
-                String n = props.getProperty("profile." + i + ".packages");
-                String[] pkgs = n.split("\\s+");
-                for (String p : pkgs) {
-                    if (p.isEmpty()) continue;
-                    prof.packages.add(p);
-                }
-            }
-        }
-    }
-
-    // for debugging
-    public static void main(String[] args) {
-        if (args.length == 0) {
-            if (Profile.getProfileCount() == 0) {
-                System.err.println("No profile is present in this JDK");
-            }
-            for (Profile p : Profile.values()) {
-                String profileName = p.name;
-                SortedSet set = new TreeSet<>(p.packages);
-                for (String s : set) {
-                    // filter out the inner classes that are not annotated with
-                    // the profile annotation
-                    if (PackageToProfile.map.get(s) == p) {
-                        System.out.format("%2d: %-10s  %s%n", p.profile, profileName, s);
-                        profileName = "";
-                    } else {
-                        System.err.format("Split package: %s in %s and %s %n",
-                            s, PackageToProfile.map.get(s).name, p.name);
-                    }
-                }
-            }
-        }
-        for (String pn : args) {
-            System.out.format("%s in %s%n", pn, getProfile(pn));
-        }
-    }
-}
diff --git a/langtools/test/tools/jdeps/DotFileTest.java b/langtools/test/tools/jdeps/DotFileTest.java
index 63e283f43ea..46fe5003ec0 100644
--- a/langtools/test/tools/jdeps/DotFileTest.java
+++ b/langtools/test/tools/jdeps/DotFileTest.java
@@ -124,7 +124,7 @@ public class DotFileTest {
              new String[] {"-v", "-classpath", testDir.getPath()});
 
         testSummary(new File(testDir, "Test.class"),
-             new String[] {"rt.jar", testDir.getName()},
+             new String[] {"java.base", testDir.getName()},
              new String[] {"compact1", ""},
              new String[] {"-classpath", testDir.getPath()});
         testSummary(new File(testDir, "Test.class"),
diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk
new file mode 100644
index 00000000000..ccf630cf4ca
--- /dev/null
+++ b/make/CompileJavaModules.gmk
@@ -0,0 +1,559 @@
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# This must be the first rule
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+include JavaCompilation.gmk
+include SetupJava.gmk
+
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, , CompileJavaModules.gmk))
+
+################################################################################
+# Module specific build settings
+
+java.activation_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
+
+################################################################################
+
+java.base_COPY := .icu .dat .spp content-types.properties
+java.base_CLEAN := intrinsic.properties
+
+java.base_EXCLUDES += java/lang/doc-files
+
+# Exclude BreakIterator classes that are just used in compile process to generate
+# data files and shouldn't go in the product
+java.base_EXCLUDE_FILES += sun/text/resources/BreakIteratorRules.java
+
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+  JAVA_BASE_UNIX_DIR := $(JDK_TOPDIR)/src/java.base/unix/classes
+  # TODO: make JavaCompilation handle overrides automatically instead of excluding here
+  # These files are overridden in macosx
+  java.base_EXCLUDE_FILES += \
+      $(JAVA_BASE_UNIX_DIR)/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java \
+      $(JAVA_BASE_UNIX_DIR)/java/net/DefaultInterface.java \
+      $(JAVA_BASE_UNIX_DIR)/java/lang/ClassLoaderHelper.java \
+      $(JAVA_BASE_UNIX_DIR)/sun/nio/ch/DefaultSelectorProvider.java \
+      #
+  # This is just skipped on macosx
+  java.base_EXCLUDE_FILES += $(JAVA_BASE_UNIX_DIR)/sun/nio/fs/GnomeFileTypeDetector.java
+endif
+
+ifneq ($(OPENJDK_TARGET_OS), solaris)
+  java.base_EXCLUDE_FILES += \
+      SolarisLoginModule.java \
+      SolarisSystem.java \
+      #
+endif
+
+ifeq ($(filter $(OPENJDK_TARGET_OS), solaris macosx aix), )
+  #
+  # only solaris, macosx and aix
+  #
+  java.base_EXCLUDE_FILES += sun/nio/fs/PollingWatchService.java
+endif
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+  java.base_EXCLUDE_FILES += \
+      sun/nio/ch/AbstractPollSelectorImpl.java \
+      sun/nio/ch/PollSelectorProvider.java \
+      sun/nio/ch/SimpleAsynchronousFileChannelImpl.java \
+      #
+endif
+
+################################################################################
+
+java.desktop_COPY := .gif .png .wav .txt .xml .css flavormap.properties
+java.desktop_CLEAN := iio-plugin.properties
+
+java.desktop_EXCLUDES += \
+    java/awt/doc-files \
+    javax/swing/doc-files \
+    javax/swing/text/doc-files \
+    javax/swing/plaf/synth/doc-files \
+    javax/swing/undo/doc-files \
+    sun/awt/X11/doc-files \
+    #
+
+# The exception handling of swing beaninfo
+# These resources violates the convention of having code and resources together under
+# $(JDK_TOPDIR)/src/.../classes directories
+$(eval $(call SetupCopyFiles,COPY_BEANINFO, \
+    SRC := $(JDK_TOPDIR)/make/data/swingbeaninfo/images, \
+    DEST := $(JDK_OUTPUTDIR)/modules/java.desktop/javax/swing/beaninfo/images, \
+    FILES := $(wildcard $(JDK_TOPDIR)/make/data/swingbeaninfo/images/*.gif)))
+
+java.desktop_COPY_EXTRA += $(COPY_BEANINFO)
+
+java.desktop_EXCLUDE_FILES += \
+    javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
+    javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
+    javax/swing/plaf/nimbus/ScrollBarPainter.java \
+    javax/swing/plaf/nimbus/SliderPainter.java \
+    javax/swing/plaf/nimbus/SpinnerPainter.java \
+    javax/swing/plaf/nimbus/SplitPanePainter.java \
+    javax/swing/plaf/nimbus/TabbedPanePainter.java \
+    sun/awt/resources/security-icon-bw16.png \
+    sun/awt/resources/security-icon-bw24.png \
+    sun/awt/resources/security-icon-bw32.png \
+    sun/awt/resources/security-icon-bw48.png \
+    sun/awt/resources/security-icon-interim16.png \
+    sun/awt/resources/security-icon-interim24.png \
+    sun/awt/resources/security-icon-interim32.png \
+    sun/awt/resources/security-icon-interim48.png \
+    sun/awt/resources/security-icon-yellow16.png \
+    sun/awt/resources/security-icon-yellow24.png \
+    sun/awt/resources/security-icon-yellow32.png \
+    sun/awt/resources/security-icon-yellow48.png \
+    sun/awt/X11/java-icon16.png \
+    sun/awt/X11/java-icon24.png \
+    sun/awt/X11/java-icon32.png \
+    sun/awt/X11/java-icon48.png \
+    .template \
+    #
+
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+  # exclude all X11 on Mac.
+  java.desktop_EXCLUDES += sun/awt/X11
+  java.desktop_EXCLUDE_FILES += \
+      $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/java2d/BackBufferCapsProvider.java \
+      #
+else
+  # TBD: figure out how to eliminate this long list
+  java.desktop_EXCLUDE_FILES += \
+      sun/awt/X11/ScreenFormat.java \
+      sun/awt/X11/XArc.java \
+      sun/awt/X11/XChar2b.java \
+      sun/awt/X11/XCharStruct.java \
+      sun/awt/X11/XClassHint.java \
+      sun/awt/X11/XComposeStatus.java \
+      sun/awt/X11/XExtCodes.java \
+      sun/awt/X11/XFontProp.java \
+      sun/awt/X11/XFontSetExtents.java \
+      sun/awt/X11/XFontStruct.java \
+      sun/awt/X11/XGCValues.java \
+      sun/awt/X11/XHostAddress.java \
+      sun/awt/X11/XIMCallback.java \
+      sun/awt/X11/XIMHotKeyTrigger.java \
+      sun/awt/X11/XIMHotKeyTriggers.java \
+      sun/awt/X11/XIMPreeditCaretCallbackStruct.java \
+      sun/awt/X11/XIMPreeditDrawCallbackStruct.java \
+      sun/awt/X11/XIMPreeditStateNotifyCallbackStruct.java \
+      sun/awt/X11/XIMStatusDrawCallbackStruct.java \
+      sun/awt/X11/XIMStringConversionCallbackStruct.java \
+      sun/awt/X11/XIMStringConversionText.java \
+      sun/awt/X11/XIMStyles.java \
+      sun/awt/X11/XIMText.java \
+      sun/awt/X11/XIMValuesList.java \
+      sun/awt/X11/XImage.java \
+      sun/awt/X11/XKeyboardControl.java \
+      sun/awt/X11/XKeyboardState.java \
+      sun/awt/X11/XOMCharSetList.java \
+      sun/awt/X11/XOMFontInfo.java \
+      sun/awt/X11/XOMOrientation.java \
+      sun/awt/X11/XPoint.java \
+      sun/awt/X11/XRectangle.java \
+      sun/awt/X11/XSegment.java \
+      sun/awt/X11/XStandardColormap.java \
+      sun/awt/X11/XTextItem.java \
+      sun/awt/X11/XTextItem16.java \
+      sun/awt/X11/XTextProperty.java \
+      sun/awt/X11/XTimeCoord.java \
+      sun/awt/X11/XWindowChanges.java \
+      sun/awt/X11/XdbeSwapInfo.java \
+      sun/awt/X11/XmbTextItem.java \
+      sun/awt/X11/XwcTextItem.java
+endif
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+  java.desktop_EXCLUDES += com/sun/java/swing/plaf/gtk
+endif
+
+ifdef BUILD_HEADLESS_ONLY
+  java.desktop_EXCLUDES += sun/applet
+endif
+
+# Why is this in the open source tree?
+ifdef OPENJDK
+  java.desktop_EXCLUDES += sun/dc
+endif
+
+# Used on windows and macosx
+ifeq ($(filter $(OPENJDK_TARGET_OS), windows macosx), )
+  java.desktop_EXCLUDE_FILES += sun/awt/AWTCharset.java
+endif
+
+# These files do not appear in the build result of the old build. This
+# is because they are generated sources, but the AUTO_JAVA_FILES won't
+# pick them up since they aren't generated when the source dirs are
+# searched and they aren't referenced by any other classes so they won't
+# be picked up by implicit compilation. On a rebuild, they are picked up
+# and compiled. Exclude them here to produce the same rt.jar as the old
+# build does when building just once.
+java.desktop_EXCLUDE_FILES += \
+    javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
+    javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
+    javax/swing/plaf/nimbus/ScrollBarPainter.java \
+    javax/swing/plaf/nimbus/SliderPainter.java \
+    javax/swing/plaf/nimbus/SpinnerPainter.java \
+    javax/swing/plaf/nimbus/SplitPanePainter.java \
+    javax/swing/plaf/nimbus/TabbedPanePainter.java \
+    #
+
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+  # These files are duplicated in MACOSX_SRC_DIRS
+  java.desktop_EXCLUDE_FILES += \
+      $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/java2d/BackBufferCapsProvider.java \
+      #
+endif
+
+################################################################################
+
+java.sql_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
+
+################################################################################
+
+java.sql.rowset_CLEAN_FILES := $(wildcard \
+    $(JDK_TOPDIR)/src/java.sql.rowset/share/classes/com/sun/rowset/*.properties \
+    $(JDK_TOPDIR)/src/java.sql.rowset/share/classes/javax/sql/rowset/*.properties)
+
+################################################################################
+# Exclude building of IIOP transport for RMI Connector
+java.management_EXCLUDES := com/sun/jmx/remote/protocol/iiop
+
+# Why is this in the open source tree?
+ifdef OPENJDK
+  java.management_EXCLUDES := \
+      com/sun/jmx/snmp \
+      sun/management/snmp \
+      #
+endif
+
+ifeq ($(RMICONNECTOR_IIOP), false)
+  java.management_EXCLUDES += com/sun/jmx/remote/protocol/iiop
+endif
+
+################################################################################
+
+java.rmi_CLEAN_FILES := $(wildcard \
+    $(JDK_TOPDIR)/src/java.rmi/share/classes/sun/rmi/registry/resources/*.properties \
+    $(JDK_TOPDIR)/src/java.rmi/share/classes/sun/rmi/server/resources/*.properties)
+
+################################################################################
+
+java.corba_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
+
+java.corba_COPY := .prp
+java.corba_CLEAN := .properties
+
+java.corba_EXCLUDES := \
+    com/sun/corba/se/PortableActivationIDL \
+    com/sun/tools/corba/se/logutil \
+    #
+java.corba_EXCLUDE_FILES := \
+    com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java \
+    com/sun/corba/se/spi/presentation/rmi/StubWrapper.java \
+    com/sun/org/omg/CORBA/IDLTypeOperations.java \
+    com/sun/org/omg/CORBA/IRObjectOperations.java \
+    org/omg/PortableInterceptor/UNKNOWN.java \
+    com/sun/tools/corba/se/idl/ResourceBundleUtil.java \
+    com/sun/corba/se/impl/presentation/rmi/jndi.properties \
+    #
+
+################################################################################
+
+java.xml_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
+java.xml_CLEAN := .properties
+
+################################################################################
+
+java.xml.bind_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
+java.xml.bind_CLEAN := .properties
+
+################################################################################
+
+java.xml.soap_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
+java.xml.soap_CLEAN := .properties
+
+################################################################################
+
+java.xml.ws_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
+java.xml.ws_COPY := .xml
+java.xml.ws_CLEAN := .properties
+
+################################################################################
+
+java.naming_CLEAN := jndiprovider.properties
+
+################################################################################
+
+java.security.saaj_CLEAN := .properties
+
+################################################################################
+
+java.xml.crypto_COPY := .dtd .xml
+java.xml.crypto_CLEAN := .properties
+
+################################################################################
+
+jdk.charsets_COPY := .dat
+
+################################################################################
+
+jdk.compiler_COPY := javax.tools.JavaCompilerTool
+
+################################################################################
+
+jdk.jcmd_COPY := _options 
+
+################################################################################
+
+jdk.javadoc_COPY := .xml .css .js
+
+################################################################################
+
+jdk.rmic_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
+jdk.rmic_CLEAN := .properties
+
+################################################################################
+
+# No SCTP implementation on Mac OS X or AIX. These classes should be excluded.
+SCTP_IMPL_CLASSES = \
+    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationChange.java \
+    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationImpl.java \
+    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/PeerAddrChange.java \
+    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/ResultContainer.java \
+    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java \
+    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java \
+    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNet.java \
+    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNotification.java \
+    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java \
+    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SendFailed.java \
+    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/Shutdown.java
+
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+  jdk.sctp_EXCLUDE_FILES := $(SCTP_IMPL_CLASSES)
+endif
+
+ifeq ($(OPENJDK_TARGET_OS),aix)
+  # These files are duplicated in AIX_SRC_DIRS
+  jdk.sctp_EXCLUDE_FILES := $(SCTP_IMPL_CLASSES)
+endif
+
+################################################################################
+
+jdk.jconsole_COPY := .gif .png
+
+jdk.jconsole_CLEAN_FILES := $(wildcard \
+    $(JDK_TOPDIR)/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/*.properties)
+
+################################################################################
+
+jdk.compiler_CLEAN_FILES := $(wildcard \
+    $(patsubst %, $(JDK_TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \
+        sun/tools/serialver/resources))
+
+################################################################################
+
+jdk.jdi_EXCLUDES := \
+    com/sun/tools/example/debug/bdi \
+    com/sun/tools/example/debug/event \
+    com/sun/tools/example/debug/gui \
+    com/sun/jdi/doc-files \
+    #
+
+jdk.jdi_EXCLUDE_FILES += jdi-overview.html
+
+################################################################################
+
+jdk.dev_CLEAN_FILES := $(wildcard \
+    $(patsubst %, $(JDK_TOPDIR)/src/jdk.dev/share/classes/%/*.properties, \
+        com/sun/tools/script/shell))
+
+jdk.dev_COPY := .js oqlhelp.html .txt
+
+################################################################################
+
+ifneq ($(OPENJDK_TARGET_OS), solaris)
+  jdk.attach_EXCLUDE_FILES += \
+      sun/tools/attach/SolarisAttachProvider.java \
+      sun/tools/attach/SolarisVirtualMachine.java \
+      #
+endif
+
+ifneq ($(OPENJDK_TARGET_OS), linux)
+  jdk.attach_EXCLUDE_FILES += \
+      sun/tools/attach/LinuxAttachProvider.java \
+      sun/tools/attach/LinuxVirtualMachine.java \
+      #
+endif
+
+ifneq ($(OPENJDK_TARGET_OS), macosx)
+  jdk.attach_EXCLUDE_FILES += \
+      sun/tools/attach/BsdAttachProvider.java \
+      sun/tools/attach/BsdVirtualMachine.java \
+      #
+endif
+
+ifneq ($(OPENJDK_TARGET_OS),aix)
+  jdk.attach_EXCLUDE_FILES += \
+      sun/tools/attach/AixAttachProvider.java \
+      sun/tools/attach/AixVirtualMachine.java \
+      #
+endif
+
+################################################################################
+
+jdk.jvmstat_COPY := aliasmap
+
+################################################################################
+
+jdk.xml.bind_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
+jdk.xml.bind_CLEAN := .properties
+jdk.xml.bind_COPY := .xsd JAXBContextFactory.java ZeroOneBooleanAdapter.java
+
+################################################################################
+
+jdk.xml.ws_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
+jdk.xml.ws_CLEAN := .properties
+
+################################################################################
+
+sun.charsets_COPY := .dat
+
+################################################################################
+
+jdk.localedata_COPY := _dict _th
+# Exclude BreakIterator classes that are just used in compile process to generate
+# data files and shouldn't go in the product
+jdk.localedata_EXCLUDE_FILES := sun/text/resources/th/BreakIteratorRules_th.java
+
+################################################################################
+# Setup the compilation of each module
+#
+# Do not include nashorn src here since it needs to be compiled separately due
+# to nasgen.
+#
+# Order src dirs in order of override with the most important first. Generated
+# source before static source and platform specific source before shared.
+#
+# To use this variable, use $(call ALL_SRC_DIRS,module) with no space.
+GENERATED_SRC_DIRS += \
+    $(JDK_OUTPUTDIR)/gensrc/$1 \
+    $(LANGTOOLS_OUTPUTDIR)/gensrc/$1 \
+    $(CORBA_OUTPUTDIR)/gensrc/$1 \
+    $(JDK_OUTPUTDIR)/gensrc_no_srczip/$1 \
+    #
+
+OS_SRC_DIRS += $(JDK_TOPDIR)/src/$1/$(OPENJDK_TARGET_OS)/classes
+ifneq ($(OPENJDK_TARGET_OS), $(OPENJDK_TARGET_OS_API_DIR))
+OS_API_SRC_DIRS += $(JDK_TOPDIR)/src/$1/$(OPENJDK_TARGET_OS_API_DIR)/classes
+endif
+
+SHARE_SRC_DIRS += \
+    $(JDK_TOPDIR)/src/$1/share/classes \
+    $(LANGTOOLS_TOPDIR)/src/$1/share/classes \
+    $(CORBA_TOPDIR)/src/$1/share/classes \
+    $(JAXP_TOPDIR)/src/$1/share/classes \
+    $(JAXWS_TOPDIR)/src/$1/share/classes \
+    #
+
+ALL_SRC_DIRS = \
+    $(GENERATED_SRC_DIRS) \
+    $(OS_SRC_DIRS) \
+    $(OS_API_SRC_DIRS) \
+    $(SHARE_SRC_DIRS) \
+    #
+
+# Find all modules with java sources. Filter out nashorn since it needs to be
+# compiled separately.
+ALL_JAVA_MODULES := $(filter-out jdk.scripting.nashorn, $(call FindJavaModules))
+JAVA_MODULES := $(ALL_JAVA_MODULES)
+
+# The JDK_USER_DEFINED_FILTER is a poor man's incremental build: by specifying
+# JDK_FILTER at the make command line, only a subset of the JDK java files will
+# be recompiled. If multiple paths are separated by comma, convert that into a
+# space separated list.
+JDK_USER_DEFINED_FILTER := $(strip $(subst $(COMMA),$(SPACE), $(JDK_FILTER)))
+
+# This macro sets up compilation of a module and declares dependencies for it.
+# Param 1 - module name
+define SetupModuleCompilation
+  # Find the module dependencies by parsing modules.list file
+  $1_DEPS := $$(call FindDepsForModule, $1)
+
+  $1_CLASSPATH := $$(addprefix $(JDK_OUTPUTDIR)/modules/,$$($1_DEPS))
+  ifeq ($1, jdk.hotspot.agent)
+    ## The source of this module is compiled elsewhere, hotspot, and imported.
+    ## Service types are required in the classpath when compiing module-info
+    $1_CLASSPATH := $$($1_CLASSPATH) $$(addprefix $(JDK_OUTPUTDIR)/modules/,jdk.hotspot.agent)
+  endif
+  $1_CLASSPATH := $$(subst $$(SPACE),$$(PATH_SEP),$$($1_CLASSPATH))
+  $1_JAVAC_FLAGS := -bootclasspath "$$($1_CLASSPATH)"
+
+  $$(eval $$(call SetupJavaCompilation,$1, \
+      SETUP := $$(if $$($1_SETUP), $$($1_SETUP), GENERATE_JDKBYTECODE), \
+      SRC := $$(wildcard $$(call ALL_SRC_DIRS,$1)), \
+      INCLUDES:=$(JDK_USER_DEFINED_FILTER),\
+      BIN := $(JDK_OUTPUTDIR)/modules/$1, \
+      HEADERS := $(JDK_OUTPUTDIR)/gensrc_headers/$1, \
+      ADD_JAVAC_FLAGS := $$($1_JAVAC_FLAGS)))
+
+  $1: $$($1) $$($1_COPY_EXTRA)
+
+  # Declare dependencies between java compilation of different modules.
+  # Since not all modules have been declared yet, or might be declared
+  # in different invocations of this file, use the macro to find the 
+  # correct target file to depend on.
+  # Only the javac compilation actually depends on other modules so limit
+  # dependency declaration to that by using the *_COMPILE_TARGET variable.
+  $$($1_COMPILE_TARGETS): $$(foreach d,$$($1_DEPS), \
+      $$(call SetupJavaCompilationCompileTarget, $$d, $(JDK_OUTPUTDIR)/modules/$$d))
+endef
+
+# Setup compilation for each module
+$(foreach m,$(JAVA_MODULES),$(eval $(call SetupModuleCompilation,$m)))
+
+################################################################################
+# Copy zh_HK properties files from zh_TW
+
+$(JDK_OUTPUTDIR)/modules/%_zh_HK.properties: $(JDK_OUTPUTDIR)/modules/%_zh_TW.properties
+	$(install-file)
+
+define CreateHkTargets
+  $(patsubst $(JDK_TOPDIR)/src/%, $(JDK_OUTPUTDIR)/modules/%, \
+    $(subst /share/classes,, \
+      $(subst _zh_TW,_zh_HK, $(filter %_zh_TW.properties, $1))))
+endef
+
+java.sql.rowset: $(call CreateHkTargets, $(java.sql.rowset_CLEAN_FILES))
+java.rmi: $(call CreateHkTargets, $(java.rmi_CLEAN_FILES))
+
+all: $(JAVA_MODULES)
+
+.PHONY: all $(JAVA_MODULES)
diff --git a/jaxp/make/Makefile b/make/Install.gmk
similarity index 54%
rename from jaxp/make/Makefile
rename to make/Install.gmk
index 4570070f45b..f7340b09951 100644
--- a/jaxp/make/Makefile
+++ b/make/Install.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,27 +23,21 @@
 # questions.
 #
 
-# Locate this Makefile
-ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))), )
-  makefile_path := $(CURDIR)/$(lastword $(MAKEFILE_LIST))
-else
-  makefile_path := $(lastword $(MAKEFILE_LIST))
-endif
-repo_dir := $(patsubst %/make/Makefile, %, $(makefile_path))
+default: install
 
-# What is the name of this subsystem (langtools, corba, etc)?
-subsystem_name := $(notdir $(repo_dir))
+include $(SPEC)
 
-# Try to locate top-level makefile
-top_level_makefile := $(repo_dir)/../Makefile
-ifneq ($(wildcard $(top_level_makefile)), )
-  $(info Will run $(subsystem_name) target on top-level Makefile)
-  $(info WARNING: This is a non-recommended way of building!)
-  $(info ===================================================)
-else
-  $(info Cannot locate top-level Makefile. Is this repo not checked out as part of a complete forest?)
-  $(error Build from top-level Makefile instead)
-endif
+BINARIES := $(notdir $(wildcard $(JDK_IMAGE_DIR)/bin/*))
+INSTALLDIR := openjdk-$(RELEASE)
 
-all:
-	@$(MAKE) -f $(top_level_makefile) $(subsystem_name)
+# Install the jdk image, in a very crude way. Not taking into
+# account, how to install properly on macosx or windows etc.
+install:
+	echo Installing jdk image into $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)
+	echo and creating $(words $(BINARIES)) links from $(INSTALL_PREFIX)/bin into the jdk.
+	$(MKDIR) -p $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)
+	$(RM) -r $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)/*
+	$(CP) -rp $(JDK_IMAGE_DIR)/* $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)
+	$(MKDIR) -p $(INSTALL_PREFIX)/bin
+	$(RM) $(addprefix $(INSTALL_PREFIX)/bin/, $(BINARIES))
+	$(foreach b, $(BINARIES), $(LN) -s $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)/bin/$b $(INSTALL_PREFIX)/bin/$b &&) true
diff --git a/make/Javadoc.gmk b/make/Javadoc.gmk
index 8d434cfcc7e..c283d0294c8 100644
--- a/make/Javadoc.gmk
+++ b/make/Javadoc.gmk
@@ -41,18 +41,11 @@ include NON_CORE_PKGS.gmk
 .SUFFIXES: .java
 
 #
-# Definitions for $(DOCSDIR), $(MKDIR), $(BINDIR), etc.
+# Definitions for directories
 #
 
-DOCSDIR=$(OUTPUT_ROOT)/docs
-TEMPDIR=$(OUTPUT_ROOT)/docstemp
-
-JDK_SHARE_SRC=$(JDK_TOPDIR)/src/share
-JDK_SHARE_CLASSES=$(JDK_SHARE_SRC)/classes
-
-JDK_IMPSRC = $(JDK_OUTPUTDIR)/impsrc
-
-JDK_GENSRC = $(JDK_OUTPUTDIR)/gensrc
+DOCSDIR := $(OUTPUT_ROOT)/docs
+TEMPDIR := $(OUTPUT_ROOT)/docstemp
 
 HOTSPOT_DOCS_IMPORT_PATH=$(HOTSPOT_OUTPUTDIR)/docs
 
@@ -143,16 +136,19 @@ $(FULL_COMPANY_NAME) in the US and other countries.
 # Otherwise, you get "No packages or classes specified." due
 # to $(PATH_SEP) being interpreted as an end of
 # command (newline or shell ; character)
-ALL_SOURCE_DIRS = $(JDK_SHARE_CLASSES) \
-    $(JDK_IMPSRC) \
-    $(JDK_GENSRC) \
-    $(JDK_OUTPUTDIR)/gendocsrc_rmic \
-    $(JDK_TOPDIR)/src/solaris/classes \
-    $(JDK_TOPDIR)/src/windows/classes \
-    $(JDK_SHARE_SRC)/doc/stub
-
-# List of directories that actually exist
-ALL_EXISTING_SOURCE_DIRS := $(wildcard $(ALL_SOURCE_DIRS))
+ALL_SOURCE_DIRS := $(wildcard \
+      $(JDK_TOPDIR)/src/*/share/classes \
+      $(JDK_TOPDIR)/src/*/$(OPENJDK_TARGET_OS_API_DIR)/classes \
+      $(LANGTOOLS_TOPDIR)/src/*/share/classes \
+      $(CORBA_TOPDIR)/src/*/share/classes \
+      $(JAXP_TOPDIR)/src/*/share/classes \
+      $(JAXWS_TOPDIR)/src/*/share/classes \
+      $(JDK_OUTPUTDIR)/gensrc/j* \
+      $(JDK_OUTPUTDIR)/gendocsrc_rmic \
+      $(CORBA_OUTPUTDIR)/gensrc/j* \
+      $(JDK_TOPDIR)/src/*/share/doc/stub \
+      ) \
+      #
 
 # List with classpath separator between them
 EMPTY:=
@@ -176,7 +172,7 @@ endef
 
 $(eval $(call FillCacheFind, $(ALL_SOURCE_DIRS)))
 define PackageDependencies
-  $(call CacheFind, $(foreach p, $(subst .,/,$1), $(addsuffix /$p, $(ALL_SOURCE_DIRS))))
+  $(call CacheFind, $(wildcard $(foreach p, $(subst .,/,$1), $(addsuffix /$p, $(ALL_SOURCE_DIRS)))))
 endef
 
 # Given a list of packages, add packages that exist to $@, print summary
@@ -382,7 +378,7 @@ COREAPI_HEADER = \
 Java$(TRADEMARK) Platform
          Standard Ed. $(JDK_MINOR_VERSION)          
 
 # Overview file for core apis
-COREAPI_OVERVIEW = $(JDK_SHARE_CLASSES)/overview-core.html
+COREAPI_OVERVIEW = $(JDK_TOPDIR)/src/java.base/share/classes/overview-core.html
 
 # The index.html, options, and packages files
 COREAPI_INDEX_FILE = $(COREAPI_DOCSDIR)/index.html
@@ -534,7 +530,7 @@ $(TAGLETAPI_OPTIONS_FILE):
 # Create a file with the package names in it
 $(TAGLETAPI_PACKAGES_FILE): $(call PackageDependencies,$(TAGLETAPI_PKGS))
 	$(prep-target)
-	@($(ECHO) "$(JDK_IMPSRC)/$(TAGLETAPI_FILE)" ) > $@
+	@($(ECHO) "$(LANGTOOLS_TOPDIR)/src/jdk.javadoc/share/classes/$(TAGLETAPI_FILE)" ) > $@
 
 #############################################################
 #
@@ -614,7 +610,7 @@ JDI_DOCTITLE := Java$(TRADEMARK) Debug Interface
 JDI_WINDOWTITLE := Java Debug Interface
 JDI_HEADER := Java Debug Interface
 JDI_BOTTOM := $(call CommonBottom,$(JDI_FIRST_COPYRIGHT_YEAR))
-JDI_OVERVIEW := $(JDK_SHARE_CLASSES)/jdi-overview.html
+JDI_OVERVIEW := $(JDK_TOPDIR)/src/jdk.jdi/share/classes/jdi-overview.html
 # JDI_PKGS is located in NON_CORE_PKGS.gmk
 
 # The index.html, options, and packages files
@@ -703,7 +699,7 @@ JAAS_WINDOWTITLE := Java Authentication and Authorization Service
 JAAS_HEADER := Java Authentication and Authorization Service
 JAAS_BOTTOM := $(call CommonBottom,$(JAAS_FIRST_COPYRIGHT_YEAR))
 # JAAS_PKGS is located in NON_CORE_PKGS.gmk
-JAAS_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/security/auth/jaas-overview.html
+JAAS_OVERVIEW := $(JDK_TOPDIR)/src/jdk.security.auth/share/classes/jaas-overview.html
 
 # The index.html, options, and packages files
 JAAS_INDEX_FILE = $(JAAS_DOCDIR)/index.html
@@ -756,7 +752,7 @@ JGSS_DOCTITLE := Java$(TRADEMARK) GSS-API Utilities
 JGSS_WINDOWTITLE := Java GSS-API Utilities
 JGSS_HEADER := Java GSS-API Utilities
 JGSS_BOTTOM := $(call CommonBottom,$(JGSS_FIRST_COPYRIGHT_YEAR))
-JGSS_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/security/jgss/jgss-overview.html
+JGSS_OVERVIEW := $(JDK_TOPDIR)/src/java.security.jgss/share/classes/jgss-overview.html
 # JGSS_PKGS is located in NON_CORE_PKGS.gmk
 
 # The index.html, options, and packages files
@@ -913,12 +909,12 @@ ALL_OTHER_TARGETS += mgmtdocs
 MGMT_DOCDIR := $(JRE_API_DOCSDIR)/management/extension
 MGMT2COREAPI := ../../$(JDKJRE2COREAPI)
 JVM_MIB_NAME := JVM-MANAGEMENT-MIB.mib
-JVM_MIB_SRC := $(JDK_TOPDIR)/src/closed/share/classes/sun/management/snmp/$(JVM_MIB_NAME)
+JVM_MIB_SRC := $(JDK_TOPDIR)/src/closed/jdk.snmp/share/classes/sun/management/snmp/$(JVM_MIB_NAME)
 MGMT_DOCTITLE := Monitoring and Management Interface for the Java$(TRADEMARK) Platform
 MGMT_WINDOWTITLE := Monitoring and Management Interface for the Java Platform
 MGMT_HEADER := Monitoring and Management Interface for the Java Platform
 MGMT_BOTTOM := $(call CommonBottom,$(MGMT_FIRST_COPYRIGHT_YEAR))
-MGMT_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/management/mgmt-overview.html
+MGMT_OVERVIEW := $(JDK_TOPDIR)/src/java.management/share/classes/mgmt-overview.html
 # MGMT_PKGS is located in NON_CORE_PKGS.gmk
 
 # The index.html, options, and packages files
diff --git a/make/Jprt.gmk b/make/Jprt.gmk
index 59b76cdf4eb..48ae1cf4623 100644
--- a/make/Jprt.gmk
+++ b/make/Jprt.gmk
@@ -52,7 +52,6 @@ endif
 
 # This target must be called in the context of a SPEC file
 jprt_bundle: $(JPRT_ARCHIVE_BUNDLE)
-	@$(call CheckIfMakeAtEnd)
 
 # This target must be called in the context of a SPEC file
 $(JPRT_ARCHIVE_BUNDLE): bundles
@@ -66,8 +65,7 @@ SRC_JDK_BUNDLE_DIR := $(JDK_BUNDLE_DIR)
 SRC_JRE_BUNDLE_DIR := $(JRE_BUNDLE_DIR)
 
 # Bundle up the images
-bundles: all bundles-only
-bundles-only: start-make
+bundles: all
 	@$(call TargetEnter)
 	$(MKDIR) -p $(BUILD_OUTPUT)/bundles
 	$(CD) $(SRC_JDK_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip .
@@ -78,8 +76,7 @@ bundles-only: start-make
 	@$(call TargetExit)
 
 # Copy images to one unified location regardless of platform etc.
-final-images: all final-images-only
-final-images-only: start-make
+final-images: all
 	@$(call TargetEnter)
 	$(RM) -r $(BUILD_OUTPUT)/final-images
 	$(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JDK_IMAGE_SUBDIR)
@@ -97,4 +94,4 @@ final-images-only: start-make
 
 ###########################################################################
 # Phony targets
-.PHONY: jprt_bundle bundles bundles-only final-images final-images-only
+.PHONY: jprt_bundle bundles final-images
diff --git a/make/Main.gmk b/make/Main.gmk
index 57c265fd8d6..6f2a863bcf6 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -23,165 +23,201 @@
 # questions.
 #
 
-### This is the main part of the Makefile, for the normal case with SPEC specifying a single existing spec.gmk file.
+################################################################################
+# This is the main makefile containing most actual top level targets. It needs
+# to be called with a SPEC file defined.
+
+# Declare default target
+default:
 
 # Now load the spec
 include $(SPEC)
 
+include $(SRC_ROOT)/make/MakeHelpers.gmk
+
 # Load the vital tools for all the makefiles.
 include $(SRC_ROOT)/make/common/MakeBase.gmk
 
+# Load common profile names definitions
+include $(JDK_TOPDIR)/make/ProfileNames.gmk
+
+# Declare ALL_TARGETS as an immediate variable. This variable is a list of all
+# valid top level targets. It's used to declare them all as PHONY and to 
+# generate the -only targets.
+ALL_TARGETS :=
+
 # Hook to include the corresponding custom file, if present.
 $(eval $(call IncludeCustomExtension, , Main.gmk))
 
-### Clean up from previous run
+# All modules for the current target platform.
+# Manually add jdk.hotspot.agent for now.
+ALL_MODULES := $(call FindAllModules) jdk.hotspot.agent
 
-# Remove any build.log from a previous run, if they exist
-ifneq (,$(BUILD_LOG))
-  ifneq (,$(BUILD_LOG_PREVIOUS))
-    # Rotate old log
-    $(shell $(RM) $(BUILD_LOG_PREVIOUS) 2> /dev/null)
-    $(shell $(MV) $(BUILD_LOG) $(BUILD_LOG_PREVIOUS) 2> /dev/null)
-  else
-    $(shell $(RM) $(BUILD_LOG) 2> /dev/null)
-  endif
-  $(shell $(RM) $(OUTPUT_ROOT)/build-trace-time.log 2> /dev/null)
-endif
-# Remove any javac server logs and port files. This
-# prevents a new make run to reuse the previous servers.
-ifneq (,$(SJAVAC_SERVER_DIR))
-  $(shell $(MKDIR) -p $(SJAVAC_SERVER_DIR) && $(RM) -rf $(SJAVAC_SERVER_DIR)/*)
-endif
+################################################################################
+################################################################################
+#
+# Recipes for all targets. Only recipes, dependencies are declared later.
+#
+################################################################################
 
-# Reset the build timers.
-$(eval $(call ResetAllTimers))
+################################################################################
+# Interim/build tools targets, compiling tools used during the build
 
-# Setup number of jobs to use. -jN is unfortunately not available for us to parse from the command line,
-# hence this workaround.
-MAKE_ARGS:=$(MAKE_ARGS) -j$(JOBS)
+interim-langtools:
+	+($(CD) $(LANGTOOLS_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileInterim.gmk)
 
-### Main targets
+interim-corba:
+	+($(CD) $(CORBA_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileCorba.gmk)
 
-default: jdk
-	@$(call CheckIfMakeAtEnd)
+interim-rmic:
+	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileInterimRmic.gmk)
 
-all: images docs
-	@$(call CheckIfMakeAtEnd)
+build-tools-jdk:
+	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Tools.gmk java-tools)
 
-# Setup a rule for SPEC file that fails if executed. This check makes sure the configuration
-# is up to date after changes to configure
-$(SPEC): $(wildcard $(SRC_ROOT)/common/autoconf/*)
-	@$(ECHO) "ERROR: $(SPEC) is not up to date."
-	@$(ECHO) "Please rerun configure! Easiest way to do this is by running"
-	@$(ECHO) "'make reconfigure'."
-	@if test "x$(IGNORE_OLD_CONFIG)" != "xtrue"; then exit 1; fi
+ALL_TARGETS += interim-langtools interim-corba build-tools-jdk
 
-start-make: $(SPEC)
-	@$(call AtMakeStart)
+################################################################################
+# Special targets for certain modules
 
-langtools: langtools-only
-langtools-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(LANGTOOLS_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildLangtools.gmk)
-	@$(call TargetExit)
+import-hotspot:
+	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Import.gmk)
 
-corba: langtools corba-only
-corba-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(CORBA_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildCorba.gmk)
-	@$(call TargetExit)
+unpack-sec:
+	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f UnpackSecurity.gmk)
 
-jaxp: langtools jaxp-only
-jaxp-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JAXP_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJaxp.gmk)
-	@$(call TargetExit)
+policy-jars:
+	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CreatePolicyJars.gmk)
 
-jaxws: langtools jaxp jaxws-only
-jaxws-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JAXWS_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJaxws.gmk)
-	@$(call TargetExit)
+ALL_TARGETS += import-hotspot unpack-sec policy-jars
+
+################################################################################
+# Gensrc targets, generating source before java compilation can be done
+JDK_GENSRC_MODULES := $(call FindModulesWithMakefileFor, gensrc, Gensrc)
+LANGTOOLS_GENSRC_MODULES := jdk.compiler.tools
+CORBA_GENSRC_MODULES := java.corba
+GENSRC_MODULES := $(JDK_GENSRC_MODULES) $(LANGTOOLS_GENSRC_MODULES) \
+    $(CORBA_GENSRC_MODULES)
+JDK_GENSRC_TARGETS := $(addsuffix -gensrc, $(JDK_GENSRC_MODULES))
+LANGTOOLS_GENSRC_TARGETS := $(addsuffix -gensrc, $(LANGTOOLS_GENSRC_MODULES))
+CORBA_GENSRC_TARGETS := $(addsuffix -gensrc, $(CORBA_GENSRC_MODULES))
+GENSRC_TARGETS := $(addsuffix -gensrc, $(GENSRC_MODULES))
+
+jdk.compiler.tools-gensrc:
+	+($(CD) $(LANGTOOLS_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f GensrcLangtools.gmk)
+
+java.corba-gensrc:
+	+($(CD) $(CORBA_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f GensrcCorba.gmk)
+
+# Declare recipes for all jdk -gensrc targets
+$(foreach m, $(JDK_GENSRC_MODULES), $(eval $(call DeclareRecipeForModuleMakefile, \
+    $m, gensrc, gensrc, Gensrc)))
+
+ALL_TARGETS += $(GENSRC_TARGETS)
+
+################################################################################
+# Generate data targets
+GENDATA_MODULES := $(call FindModulesWithMakefileFor, gendata, Gendata)
+GENDATA_TARGETS := $(addsuffix -gendata, $(GENDATA_MODULES))
+
+# Declare recipes for all -gendata targets
+$(foreach m, $(GENDATA_MODULES), $(eval $(call DeclareRecipeForModuleMakefile, \
+    $m, gendata, gendata, Gendata)))
+
+$(foreach m, $(GENDATA_MODULES), $(eval $(call DeclareGendataRecipe,$m)))
+
+ALL_TARGETS += $(GENDATA_TARGETS)
+
+################################################################################
+# Copy files targets
+COPY_MODULES := $(call FindModulesWithMakefileFor, copy, Copy)
+COPY_TARGETS := $(addsuffix -copy, $(COPY_MODULES))
+
+# Declare recipes for all -copy targets
+$(foreach m, $(COPY_MODULES), $(eval $(call DeclareRecipeForModuleMakefile, \
+    $m, copy, copy, Copy)))
+
+ALL_TARGETS += $(COPY_TARGETS)
+
+################################################################################
+# Targets for compiling all java modules. Nashorn is treated separately.
+JAVA_MODULES := $(call FindJavaModules)
+JAVA_TARGETS := $(addsuffix -java, $(JAVA_MODULES))
+
+define DeclareCompileJavaRecipe
+  $1-java:
+	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f CompileJavaModules.gmk \
+	    $1 JAVA_MODULES=$1)
+endef
+
+$(foreach m, $(filter-out jdk.scripting.nashorn, $(JAVA_MODULES)), \
+    $(eval $(call DeclareCompileJavaRecipe,$m)))
+
+# Build nashorn. Needs to be compiled separately from the rest of the modules
+# due to nasgen.
+jdk.scripting.nashorn-java:
+	+($(CD) $(NASHORN_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f BuildNashorn.gmk compile)
+
+ALL_TARGETS += $(JAVA_TARGETS)
+
+################################################################################
+# Targets for running rmic.
+RMIC_MODULES := $(call FindModulesWithMakefileFor, rmic, Rmic)
+RMIC_TARGETS := $(addsuffix -rmic, $(RMIC_MODULES))
+
+# Declare recipes for all -rmic targets
+$(foreach m, $(RMIC_MODULES), $(eval $(call DeclareRecipeForModuleMakefile, \
+    $m, rmic, rmic, Rmic)))
+
+ALL_TARGETS += $(RMIC_TARGETS)
+
+################################################################################
+# Targets for compiling native libraries
+ALL_LIB_MODULES := $(call FindModulesWithMakefileFor, lib, Lib)
+LIB_MODULES := $(filter $(ALL_MODULES), $(ALL_LIB_MODULES))
+LIB_TARGETS := $(addsuffix -libs, $(LIB_MODULES))
+
+# Declare recipes for all -libs targets
+$(foreach m, $(LIB_MODULES), $(eval $(call DeclareRecipeForModuleMakefile, \
+    $m, libs, lib, Lib)))
+
+ALL_TARGETS += $(LIB_TARGETS)
+
+################################################################################
+# Targets for compiling native executables
+ALL_LAUNCHER_MODULES := $(call FindModulesWithMakefileFor, launcher, Launcher)
+LAUNCHER_MODULES := $(filter $(ALL_MODULES), $(ALL_LAUNCHER_MODULES))
+LAUNCHER_TARGETS := $(addsuffix -launchers, $(LAUNCHER_MODULES))
+
+# Declare recipes for all -launchers targets
+$(foreach m, $(LAUNCHER_MODULES), $(eval $(call DeclareRecipeForModuleMakefile, \
+    $m, launchers, launcher, Launcher)))
+
+ALL_TARGETS += $(LAUNCHER_TARGETS)
+
+################################################################################
+# Build hotspot target
 
 ifeq ($(BUILD_HOTSPOT),true)
-  hotspot: hotspot-only
-  hotspot-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f HotspotWrapper.gmk)
-	@$(call TargetExit)
+  hotspot:
+	($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f HotspotWrapper.gmk)
 endif
 
-jdk: langtools hotspot corba jaxp jaxws jdk-only
-jdk-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk $(JDK_TARGET))
-	@$(call TargetExit)
+ALL_TARGETS += hotspot
 
-nashorn: jdk nashorn-only
-nashorn-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(NASHORN_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildNashorn.gmk)
-	@$(call TargetExit)
+################################################################################
+# Build demos and samples targets
 
-demos: jdk demos-only
-demos-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk demos)
-	@$(call TargetExit)
+demos:
+	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileDemos.gmk)
 
-# Note: This double-colon rule is intentional, to support
-# custom make file integration.
-images:: source-tips demos nashorn images-only
-images-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk images)
-	@$(call TargetExit)
+samples:
+	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopySamples.gmk)
 
-overlay-images: source-tips demos overlay-images-only
-overlay-images-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk overlay-images)
-	@$(call TargetExit)
+ALL_TARGETS += demos samples
 
-profiles: profiles-oscheck source-tips jdk hotspot profiles-only
-profiles-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk profiles)
-	@$(call TargetExit)
-
-profiles-oscheck:
-        ifneq ($(OPENJDK_TARGET_OS), linux)
-	  @echo "Error: The Java SE 8 Compact Profiles are only implemented for Linux at this time" && exit 1
-        endif
-
-install: images install-only
-install-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk install)
-	@$(call TargetExit)
-
-docs: jdk docs-only
-docs-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs)
-	@$(call TargetExit)
-
-sign-jars: jdk sign-jars-only
-sign-jars-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk sign-jars)
-	@$(call TargetExit)
-
-bootcycle-images: images bootcycle-images-only
-bootcycle-images-only: start-make
-	@$(ECHO) Boot cycle build step 2: Building a new JDK image using previously built image
-	@($(CD) $(SRC_ROOT) && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(dir $(SPEC))bootcycle-spec.gmk images)
-
-test: images test-only
-test-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true
-	@$(call TargetExit)
+################################################################################
+# Image targets
 
 # Stores the tips for each repository. This file is be used when constructing the jdk image and can be
 # used to track the exact sources used to build that image.
@@ -191,52 +227,313 @@ $(OUTPUT_ROOT)/source_tips: FRC
 	@$(RM) $@
 	@$(call GetSourceTips)
 
+security-jars:
+	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CreateSecurityJars.gmk)
+
+nashorn-jar:
+	+($(CD) $(NASHORN_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f BuildNashorn.gmk all)
+
+# Creates the jar files (rt.jar resources.jar etc)
+main-jars:
+	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CreateJars.gmk)
+
+# Creates the images (j2sdk-image j2re-image etc)
+images:
+	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk)
+        ifeq ($(OPENJDK_TARGET_OS), macosx)
+	  +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk)
+        endif
+
+# Create Compact Profile jars
+PROFILE_JARS_TARGETS := $(addsuffix -jars, $(ALL_PROFILES))
+$(PROFILE_JARS_TARGETS):
+	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) PROFILE=$(@:%-jars=%) -f CreateJars.gmk)
+
+# Create Compact Profile images
+PROFILE_IMAGES_TARGETS := $(addsuffix -images, $(ALL_PROFILES))
+$(PROFILE_IMAGES_TARGETS):
+	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) PROFILE=$(@:%-images=%) \
+	    JRE_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/j2re-$(word $(call profile_number,$(@:%-images=%)),$(PROFILE_NAMES))-image \
+	    -f Images.gmk profile-image)
+
+profiles-oscheck:
+        ifneq ($(OPENJDK_TARGET_OS), linux)
+	  @echo "Error: The Java SE 8 Compact Profiles are only implemented for Linux at this time" && exit 1
+        endif
+
+bootcycle-images:
+	@$(ECHO) Boot cycle build step 2: Building a new JDK image using previously built image
+	+$(MAKE) $(MAKE_ARGS) -f Main.gmk SPEC=$(dir $(SPEC))bootcycle-spec.gmk images
+
+ALL_TARGETS += source-tips security-jars nashorn-jar main-jars images \
+    $(PROFILE_JARS_TARGETS) $(PROFILE_IMAGES_TARGETS) profiles-oscheck \
+    bootcycle-images
+
+################################################################################
+# Docs targets
+
+docs-javadoc:
+	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs)
+
+docs-jvmtidoc:
+	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk jvmtidocs)
+
+ALL_TARGETS += docs-javadoc docs-jvmtidoc
+
+################################################################################
+# Test target
+
+test:
+	($(CD) $(SRC_ROOT)/test && $(MAKE) $(MAKE_ARGS) -j1 -k MAKEFLAGS= \
+	    JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_OUTPUT_DIR) \
+	    ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true
+
+test-make:
+	($(CD) $(SRC_ROOT)/test/make && $(MAKE) $(MAKE_ARGS) -f TestMake.gmk $(TEST_TARGET))
+
+ALL_TARGETS += test test-make
+
+################################################################################
+# Verification targets
+
+# generate modules.xml in the exploded image
+modules-xml:
+	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ModulesXml.gmk gen-modules-xml)
+
+verify-modules:
+	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ModulesXml.gmk checkdeps)
+
+ALL_TARGETS += modules-xml verify-modules
+
+################################################################################
+# Install targets
+
+install:
+	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Install.gmk)
+
+ALL_TARGETS += install
+
+################################################################################
+#
+# Dependency declarations between targets. 
+#
+# These are declared in two groups. First all dependencies between targets that 
+# have recipes above as these dependencies may be disabled. Then the aggregator
+# targets that do not have recipes of their own, which will never have their
+# dependencies disabled.
+#
+################################################################################
+# Targets with recipes above
+
+# If running an *-only target, parallel execution and dependencies between 
+# recipe targets are disabled. This makes it possible to run a select set of 
+# recipe targets in order. It's the responsibility of the user to make sure
+# all prerequisites are fulfilled. 
+ifneq ($(findstring -only, $(MAKECMDGOALS)), )
+  .NOTPARALLEL:
+else
+  interim-langtools: $(LANGTOOLS_GENSRC_TARGETS)
+
+  build-tools-jdk: interim-langtools
+
+  $(CORBA_GENSRC_TARGETS): interim-langtools
+
+  $(JDK_GENSRC_TARGETS): interim-langtools build-tools-jdk
+
+  interim-corba: $(CORBA_GENSRC_TARGETS)
+
+  $(GENDATA_TARGETS): interim-langtools build-tools-jdk
+
+  interim-rmic: interim-langtools
+
+  $(RMIC_TARGETS): interim-langtools interim-corba interim-rmic
+
+  import-hotspot: hotspot
+
+  $(LIB_TARGETS): import-hotspot
+
+  $(LAUNCHER_TARGETS): java.base-libs
+
+  demos: $(JAVA_TARGETS)
+
+  # Declare dependency from -java to -gensrc
+  $(foreach m, $(GENSRC_MODULES), $(eval $m-java: $m-gensrc))
+
+  # Declare dependencies between java modules
+  $(foreach m, $(JAVA_MODULES), \
+      $(eval $m-java: $(addsuffix -java, $(filter $(JAVA_MODULES), \
+      $(call FindDepsForModule,$m)))))
+
+  # Declare dependencies between -rmic to -java
+  $(foreach m, $(RMIC_MODULES), $(eval $m-rmic: $m-java))
+
+  # Declare dependencies from -lib to -java
+  # Skip jdk.jdwp.agent as it contains no java code.
+  $(foreach m, $(filter-out jdk.jdwp.agent, $(LIB_MODULES)), $(eval $m-libs: $m-java))
+
+  # Declare dependencies from all other -lib to java.base-lib
+  $(foreach t, $(filter-out java.base-libs, $(LIB_TARGETS)), \
+      $(eval $t: java.base-libs))
+  # Declare the special case dependency for jdk.deploy.osx where libosx 
+  # links against libosxapp.
+  jdk.deploy.osx-libs: java.desktop-libs
+
+  # This dependency needs to be explicitly declared. jdk.jdi-gensrc generates a 
+  # header file used by jdk.jdwp libs.
+  jdk.jdwp-libs: jdk.jdi-gensrc
+
+  # Explicitly add dependencies for special targets
+  java.base-java: unpack-sec
+
+  security-jars: java
+
+  nashorn-jar: jdk.scripting.nashorn-java
+
+  main-jars: java rmic security-jars nashorn-jar policy-jars import-hotspot
+
+  # On windows, the jars target needs to wait for jgss libs to be built.
+  # Should ideally split out the sec-bin zip file generation to avoid
+  # this dependency.
+  ifeq ($(OPENJDK_TARGET_OS), windows)
+    main-jars: java.security.jgss-libs
+  endif
+
+  images: jars demos samples exploded-image source-tips
+
+  bootcycle-images: images
+
+  # Need to depend on jars as otherwise there will a race between all the
+  # invocations of CreateJars.gmk.
+  $(PROFILE_JARS_TARGETS): jars profiles-oscheck
+
+  $(PROFILE_IMAGES_TARGETS): demos samples exploded-image source-tips
+
+  # Declare dependencies from -images to -jars
+  $(foreach p, $(ALL_PROFILES), $(eval $p-images: $p-jars))
+
+  docs-javadoc: $(GENSRC_TARGETS) rmic
+
+  docs-jvmtidoc: hotspot
+
+  test: exploded-image
+
+  modules-xml: build-tools-jdk java
+
+  verify-modules: exploded-image modules-xml
+
+endif
+
+################################################################################
+# Virtual targets without recipes
+
+gensrc: $(GENSRC_TARGETS)
+
+gendata: $(GENDATA_TARGETS)
+
+copy: $(COPY_TARGETS)
+
+java: $(JAVA_TARGETS)
+
+rmic: $(RMIC_TARGETS)
+
+libs: $(LIB_TARGETS)
+
+launchers: $(LAUNCHER_TARGETS)
+
+# Explicitly add dependencies for these special targets
+java.base: import-hotspot policy-jars
+
+# Declare dependencies from  to all the individual targets specific
+# to that module -*.
+$(foreach m, $(GENSRC_MODULES), $(eval $m: $m-gensrc))
+$(foreach m, $(JAVA_MODULES), $(eval $m: $m-java))
+$(foreach m, $(GENDATA_MODULES), $(eval $m: $m-gendata))
+$(foreach m, $(RMIC_MODULES), $(eval $m: $m-rmic))
+$(foreach m, $(LIB_MODULES), $(eval $m: $m-libs))
+$(foreach m, $(LAUNCHER_MODULES), $(eval $m: $m-launchers))
+$(foreach m, $(COPY_MODULES), $(eval $m: $m-copy))
+
+ALL_MODULE_TARGETS := $(sort $(GENSRC_MODULES) $(JAVA_MODULES) \
+    $(GENDATA_MODULES) $(LIB_MODULES) $(LAUNCHER_MODULES) $(COPY_MODULES))
+
+exploded-image: $(ALL_MODULE_TARGETS) modules-xml
+
+jars: main-jars nashorn-jar security-jars policy-jars
+
+# Make each profile name a target that depends on it's images target.
+$(foreach p, $(ALL_PROFILES), $(eval $(p): $(p)-images $(p)-jars))
+
+profiles: $(ALL_PROFILES)
+
+docs: docs-javadoc docs-jvmtidoc
+
+ALL_TARGETS += gensrc gendata copy java rmic libs launchers \
+    $(ALL_MODULE_TARGETS) exploded-image jars \
+    $(ALL_PROFILES) profiles docs
+
+################################################################################
+
+all: images docs verify-modules
+default: exploded-image
+
+ALL_TARGETS += default all
+
+################################################################################
+################################################################################
+#
+# Clean targets
+#
+################################################################################
+
+# If running a clean target, disable parallel execution
+ifneq ($(findstring clean, $(MAKECMDGOALS)), )
+  .NOTPARALLEL:
+endif
+
+CLEAN_COMPONENTS += langtools corba hotspot jdk nashorn images \
+    bootcycle-build docs docstemp test
+CLEAN_TARGETS := $(addprefix clean-, $(CLEAN_COMPONENTS))
 
 # Remove everything, except the output from configure.
-clean: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-overlay-images clean-bootcycle-build clean-docs clean-test
-	@($(CD) $(OUTPUT_ROOT) && $(RM) -r tmp source_tips build.log* build-trace*.log*)
-	@$(ECHO) Cleaned all build artifacts.
+clean: $(CLEAN_TARGETS)
+	($(CD) $(OUTPUT_ROOT) && $(RM) -r tmp source_tips build.log* build-trace*.log*)
+	$(ECHO) Cleaned all build artifacts.
+
+$(CLEAN_TARGETS):
+	$(call CleanComponent,$(patsubst clean-%, %, $@))
+
+clean-docs: clean-docstemp
 
 # Remove everything, including configure configuration.
 # If the output directory was created by configure and now becomes empty, remove it as well.
-# FIXME: tmp should not be here, fix ResetTimers instead. And remove spec.sh!
 dist-clean: clean
-	@($(CD) $(OUTPUT_ROOT) && $(RM) -r *spec.gmk config.* configure-arguments Makefile compare.sh spec.sh tmp javacservers)
-	@$(if $(filter $(CONF_NAME),$(notdir $(OUTPUT_ROOT))), \
+	($(CD) $(OUTPUT_ROOT) && $(RM) -r *spec.gmk config.* configure-arguments \
+	    Makefile compare.sh spec.sh tmp javacservers)
+	$(if $(filter $(CONF_NAME),$(notdir $(OUTPUT_ROOT))), \
 	  if test "x`$(LS) $(OUTPUT_ROOT)`" != x; then \
 	    $(ECHO) "Warning: Not removing non-empty configuration directory for '$(CONF_NAME)'" ; \
 	  else \
-	    ($(CD) $(SRC_ROOT) && $(ECHO) "Removing configuration directory for '$(CONF_NAME)'" && $(RM) -r $(OUTPUT_ROOT)) \
+	    ($(CD) $(SRC_ROOT) && $(ECHO) "Removing configuration directory for '$(CONF_NAME)'" \
+	        && $(RM) -r $(OUTPUT_ROOT)) \
 	  fi \
 	)
-	@$(ECHO) Cleaned everything, you will have to re-run configure.
+	$(ECHO) Cleaned everything, you will have to re-run configure.
+
+ALL_TARGETS += clean dist-clean $(CLEAN_TARGETS)
+
+################################################################################
+
+# Setup a rule for SPEC file that fails if executed. This check makes sure the 
+# configuration is up to date after changes to configure. 
+ifeq ($(findstring reconfigure, $(MAKECMDGOALS)), )
+  $(SPEC): $(wildcard $(SRC_ROOT)/common/autoconf/*)
+	@$(ECHO) "ERROR: $(SPEC) is not up to date."
+	@$(ECHO) "Please rerun configure! Easiest way to do this is by running"
+	@$(ECHO) "'make reconfigure'."
+	@$(ECHO) "It may also be ignored by setting IGNORE_OLD_CONFIG=true"
+	@if test "x$(IGNORE_OLD_CONFIG)" != "xtrue"; then exit 1; fi
+endif
 
-clean-langtools:
-	$(call CleanComponent,langtools)
-clean-corba:
-	$(call CleanComponent,corba)
-clean-jaxp:
-	$(call CleanComponent,jaxp)
-clean-jaxws:
-	$(call CleanComponent,jaxws)
-clean-hotspot:
-	$(call CleanComponent,hotspot)
-clean-jdk:
-	$(call CleanComponent,jdk)
-clean-nashorn:
-	$(call CleanComponent,nashorn)
-clean-images:
-	$(call CleanComponent,images)
-clean-overlay-images:
-	$(call CleanComponent,overlay-images)
-clean-bootcycle-build:
-	$(call CleanComponent,bootcycle-build)
-clean-docs:
-	$(call CleanComponent,docs)
-	$(call CleanComponent,docstemp)
-clean-test:
-	$(call CleanComponent,testoutput)
-	
 reconfigure:
         ifneq ($(CONFIGURE_COMMAND_LINE), )
 	  @$(ECHO) "Re-running configure using arguments '$(CONFIGURE_COMMAND_LINE)'"
@@ -245,12 +542,18 @@ reconfigure:
         endif
 	@( cd $(OUTPUT_ROOT) && $(BASH) $(TOPDIR)/configure $(CONFIGURE_COMMAND_LINE) )
 
-.PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install test docs
-.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only test-only docs-only
-.PHONY: default all clean dist-clean bootcycle-images start-make
-.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-docs clean-test clean-overlay-images clean-bootcycle-build
-.PHONY: profiles profiles-only profiles-oscheck
+ALL_TARGETS += reconfigure
 
-include $(root_dir)/make/Jprt.gmk
+################################################################################
+# Declare *-only targets for each normal target
+$(foreach t, $(ALL_TARGETS), $(eval $(t)-only: $(t)))
+
+ALL_TARGETS += $(addsuffix -only, $(ALL_TARGETS))
+
+################################################################################
+
+.PHONY: $(ALL_TARGETS)
+
+include $(SRC_ROOT)/make/Jprt.gmk
 
 FRC: # Force target
diff --git a/make/MakeHelpers.gmk b/make/MakeHelpers.gmk
index c999535555e..19a4634d908 100644
--- a/make/MakeHelpers.gmk
+++ b/make/MakeHelpers.gmk
@@ -40,7 +40,7 @@ _MAKEHELPERS_GMK := 1
 
 # Find out which variables were passed explicitely on the make command line. These
 # will be passed on to sub-makes, overriding spec.gmk settings.
-MAKE_ARGS=$(foreach var,$(subst =command,,$(filter %=command,$(foreach var,$(.VARIABLES),$(var)=$(firstword $(origin $(var)))))),$(var)=$($(var)))
+MAKE_ARGS=$(foreach var,$(subst =command,,$(filter %=command,$(foreach var,$(.VARIABLES),$(var)=$(firstword $(origin $(var)))))),$(var)="$($(var))")
 
 list_alt_overrides_with_origins=$(filter ALT_%=environment ALT_%=command,$(foreach var,$(.VARIABLES),$(var)=$(firstword $(origin $(var)))))
 list_alt_overrides=$(subst =command,,$(subst =environment,,$(list_alt_overrides_with_origins)))
@@ -112,7 +112,8 @@ endef
 
 # Do not indent this function, this will add whitespace at the start which the caller won't handle
 define GetRealTarget
-$(strip $(if $(MAKECMDGOALS),$(MAKECMDGOALS),default))
+$(strip $(if $(findstring main-wrapper, $(MAKECMDGOALS)), $(MAIN_TARGETS), \
+    $(if $(MAKECMDGOALS),$(MAKECMDGOALS),default)))
 endef
 
 # Do not indent this function, this will add whitespace at the start which the caller won't handle
@@ -131,24 +132,23 @@ endef
 
 # Hook to be called when starting to execute a top-level target
 define TargetEnter
-	$(BUILD_LOG_WRAPPER) $(PRINTF) "## Starting $(patsubst %-only,%,$@)\n"
+	$(PRINTF) "## Starting $(patsubst %-only,%,$@)\n"
 	$(call RecordStartTime,$(patsubst %-only,%,$@))
 endef
 
 # Hook to be called when finish executing a top-level target
 define TargetExit
 	$(call RecordEndTime,$(patsubst %-only,%,$@))
-	$(BUILD_LOG_WRAPPER) $(PRINTF) "## Finished $(patsubst %-only,%,$@) (build time %s)\n\n" \
+	$(PRINTF) "## Finished $(patsubst %-only,%,$@) (build time %s)\n\n" \
 	    "`$(CAT) $(BUILDTIMESDIR)/build_time_diff_$(patsubst %-only,%,$@) | $(CUT) -f 1 -d ' '`"
-	$(call CheckIfMakeAtEnd)
 endef
 
 # Hook to be called as the very first thing when running a normal build
 define AtMakeStart
 	$(if $(findstring --jobserver,$(MAKEFLAGS)),$(error make -j is not supported, use make JOBS=n))
 	$(call CheckEnvironment)
-	@$(PRINTF) $(LOG_INFO) "Running make as '$(MAKE) $(MFLAGS) $(MAKE_ARGS)'\n"
-	@$(PRINTF) "Building $(PRODUCT_NAME) for target '$(call GetRealTarget)' in configuration '$(CONF_NAME)'\n\n"
+	$(BUILD_LOG_WRAPPER) $(PRINTF) $(LOG_INFO) "Running make as '$(MAKE) $(MFLAGS) $(MAKE_ARGS)'\n"
+	$(BUILD_LOG_WRAPPER) $(PRINTF) "Building $(PRODUCT_NAME) for target '$(call GetRealTarget)' in configuration '$(CONF_NAME)'\n\n"
 	$(call StartGlobalTimer)
 endef
 
@@ -157,7 +157,7 @@ define AtMakeEnd
 	[ -f $(SJAVAC_SERVER_DIR)/server.port ] && echo Stopping sjavac server && $(TOUCH) $(SJAVAC_SERVER_DIR)/server.port.stop; true
 	$(call StopGlobalTimer)
 	$(call ReportBuildTimes)
-	@$(PRINTF) "Finished building $(PRODUCT_NAME) for target '$(call GetRealTarget)'\n"
+	@$(PRINTF) "\nFinished building $(PRODUCT_NAME) for target '$(call GetRealTarget)'\n"
 	$(call CheckEnvironment)
 endef
 
@@ -298,7 +298,7 @@ endef
 
 # Cleans the component given as $1
 define CleanComponent
-	@$(PRINTF) "Cleaning $1 build artifacts ..."
+	@$(PRINTF) "Cleaning $(strip $1) build artifacts ..."
 	@($(CD) $(OUTPUT_ROOT) && $(RM) -r $1)
 	@$(PRINTF) " done\n"
 endef
diff --git a/make/common/JavaCompilation.gmk b/make/common/JavaCompilation.gmk
index 58656a7fa32..919317f91ba 100644
--- a/make/common/JavaCompilation.gmk
+++ b/make/common/JavaCompilation.gmk
@@ -35,6 +35,9 @@
 # of removing duplicates. It is actually this side effect that is
 # desired whenever sort is used below!
 
+ifndef _JAVA_COMPILATION_GMK
+_JAVA_COMPILATION_GMK := 1
+
 ifeq (,$(_MAKEBASE_GMK))
   $(error You must include MakeBase.gmk prior to including JavaCompilation.gmk)
 endif
@@ -105,8 +108,8 @@ define SetupArchive
   # On windows, a lot of includes/excludes risk making the command line too long, so
   # writing the grep patterns to files.
   ifneq (,$$($1_INCLUDES))
-    $1_GREP_INCLUDE_PATTERNS:=$$(foreach src,$$($1_SRCS), \
-        $$(addprefix $$(src)/,$$($1_INCLUDES)))
+    $1_GREP_INCLUDE_PATTERNS:=$$(call EscapeDollar, \
+        $$(foreach src,$$($1_SRCS), $$(addprefix $$(src)/,$$($1_INCLUDES))))
     # If there are a lot of include patterns, output to file to shorten command lines
     ifeq ($$(word 20,$$($1_GREP_INCLUDE_PATTERNS)),)
       $1_GREP_INCLUDES:=| $(GREP) $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_INCLUDE_PATTERNS))
@@ -118,8 +121,9 @@ define SetupArchive
     endif
   endif
   ifneq (,$$($1_EXCLUDES)$$($1_EXCLUDE_FILES))
-    $1_GREP_EXCLUDE_PATTERNS:=$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/, \
-        $$($1_EXCLUDES) $$($1_EXCLUDE_FILES)))
+    $1_GREP_EXCLUDE_PATTERNS:=$$(call EscapeDollar, \
+        $$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/, \
+        $$($1_EXCLUDES) $$($1_EXCLUDE_FILES))))
     # If there are a lot of include patterns, output to file to shorten command lines
     ifeq ($$(word 20,$$($1_GREP_EXCLUDE_PATTERNS)),)
       $1_GREP_EXCLUDES:=| $(GREP) -v $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_EXCLUDE_PATTERNS))
@@ -154,9 +158,9 @@ define SetupArchive
     ifneq (,$$($1_GREP_EXCLUDE_PATTERNS))
       $1_DEPS:=$$(filter-out $$(addsuffix %,$$($1_GREP_EXCLUDE_PATTERNS)),$$($1_DEPS))
     endif
-    # The subst of \ is needed because $ has to be escaped with \ in EXTRA_FILES for the command
-    # lines, but not here for use in make dependencies.
-    $1_DEPS+=$$(subst \,,$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/,$$($1_EXTRA_FILES))))
+    # Look for EXTRA_FILES in all SRCS dirs and as absolute paths.
+    $1_DEPS+=$$(wildcard $$(foreach src, $$($1_SRCS), \
+        $$(addprefix $$(src)/, $$($1_EXTRA_FILES))) $$($1_EXTRA_FILES))
     ifeq (,$$($1_SKIP_METAINF))
       $1_DEPS+=$$(call CacheFind,$$(wildcard $$(addsuffix /META-INF,$$($1_SRCS))))
     endif
@@ -168,44 +172,69 @@ define SetupArchive
 
   # Utility macros, to make the shell script receipt somewhat easier to decipher.
 
+  # Capture extra files is the same for both CAPTURE_CONTENTS and SCAPTURE_CONTENTS so
+  # only define it once to avoid duplication.
+  # The list of extra files might be long, so need to use ListPathsSafely to print
+  # them out to a separte file. Then process the contents of that file to rewrite
+  # into -C   lines.
+  # The EXTRA_FILES_RESOLVED varible must be set in the macro so that it's evaluated
+  # in the recipe when the files are guaranteed to exist.
+  $1_CAPTURE_EXTRA_FILES=\
+      $(RM) $$($1_BIN)/_the.$$($1_JARNAME)_contents.extra $$(NEWLINE) \
+      $$(eval $1_EXTRA_FILES_RESOLVED:=$$(call DoubleDollar, $$(call DoubleDollar, \
+          $$(wildcard $$(foreach src, $$($1_SRCS), \
+          $$(addprefix $$(src)/, $$($1_EXTRA_FILES))) $$($1_EXTRA_FILES))))) \
+      $$(if $$($1_EXTRA_FILES_RESOLVED), \
+        $$(call ListPathsSafely,$1_EXTRA_FILES_RESOLVED,\n, \
+            >> $$($1_BIN)/_the.$$($1_JARNAME)_contents.extra) $$(NEWLINE) \
+        $(SED) $$(foreach src,$$($1_SRCS), -e 's|$$(src)/|-C $$(src) |g') \
+            $$($1_BIN)/_the.$$($1_JARNAME)_contents.extra \
+            >> $$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE))
+
   # The capture contents macro finds all files (matching the patterns, typically
   # .class and .prp) that are newer than the jar-file, ie the new content to be put into the jar.
   # NOTICE: please leave the parentheses space separated otherwise the AIX build will break!
-  $1_CAPTURE_CONTENTS=$$(foreach src,$$($1_SRCS), \
-      ( ( $(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) -a -newer $$@ $$($1_GREP_INCLUDES) \
-          $$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/||g' && \
-      $(ECHO) $$(subst $$(src)/,,$$($1_EXTRA_FILES) ) ) > \
-      $$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE) )
+  $1_CAPTURE_CONTENTS=\
+      $(RM) $$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE) \
+      $$(foreach src,$$($1_SRCS), \
+        $(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) -a -newer $$@ $$($1_GREP_INCLUDES) \
+          $$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/|-C $$(src) |g' \
+        >> $$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE)) \
+      $$($1_CAPTURE_EXTRA_FILES)
+
   # The capture metainf macro finds all files below the META-INF directory that are newer than the jar-file.
   ifeq (,$$($1_SKIP_METAINF))
-    $1_CAPTURE_METAINF =$$(foreach src,$$($1_SRCS),($(FIND) $$(src)/META-INF -type f -a -newer $$@ 2> /dev/null | $(SED) 's|$$(src)/||g' >> $$(src)/_the.$$($1_JARNAME)_contents ) $$(NEWLINE))
+    $1_CAPTURE_METAINF =$$(foreach src,$$($1_SRCS), \
+        ( $(FIND) $$(src)/META-INF -type f -a -newer $$@ 2> /dev/null | $(SED) 's|$$(src)/|-C $$(src) |g' >> \
+        $$($1_BIN)/_the.$$($1_JARNAME)_contents ) $$(NEWLINE) )
   endif
   # The capture deletes macro finds all deleted files and concatenates them. The resulting file
   # tells us what to remove from the jar-file.
-  $1_CAPTURE_DELETES=$$(foreach src,$$($1_SRCS),($(FIND) $$(src) -name _the.package.deleted -newer $$@ -exec $(SED) 's|$$(src)||g' \{\} >> $$($1_DELETES_FILE) \;) $$(NEWLINE))
+  $1_CAPTURE_DELETES=$$(foreach src,$$($1_SRCS),($(FIND) $$(src) -name _the.package.deleted -newer $$@ \
+      -exec $(SED) 's|$$(src)||g' \{\} >> $$($1_DELETES_FILE) \;) $$(NEWLINE))
   # The update contents macro updates the jar file with the previously capture contents.
   # Use 'wc -w' to see if the contents file is empty.
-  $1_UPDATE_CONTENTS=$$(foreach src,$$($1_SRCS), \
-      (cd $$(src) && \
-       if [ "`$(WC) -w _the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'`" -gt "0" ]; then \
-         $(ECHO) "  updating" `$(WC) -l _the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'` files && \
-         $(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @_the.$$($1_JARNAME)_contents; \
-       fi) $$(NEWLINE))
+  $1_UPDATE_CONTENTS=\
+      if [ "`$(WC) -l $$($1_BIN)/_the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'`" -gt "0" ]; then \
+        $(ECHO) "  updating" `$(WC) -l $$($1_BIN)/_the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'` files && \
+        $(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @$$($1_BIN)/_the.$$($1_JARNAME)_contents; \
+      fi $$(NEWLINE)
   # The s-variants of the above macros are used when the jar is created from scratch.
   # NOTICE: please leave the parentheses space separated otherwise the AIX build will break!
-  $1_SCAPTURE_CONTENTS=$$(foreach src,$$($1_SRCS), \
-      ( ( $(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) $$($1_GREP_INCLUDES) \
-          $$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/||g' && \
-      $$(subst $$(src)/,,$(ECHO) $$($1_EXTRA_FILES) ) ) > \
-      $$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE) )
+  $1_SCAPTURE_CONTENTS=\
+      $(RM) $$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE) \
+      $$(foreach src,$$($1_SRCS), \
+        $(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) $$($1_GREP_INCLUDES) \
+            $$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/|-C $$(src) |g' \
+            >> $$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE)) \
+      $$($1_CAPTURE_EXTRA_FILES)
 
   ifeq (,$$($1_SKIP_METAINF))
     $1_SCAPTURE_METAINF=$$(foreach src,$$($1_SRCS), \
-        ($(FIND) $$(src)/META-INF -type f 2> /dev/null | $(SED) 's|$$(src)/||g' >> \
-        $$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
+        ( $(FIND) $$(src)/META-INF -type f 2> /dev/null | $(SED) 's|$$(src)/|-C $$(src) |g' >> \
+        $$($1_BIN)/_the.$$($1_JARNAME)_contents) $$(NEWLINE) )
   endif
-  $1_SUPDATE_CONTENTS=$$(foreach src,$$($1_SRCS), \
-      (cd $$(src) && $(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @$$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
+  $1_SUPDATE_CONTENTS=$(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @$$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE)
 
   # Use a slightly shorter name for logging, but with enough path to identify this jar.
   $1_NAME:=$$(subst $$(OUTPUT_ROOT)/,,$$($1_JAR))
@@ -327,14 +356,19 @@ define add_file_to_copy
   $2_TARGET:=$2
   # Remove the source prefix.
   $$(foreach i,$$($1_SRC),$$(eval $$(call remove_string,$$i,$2_TARGET)))
-  # Now we can setup the depency that will trigger the copying.
-  $$($1_BIN)$$($2_TARGET) : $2
+  # To allow for automatic overrides, do not create a rule for a target file that
+  # already has one
+  ifeq ($$(findstring $$($2_TARGET), $$($1_COPY_LIST)), )
+    $1_COPY_LIST += $$($2_TARGET)
+    # Now we can setup the depency that will trigger the copying.
+    $$($1_BIN)$$($2_TARGET) : $2
 	$(MKDIR) -p $$(@D)
 	$(CP) $$< $$@
 	$(CHMOD) -f ug+w $$@
 
-  # And do not forget this target
-  $1_ALL_COPY_TARGETS += $$($1_BIN)$$($2_TARGET)
+    # And do not forget this target
+    $1_ALL_COPY_TARGETS += $$($1_BIN)$$($2_TARGET)
+  endif
 endef
 
 
@@ -431,8 +465,9 @@ define SetupJavaCompilation
   # Add all source roots to the find cache since we are likely going to run find 
   # on these more than once. The cache will only be updated if necessary.
   $$(eval $$(call FillCacheFind,$$($1_SRC)))
-  # Find all files in the source trees.
-  $1_ALL_SRCS += $$(filter-out $(OVR_SRCS),$$(call CacheFind,$$($1_SRC)))
+  # Find all files in the source trees. Preserve order of source roots for overrides to
+  # work correctly. CacheFind does not preserve order so need to call it for each root.
+  $1_ALL_SRCS += $$(filter-out $(OVR_SRCS),$$(foreach s,$$($1_SRC),$$(call CacheFind,$$(s))))
   # Extract the java files.
   ifneq ($$($1_EXCLUDE_FILES),)
     $1_EXCLUDE_FILES_PATTERN:=$$(addprefix %,$$($1_EXCLUDE_FILES))
@@ -462,10 +497,12 @@ define SetupJavaCompilation
     $1_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_SRCS))
   endif
 
+  # All files below META-INF are always copied.
+  $1_ALL_COPIES := $$(filter $$(addsuffix /META-INF%,$$($1_SRC)),$$($1_ALL_SRCS))
   # Find all files to be copied from source to bin.
   ifneq (,$$($1_COPY)$$($1_COPY_FILES))
     # Search for all files to be copied.
-    $1_ALL_COPIES := $$(filter $$(addprefix %,$$($1_COPY)),$$($1_ALL_SRCS))
+    $1_ALL_COPIES += $$(filter $$(addprefix %,$$($1_COPY)),$$($1_ALL_SRCS))
     # Copy these explicitly
     $1_ALL_COPIES += $$($1_COPY_FILES)
     # Copy must also respect filters.
@@ -479,14 +516,12 @@ define SetupJavaCompilation
       $1_ALL_COPIES := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$($1_ALL_COPIES))
     endif
   endif
-  # All files below META-INF are always copied.
-  $1_ALL_COPIES += $$(filter $$(addsuffix /META-INF%,$$($1_SRC)),$$($1_ALL_SRCS))
-  ifneq (,$$($1_ALL_COPIES))
-    # Yep, there are files to be copied!
-    $1_ALL_COPY_TARGETS:=
-        $$(foreach i,$$($1_ALL_COPIES),$$(eval $$(call add_file_to_copy,$1,$$i)))
-    # Now we can depend on $$($1_ALL_COPY_TARGETS) to copy all files!
-  endif
+    ifneq (,$$($1_ALL_COPIES))
+      # Yep, there are files to be copied!
+      $1_ALL_COPY_TARGETS:=
+          $$(foreach i,$$($1_ALL_COPIES),$$(eval $$(call add_file_to_copy,$1,$$i)))
+      # Now we can depend on $$($1_ALL_COPY_TARGETS) to copy all files!
+    endif
 
   # Find all property files to be copied and cleaned from source to bin.
   ifneq (,$$($1_CLEAN)$$($1_CLEAN_FILES))
@@ -529,7 +564,7 @@ define SetupJavaCompilation
     endif
 
     # Using sjavac to compile.
-    $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/javac_state
+    $1_COMPILE_TARGETS := $$($1_BIN)/javac_state
 
     # Create SJAVAC variable form JAVAC variable. Expects $1_JAVAC to be
     # "bootclasspathprepend -cp .../javac.jar com.sun.tools.javac.Main"
@@ -545,7 +580,7 @@ define SetupJavaCompilation
 	$(ECHO) Compiling $1
 	($$($1_JVM) $$($1_SJAVAC) \
 	    $$($1_REMOTE) \
-	    -j $(JOBS) \
+	    -j 1 \
 	    --permit-unidentified-artifacts \
 	    --permit-sources-without-package \
 	    --compare-found-sources $$($1_BIN)/_the.$1_batch.tmp \
@@ -555,9 +590,11 @@ define SetupJavaCompilation
 	    $$($1_HEADERS_ARG) \
 	    -d $$($1_BIN) && \
 	$(MV) $$($1_BIN)/_the.$1_batch.tmp $$($1_BIN)/_the.$1_batch)
+        # sjavac doesn't touch this if nothing has changed
+	$(TOUCH) $$@
   else
     # Using plain javac to batch compile everything.
-    $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/_the.$1_batch
+    $1_COMPILE_TARGETS := $$($1_BIN)/_the.$1_batch
 
     # When building in batch, put headers in a temp dir to filter out those that actually
     # changed before copying them to the real header dir.
@@ -566,15 +603,18 @@ define SetupJavaCompilation
 
       $$($1_HEADERS)/_the.$1_headers: $$($1_BIN)/_the.$1_batch
 		$(MKDIR) -p $$(@D)
-		for f in `ls $$($1_HEADERS).$1.tmp`; do \
-		  if [ ! -f "$$($1_HEADERS)/$$$$f" ] || [ "`$(DIFF) $$($1_HEADERS)/$$$$f $$($1_HEADERS).$1.tmp/$$$$f`" != "" ]; then \
+		if [ -d "$$($1_HEADERS).$1.tmp" ]; then \
+		  for f in `ls $$($1_HEADERS).$1.tmp`; do \
+		    if [ ! -f "$$($1_HEADERS)/$$$$f" ] \
+		        || [ "`$(DIFF) $$($1_HEADERS)/$$$$f $$($1_HEADERS).$1.tmp/$$$$f`" != "" ]; then \
 		    $(CP) -f $$($1_HEADERS).$1.tmp/$$$$f $$($1_HEADERS)/$$$$f; \
 		  fi; \
-		done
+		  done; \
+		fi
 		$(RM) -r $$($1_HEADERS).$1.tmp
 		$(TOUCH) $$@
 
-      $1 += $$($1_HEADERS)/_the.$1_headers
+      $1_HEADER_TARGETS := $$($1_HEADERS)/_the.$1_headers
     endif
 
     # When not using sjavac, pass along all sources to javac using an @file.
@@ -590,6 +630,10 @@ define SetupJavaCompilation
 
   endif
 
+  # Add all targets to main variable
+  $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_COMPILE_TARGETS) \
+      $$($1_HEADER_TARGETS)
+
   # Check if a jar file was specified, then setup the rules for the jar.
   ifneq (,$$($1_JAR))
     # If no suffixes was explicitly set for this jar file.
@@ -630,3 +674,14 @@ define SetupJavaCompilation
     $1 += $$($1_SRCZIP)
   endif
 endef
+
+# Use this macro to find the correct target to depend on when the original
+# SetupJavaCompilation is declared in a different makefile, to avoid having
+# to declare and evaluate it again.
+# param 1 is for example BUILD_MYPACKAGE
+# param 2 is the output directory (BIN)
+define SetupJavaCompilationCompileTarget
+  $(if $(findsring yes, $(ENABLE_SJAVAC)), $(strip $2)/javac_state, \
+      $(strip $2)/_the.$(strip $1)_batch)
+endef
+endif
diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk
index 866b3b36957..8c987609efa 100644
--- a/make/common/MakeBase.gmk
+++ b/make/common/MakeBase.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,18 @@
 ifndef _MAKEBASE_GMK
 _MAKEBASE_GMK := 1
 
+################################################################################
+# This macro translates $ into \$ to protect the $ from expansion in the shell.
+# To make this macro resilient against already escaped strings, first remove
+# any present escapes before escaping so that no double escapes are added.
+EscapeDollar = $(subst $$,\$$,$(subst \$$,$$,$(strip $1)))
+
+################################################################################
+# This macro translates $ into $$ to protect the string from make itself.
+DoubleDollar = $(subst $$,$$$$,$(strip $1))
+
+################################################################################
+
 # If the variable that you want to send to stdout for piping into a file or otherwise,
 # is potentially long, for example the a list of file paths, eg a list of all package directories.
 # Then you need to use ListPathsSafely, which optimistically splits the output into several shell
@@ -57,7 +69,7 @@ endef
 
 define ListPathsSafely_Printf
 	$(if $(strip $($1_LPS$4)),$(if $(findstring $(LOG_LEVEL),trace),,@)printf \
-	    -- "$(strip $($1_LPS$4))\n" | $(decompress_paths) $3)
+	    -- "$(strip $(call EscapeDollar, $($1_LPS$4)))\n" | $(decompress_paths) $3)
 endef
 
 # Receipt example:
@@ -410,15 +422,19 @@ else ifeq ($(OPENJDK_TARGET_OS),macosx)
 	if [ -n "`$(XATTR) -l '$@'`" ]; then $(XATTR) -c '$@'; fi
   endef
 else
+  # Running mkdir and cp in the same shell speeds up copy intensive tasks in Cygwin
+  # significantly.
   define install-file
-	$(MKDIR) -p $(@D)
-	$(CP) -fP '$<' '$@'
+	$(MKDIR) -p $(@D) && $(CP) -fP '$<' '$@'
   endef
 endif
 
 # Convenience functions for working around make's limitations with $(filter ).
-containing = $(foreach v,$2,$(if $(findstring $1,$v),$v))
-not-containing = $(foreach v,$2,$(if $(findstring $1,$v),,$v))
+containing = $(strip $(foreach v,$(strip $2),$(if $(findstring $(strip $1),$v),$v)))
+not-containing = $(strip $(foreach v,$(strip $2),$(if $(findstring $(strip $1),$v),,$v)))
+
+# Filter out duplicate sub strings while preserving order. Keeps the first occurance.
+uniq = $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1)))
 
 ifneq ($(DISABLE_CACHE_FIND), true)
   ################################################################################
@@ -457,6 +473,8 @@ ifneq ($(DISABLE_CACHE_FIND), true)
   # Otherwise reverts to shell find. This is safe to call on all platforms, even if
   # cache is deactivated.
   #
+  # $1 can be either a directory or a file. If it's a directory, make
+  # sure we have exactly one trailing slash before the wildcard.
   # The extra - is needed when FIND_CACHE_DIRS is empty but should be harmless.
   #
   # Param 1 - Dirs to find in
@@ -464,8 +482,9 @@ ifneq ($(DISABLE_CACHE_FIND), true)
   define CacheFind
     $(if $(filter-out $(addsuffix /%,- $(FIND_CACHE_DIRS)) $(FIND_CACHE_DIRS),$1), \
     $(shell $(FIND) $1 \( -type f -o -type l \) $2), \
-    $(filter $(addsuffix %,$1),$(FIND_CACHE)))
+    $(filter $(addsuffix /%,$(patsubst %/,%,$1)) $1,$(FIND_CACHE)))
   endef
+
 else
   # If CacheFind is disabled, just run the find command.
   # Param 1 - Dirs to find in
@@ -477,4 +496,110 @@ endif
 
 ################################################################################
 
+define AddFileToCopy
+  # Helper macro for SetupCopyFiles
+  # 1 : Source file
+  # 2 : Dest file
+  # 3 : Variable to add targets to
+  # 4 : Macro to call for copy operation
+
+  $2: $1
+	$(ECHO) $(LOG_INFO) Copying $$(patsubst $(OUTPUT_ROOT)/%,%,$$@)
+	$$($$(strip $4))
+
+  $3 += $2
+endef
+
+define SetupCopyFiles
+  # param 1 is for example COPY_MYFILES
+  # param 2,3,4,5 are named args.
+  #   SRC   : Source root dir
+  #   DEST  : Dest root dir
+  #   FILES : List of files to copy with absolute paths, or path relative to SRC. Must be in SRC.
+  #   FLATTEN : Set to flatten the directory structure in the DEST dir.
+  #   MACRO : Optionally override the default macro used for making the copy. Default is 'install-file'
+  $(foreach i,2 3 4 5 6, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
+  $(call LogSetupMacroEntry,SetupCopyFiles($1),$2,$3,$4,$5,$6)
+  $(if $(7),$(error Internal makefile error: Too many arguments to SetupCopyFiles))
+
+  ifeq ($$($1_MACRO), )
+    $1_MACRO := install-file
+  endif
+
+  $$(foreach f, $$(patsubst $$($1_SRC)/%,%,$$($1_FILES)), \
+      $$(eval $$(call AddFileToCopy, $$($1_SRC)/$$f, \
+      $$($1_DEST)/$$(if $$($1_FLATTEN),$$(notdir $$f),$$f), $1, $$($1_MACRO))))
+
+endef
+
+################################################################################
+# Module list macros
+
+ALL_TOP_SRC_DIRS := \
+    $(JDK_TOPDIR)/src \
+    $(LANGTOOLS_TOPDIR)/src \
+    $(CORBA_TOPDIR)/src \
+    $(JAXP_TOPDIR)/src \
+    $(JAXWS_TOPDIR)/src \
+    $(NASHORN_TOPDIR)/src \
+    #
+
+# There are snmp classes in the open but they are not included in OpenJDK
+JAVA_MODULES_FILTER := jdk.snmp
+
+# Find all modules with java sources by looking in the source dirs
+define FindJavaModules
+  $(filter-out $(JAVA_MODULES_FILTER), $(sort $(notdir \
+      $(patsubst %/,%, $(dir $(patsubst %/,%, $(dir $(patsubst %/,%, $(dir \
+      $(wildcard $(patsubst %,%/*/share/classes/*, $(ALL_TOP_SRC_DIRS)) \
+          $(patsubst %,%/*/$(OPENJDK_TARGET_OS_API_DIR)/classes/*, $(ALL_TOP_SRC_DIRS)) \
+          $(patsubst %,%/*/$(OPENJDK_TARGET_OS)/classes/*, $(ALL_TOP_SRC_DIRS))))))))))))
+endef
+
+MODULES_LIST_FILE := $(SRC_ROOT)/make/common/modules.list
+
+# Param 1: Module to find deps for
+define FindDepsForModule
+  $(if $(filter-out java.base, $1), java.base $(filter-out jdk.scripting.nashorn, $(filter-out java.base, $(wordlist 2, 100, $(shell $(GREP) '^$(strip $1):' $(MODULES_LIST_FILE))))))
+endef
+
+# Find all modules with source for the target platform.
+define FindAllModules
+  $(sort $(filter-out closed demo sample, $(notdir $(patsubst %/,%, $(dir \
+      $(wildcard $(patsubst %, %/*/share, $(ALL_TOP_SRC_DIRS)) \
+      $(patsubst %, %/*/$(OPENJDK_TARGET_OS), $(ALL_TOP_SRC_DIRS)) \
+      $(patsubst %, %/*/$(OPENJDK_TARGET_OS_API_DIR), $(ALL_TOP_SRC_DIRS))))))))
+endef
+
+################################################################################
+
+MAKE_DIR_LIST := $(JDK_TOPDIR)/make
+
+# Find all modules that has a makefile for a certain build phase
+# Param 1: Make subdir to look in
+# Param 2: File prefix to look for
+FindModulesWithMakefileFor = $(sort $(foreach d, $(MAKE_DIR_LIST), \
+    $(patsubst $d/$(strip $1)/$(strip $2)-%.gmk,%, \
+    $(wildcard $d/$(strip $1)/$(strip $2)-*.gmk))))
+
+# Declare a recipe for calling such a makefile
+# Param 1: Module name
+# Param 2: Suffix for rule
+# Param 3: Make subdir
+# Param 4: Makefile prefix
+define DeclareRecipeForModuleMakefile
+  $$(strip $1)-$$(strip $2):
+	+($(CD) $$(dir $$(firstword $$(wildcard $$(addsuffix /$$(strip $3)/$$(strip $4)-$$(strip $1).gmk, \
+	        $(MAKE_DIR_LIST))))) \
+	    && $(MAKE) $(MAKE_ARGS) \
+	    -f $$(strip $4)-$$(strip $1).gmk \
+	    $$(addprefix -I, $$(wildcard $(MAKE_DIR_LIST) \
+	        $$(addsuffix /$$(strip $3), $(MAKE_DIR_LIST)))))
+endef
+
+################################################################################
+
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, , common/MakeBase.gmk))
+
 endif # _MAKEBASE_GMK
diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
index 1b513ad7ce2..de5d630c82a 100644
--- a/make/common/NativeCompilation.gmk
+++ b/make/common/NativeCompilation.gmk
@@ -27,6 +27,9 @@
 # of removing duplicates. It is actually this side effect that is
 # desired whenever sort is used below!
 
+ifndef _NATIVE_COMPILATION_GMK
+_NATIVE_COMPILATION_GMK := 1
+
 ifeq (,$(_MAKEBASE_GMK))
   $(error You must include MakeBase.gmk prior to including NativeCompilation.gmk)
 endif
@@ -284,7 +287,8 @@ define SetupNativeCompilation
     $1_SRCS := $$(filter $$($1_SRC_INCLUDES),$$($1_SRCS))
   endif
   ifneq ($$($1_EXCLUDES),)
-    $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
+    $1_SRC_EXCLUDES := $$(addsuffix /%,$$($1_EXCLUDES))
+    $1_SRC_EXCLUDES += $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
     $1_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_SRCS))
   endif
 
@@ -549,3 +553,5 @@ define SetupNativeCompilation
 
   endif
 endef
+
+endif # _NATIVE_COMPILATION_GMK
diff --git a/jdk/make/Setup.gmk b/make/common/SetupJava.gmk
similarity index 79%
rename from jdk/make/Setup.gmk
rename to make/common/SetupJava.gmk
index c4f204cf6af..6c3cb0b119e 100644
--- a/jdk/make/Setup.gmk
+++ b/make/common/SetupJava.gmk
@@ -23,6 +23,11 @@
 # questions.
 #
 
+ifndef _SETUP_GMK
+_SETUP_GMK := 1
+
+include JavaCompilation.gmk
+
 DISABLE_WARNINGS := -Xlint:all,-deprecation,-unchecked,-rawtypes,-cast,-serial,-dep-ann,-static,-fallthrough,-try,-varargs,-empty,-finally
 
 # To build with all warnings enabled, do the following:
@@ -49,12 +54,26 @@ $(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE, \
 $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE, \
     JVM := $(JAVA), \
     JAVAC := $(NEW_JAVAC), \
-    FLAGS := -bootclasspath $(JDK_OUTPUTDIR)/classes -source 8 -target 8 \
+    FLAGS := -source 9 -target 9 \
         -encoding ascii -XDignore.symbol.file=true $(JAVAC_WARNINGS) \
         $(GENERATE_JDKBYTECODE_EXTRA_FLAGS), \
     SERVER_DIR := $(SJAVAC_SERVER_DIR), \
     SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
 
+# The generate new bytecode javac setup uses the new compiler to compile for the
+# new jdk. This new bytecode might only be possible to run using the new jvm.
+$(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE_NOWARNINGS, \
+    JVM := $(JAVA), \
+    JAVAC := $(NEW_JAVAC), \
+    FLAGS := -source 9 -target 9 \
+        -encoding ascii -XDignore.symbol.file=true $(DISABLE_WARNINGS) \
+        $(GENERATE_JDKBYTECODE_EXTRA_FLAGS), \
+    SERVER_DIR := $(SJAVAC_SERVER_DIR), \
+    SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
+
+JDK_BOOTCLASSPATH := $(subst $(SPACE),$(PATH_SEP),\
+    $(filter-out $(JDK_OUTPUTDIR)/modules/_%, $(wildcard $(JDK_OUTPUTDIR)/modules/*)))
+
 # After the jdk is built, we want to build demos using only the recently
 # generated jdk classes and nothing else, no jdk source, etc etc.
 # I.e. the rt.jar, but since rt.jar has not yet been generated
@@ -62,6 +81,8 @@ $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE, \
 $(eval $(call SetupJavaCompiler,GENERATE_USINGJDKBYTECODE, \
     JVM := $(JAVA_SMALL), \
     JAVAC := $(NEW_JAVAC), \
-    FLAGS := -bootclasspath $(JDK_OUTPUTDIR)/classes $(DISABLE_WARNINGS), \
+    FLAGS := -bootclasspath "$(JDK_BOOTCLASSPATH)" $(DISABLE_WARNINGS), \
     SERVER_DIR := $(SJAVAC_SERVER_DIR), \
     SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
+
+endif # _SETUP_GMK
diff --git a/make/common/modules.list b/make/common/modules.list
new file mode 100644
index 00000000000..f2a3daa4c46
--- /dev/null
+++ b/make/common/modules.list
@@ -0,0 +1,54 @@
+java.base: 
+java.logging: java.base
+java.security.sasl: java.logging java.base
+java.naming: java.security.sasl java.base
+java.security.acl: java.base
+jdk.charsets: java.base
+java.scripting: java.base
+java.xml: java.base
+java.sql: java.xml java.logging java.base
+jdk.scripting.nashorn: java.scripting java.logging java.base
+java.rmi: java.logging java.base
+java.prefs: java.xml java.base
+java.desktop: jdk.charsets java.prefs java.xml java.logging java.base
+java.corba: java.naming java.rmi java.desktop java.logging java.base
+java.compiler: java.logging java.base
+jdk.compiler: java.compiler java.base
+jdk.javadoc: java.compiler java.xml jdk.compiler java.base
+jdk.rmic: java.corba jdk.compiler jdk.javadoc java.base
+jdk.jvmstat: java.rmi java.base
+jdk.attach: jdk.jvmstat java.base
+jdk.jcmd: jdk.jvmstat jdk.attach java.base
+jdk.jdi: jdk.attach java.base
+jdk.hotspot.agent: java.rmi java.scripting java.desktop java.base jdk.jdi
+jdk.hprof.agent: java.base
+java.management: java.naming java.rmi java.logging java.base
+jdk.jconsole: java.management jdk.jvmstat java.rmi jdk.attach java.desktop java.logging java.base
+java.activation: java.desktop java.logging java.base
+java.xml.bind: java.activation java.compiler java.xml java.desktop java.logging java.base
+jdk.xml.bind: java.activation java.compiler java.xml.bind java.xml java.desktop java.logging jdk.compiler java.base
+jdk.httpserver: java.logging java.base
+java.annotations.common: java.base
+java.xml.soap: java.activation java.xml.bind java.xml java.desktop java.logging java.base
+java.xml.ws: java.activation java.management jdk.httpserver java.rmi java.annotations.common java.xml.bind java.xml java.desktop java.logging java.xml.soap java.base
+jdk.xml.ws: jdk.xml.bind java.compiler java.rmi java.xml.ws java.xml.bind java.xml java.logging java.base
+java.sql.rowset: java.naming java.sql java.xml java.logging java.base
+java.instrument: java.base
+java.security.jgss: java.naming java.security.sasl java.logging java.base
+java.xml.crypto: java.xml java.logging java.base
+jdk.localedata: java.base
+jdk.crypto.ec: java.base
+jdk.crypto.pkcs11: jdk.crypto.ec java.base
+jdk.crypto.mscapi: java.base
+jdk.naming.rmi: java.naming java.rmi java.base
+jdk.zipfs: java.base
+jdk.naming.dns: java.naming java.base
+java.smartcardio: java.base
+jdk.dev: jdk.xml.bind jdk.xml.ws java.scripting jdk.rmic java.xml jdk.compiler java.base
+jdk.snmp: java.management java.security.acl java.logging java.base
+jdk.jdwp.agent: java.base
+jdk.security.auth: java.naming java.security.jgss java.base
+jdk.sctp: java.base
+jdk.runtime: java.desktop java.base
+jdk.jfr: java.management java.xml java.base
+jdk.deploy.osx: java.scripting java.desktop java.base
diff --git a/make/common/support/ListPathsSafely-pre-compress.incl b/make/common/support/ListPathsSafely-pre-compress.incl
index 7230c6cc737..af46a597d9e 100644
--- a/make/common/support/ListPathsSafely-pre-compress.incl
+++ b/make/common/support/ListPathsSafely-pre-compress.incl
@@ -1 +1 @@
-$(subst com,X01,$(subst org,X02,$(subst sun,X03,$(subst java,X04,$(subst javax,X05,$(subst sun/io,X06,$(subst com/sun,X07,$(subst java/io,X08,$(subst org/omg,X09,$(subst org/w3c,X10,$(subst org/xml,X11,$(subst sun/awt,X12,$(subst sun/net,X13,$(subst sun/nio,X14,$(subst sun/rmi,X15,$(subst java/awt,X16,$(subst java/net,X17,$(subst java/nio,X18,$(subst java/rmi,X19,$(subst META-INF,X20,$(subst sun/font,X21,$(subst sun/misc,X22,$(subst sun/text,X23,$(subst sun/util,X24,$(subst java/lang,X25,$(subst java/math,X26,$(subst java/text,X27,$(subst java/util,X28,$(subst javax/jws,X29,$(subst javax/net,X30,$(subst javax/rmi,X31,$(subst javax/xml,X32,$(subst sun/corba,X33,$(subst sun/print,X34,$(subst sun/swing,X35,$(subst java/beans,X36,$(subst javax/lang,X37,$(subst sun/applet,X38,$(subst sun/java2d,X39,$(subst java/applet,X40,$(subst javax/print,X41,$(subst javax/sound,X42,$(subst javax/swing,X43,$(subst javax/tools,X44,$(subst jdk/classes,X45,$(subst org/relaxng,X46,$(subst sun/reflect,X47,$(subst javax/crypto,X48,$(subst javax/naming,X49,$(subst jaxp/classes,X50,$(subst sun/security,X51,$(subst corba/classes,X52,$(subst java/security,X53,$(subst javax/imageio,X54,$(subst jdk/btclasses,X55,$(subst javax/activity,X56,$(subst javax/security,X57,$(subst jdk/newclasses,X58,$(subst sun/instrument,X59,$(subst sun/management,X60,$(subst corba/btclasses,X61,$(subst jdk/democlasses,X62,$(subst javax/activation,X63,$(subst javax/annotation,X64,$(subst javax/management,X65,$(subst javax/transaction,X66,$(subst jaxws/jaf_classes,X67,$(subst langtools/classes,X68,$(subst META-INF/services,X69,$(subst jdk/newdemoclasses,X70,$(subst javax/accessibility,X71,$(subst jaxws/jaxws_classes,X72,
+$(subst share/classes,X01,$(subst internal,X02,$(subst com/sun/org,X03,$(subst java,X04,$(subst javax,X05,$(subst sun/io,X06,$(subst com/sun,X07,$(subst java/io,X08,$(subst org/omg,X09,$(subst org/w3c,X10,$(subst org/xml,X11,$(subst sun/awt,X12,$(subst sun/net,X13,$(subst sun/nio,X14,$(subst sun/rmi,X15,$(subst java/awt,X16,$(subst java/net,X17,$(subst java/nio,X18,$(subst java/rmi,X19,$(subst META-INF,X20,$(subst sun/font,X21,$(subst sun/misc,X22,$(subst sun/text,X23,$(subst sun/util,X24,$(subst java/lang,X25,$(subst java/math,X26,$(subst java/text,X27,$(subst java/util,X28,$(subst javax/jws,X29,$(subst javax/net,X30,$(subst javax/rmi,X31,$(subst javax/xml,X32,$(subst sun/corba,X33,$(subst sun/print,X34,$(subst sun/swing,X35,$(subst java/beans,X36,$(subst javax/lang,X37,$(subst sun/applet,X38,$(subst sun/java2d,X39,$(subst java/applet,X40,$(subst javax/print,X41,$(subst javax/sound,X42,$(subst javax/swing,X43,$(subst javax/tools,X44,$(subst jdk/classes,X45,$(subst org/relaxng,X46,$(subst sun/reflect,X47,$(subst javax/crypto,X48,$(subst javax/naming,X49,$(subst jaxp/classes,X50,$(subst sun/security,X51,$(subst corba/classes,X52,$(subst java/security,X53,$(subst javax/imageio,X54,$(subst jdk/btclasses,X55,$(subst javax/activity,X56,$(subst javax/security,X57,$(subst jdk/newclasses,X58,$(subst sun/instrument,X59,$(subst sun/management,X60,$(subst corba/btclasses,X61,$(subst jdk/democlasses,X62,$(subst javax/activation,X63,$(subst javax/annotation,X64,$(subst javax/management,X65,$(subst javax/transaction,X66,$(subst jaxws/jaf_classes,X67,$(subst langtools/classes,X68,$(subst META-INF/services,X69,$(subst jdk/newdemoclasses,X70,$(subst javax/accessibility,X71,$(subst jaxws/jaxws_classes,X72,
diff --git a/make/common/support/ListPathsSafely-uncompress.sed b/make/common/support/ListPathsSafely-uncompress.sed
index cd6966ce555..31478f5484d 100644
--- a/make/common/support/ListPathsSafely-uncompress.sed
+++ b/make/common/support/ListPathsSafely-uncompress.sed
@@ -1,6 +1,6 @@
-s|X01|com|g
-s|X02|org|g
-s|X03|sun|g
+s|X01|share/classes|g
+s|X02|internal|g
+s|X03|com/sun/org|g
 s|X04|java|g
 s|X05|javax|g
 s|X06|sun/io|g
diff --git a/make/jprt.properties b/make/jprt.properties
index eed8b41077d..26d24c0171f 100644
--- a/make/jprt.properties
+++ b/make/jprt.properties
@@ -79,8 +79,9 @@ jprt.jbb.options=-Djava.awt.headless=true
 # Configure args common to all builds
 # Also allows for additional, testset specific configure arguments to be set
 jprt.build.configure.args=						\
-    --with-boot-jdk=$ALT_BOOTDIR					\
-    --with-jobs=$ALT_PARALLEL_COMPILE_JOBS				\
+    --with-output-sync=recurse 						\
+    --with-boot-jdk=$ALT_BOOTDIR 					\
+    --with-jobs=$ALT_PARALLEL_COMPILE_JOBS 				\
     ${my.additional.build.configure.args.${jprt.test.set}}
 
 # i586 is often cross-compiled from 64-bit machines, so need to set target bits explicitly
diff --git a/modules.xml b/modules.xml
new file mode 100644
index 00000000000..5a84ea92825
--- /dev/null
+++ b/modules.xml
@@ -0,0 +1,1816 @@
+
+
+
+
+
+
+
+  
+    java.activation
+    java.base
+    java.desktop
+    java.logging
+    
+      javax.activation
+    
+  
+  
+    java.annotations.common
+    java.base
+    
+      javax.annotation
+    
+  
+  
+    java.base
+    
+      java.io
+    
+    
+      java.lang
+    
+    
+      java.lang.annotation
+    
+    
+      java.lang.invoke
+    
+    
+      java.lang.ref
+    
+    
+      java.lang.reflect
+    
+    
+      java.math
+    
+    
+      java.net
+    
+    
+      java.nio
+    
+    
+      java.nio.channels
+    
+    
+      java.nio.channels.spi
+    
+    
+      java.nio.charset
+    
+    
+      java.nio.charset.spi
+    
+    
+      java.nio.file
+    
+    
+      java.nio.file.attribute
+    
+    
+      java.nio.file.spi
+    
+    
+      java.security
+    
+    
+      java.security.cert
+    
+    
+      java.security.interfaces
+    
+    
+      java.security.spec
+    
+    
+      java.text
+    
+    
+      java.text.spi
+    
+    
+      java.time
+    
+    
+      java.time.chrono
+    
+    
+      java.time.format
+    
+    
+      java.time.temporal
+    
+    
+      java.time.zone
+    
+    
+      java.util
+    
+    
+      java.util.concurrent
+    
+    
+      java.util.concurrent.atomic
+    
+    
+      java.util.concurrent.locks
+    
+    
+      java.util.function
+    
+    
+      java.util.jar
+    
+    
+      java.util.regex
+    
+    
+      java.util.spi
+    
+    
+      java.util.stream
+    
+    
+      java.util.zip
+    
+    
+      javax.crypto
+    
+    
+      javax.crypto.interfaces
+    
+    
+      javax.crypto.spec
+    
+    
+      javax.net
+    
+    
+      javax.net.ssl
+    
+    
+      javax.security.auth
+    
+    
+      javax.security.auth.callback
+    
+    
+      javax.security.auth.login
+    
+    
+      javax.security.auth.spi
+    
+    
+      javax.security.auth.x500
+    
+    
+      javax.security.cert
+    
+    
+      jdk
+    
+    
+      jdk.net
+    
+    
+      com.sun.security.ntlm
+      java.security.sasl
+    
+    
+      jdk.internal.org.objectweb.asm
+      jdk.jfr
+      jdk.scripting.nashorn
+    
+    
+      jdk.internal.org.objectweb.asm.commons
+      jdk.jfr
+      jdk.scripting.nashorn
+    
+    
+      jdk.internal.org.objectweb.asm.signature
+      jdk.scripting.nashorn
+    
+    
+      jdk.internal.org.objectweb.asm.tree
+      jdk.jfr
+    
+    
+      jdk.internal.org.objectweb.asm.util
+      jdk.jfr
+      jdk.scripting.nashorn
+    
+    
+      sun.misc
+      java.corba
+      java.desktop
+      java.logging
+      java.management
+      java.naming
+      java.rmi
+      java.security.jgss
+      java.security.sasl
+      jdk.charsets
+      jdk.deploy.osx
+      jdk.dev
+      jdk.jconsole
+      jdk.jvmstat
+      jdk.runtime
+      jdk.security.auth
+    
+    
+      sun.net.dns
+      java.security.jgss
+      jdk.naming.dns
+    
+    
+      sun.net.spi.nameservice
+      jdk.naming.dns
+    
+    
+      sun.net.util
+      jdk.jconsole
+      jdk.naming.dns
+    
+    
+      sun.net.www
+      java.desktop
+      jdk.compiler
+      jdk.dev
+    
+    
+      sun.net.www.protocol.http
+      java.security.jgss
+    
+    
+      sun.nio.ch
+      java.management
+      jdk.crypto.pkcs11
+      jdk.crypto.ucrypto
+      jdk.sctp
+    
+    
+      sun.nio.cs
+      java.desktop
+      jdk.charsets
+    
+    
+      sun.reflect
+      java.corba
+      java.logging
+      java.sql
+      java.sql.rowset
+      jdk.scripting.nashorn
+    
+    
+      sun.reflect.annotation
+      jdk.compiler
+    
+    
+      sun.reflect.generics.reflectiveObjects
+      java.desktop
+    
+    
+      sun.reflect.misc
+      java.corba
+      java.desktop
+      java.management
+      java.rmi
+      java.sql.rowset
+      java.xml
+    
+    
+      sun.security.action
+      java.desktop
+      java.security.jgss
+      jdk.crypto.ec
+      jdk.crypto.pkcs11
+      jdk.crypto.ucrypto
+    
+    
+      sun.security.internal.interfaces
+      jdk.crypto.pkcs11
+    
+    
+      sun.security.internal.spec
+      jdk.crypto.pkcs11
+      jdk.crypto.ucrypto
+    
+    
+      sun.security.jca
+      java.smartcardio
+      java.xml.crypto
+      jdk.crypto.ec
+      jdk.crypto.pkcs11
+      jdk.naming.dns
+    
+    
+      sun.security.pkcs
+      jdk.crypto.ec
+      jdk.deploy.osx
+      jdk.dev
+    
+    
+      sun.security.provider
+      java.rmi
+      java.security.jgss
+      jdk.crypto.pkcs11
+      jdk.runtime
+      jdk.security.auth
+    
+    
+      sun.security.provider.certpath
+      java.naming
+    
+    
+      sun.security.rsa
+      jdk.crypto.mscapi
+      jdk.crypto.pkcs11
+    
+    
+      sun.security.ssl
+      java.security.jgss
+    
+    
+      sun.security.tools
+      jdk.dev
+    
+    
+      sun.security.util
+      java.desktop
+      java.naming
+      java.rmi
+      java.security.jgss
+      java.smartcardio
+      jdk.crypto.ec
+      jdk.crypto.mscapi
+      jdk.crypto.pkcs11
+      jdk.crypto.ucrypto
+      jdk.deploy.osx
+      jdk.dev
+      jdk.runtime
+      jdk.security.auth
+    
+    
+      sun.security.x509
+      java.naming
+      jdk.crypto.ec
+      jdk.crypto.pkcs11
+      jdk.deploy.osx
+      jdk.dev
+      jdk.security.auth
+    
+    
+      sun.text
+      java.desktop
+    
+    
+      sun.util
+      java.desktop
+    
+    
+      sun.util.locale.provider
+      java.desktop
+      jdk.localedata
+    
+    
+      sun.util.logging
+      java.desktop
+      java.logging
+      java.management
+      java.prefs
+    
+    
+      sun.util.resources
+      jdk.localedata
+    
+  
+  
+    java.compact1
+    java.base
+    java.logging
+    java.scripting
+  
+  
+    java.compact2
+    java.compact1
+    java.rmi
+    java.sql
+    java.xml
+  
+  
+    java.compact3
+    java.compact2
+    java.compiler
+    java.instrument
+    java.management
+    java.naming
+    java.prefs
+    java.security.acl
+    java.security.jgss
+    java.security.sasl
+    java.sql.rowset
+    java.xml.crypto
+  
+  
+    java.compiler
+    java.base
+    java.logging
+    
+      javax.annotation.processing
+    
+    
+      javax.lang.model
+    
+    
+      javax.lang.model.element
+    
+    
+      javax.lang.model.type
+    
+    
+      javax.lang.model.util
+    
+    
+      javax.tools
+    
+  
+  
+    java.corba
+    java.base
+    java.desktop
+    java.logging
+    java.naming
+    java.rmi
+    
+      javax.activity
+    
+    
+      javax.rmi
+    
+    
+      javax.rmi.CORBA
+    
+    
+      javax.transaction
+    
+    
+      org.omg.CORBA
+    
+    
+      org.omg.CORBA.DynAnyPackage
+    
+    
+      org.omg.CORBA.ORBPackage
+    
+    
+      org.omg.CORBA.TypeCodePackage
+    
+    
+      org.omg.CORBA.portable
+    
+    
+      org.omg.CORBA_2_3
+    
+    
+      org.omg.CORBA_2_3.portable
+    
+    
+      org.omg.CosNaming
+    
+    
+      org.omg.CosNaming.NamingContextExtPackage
+    
+    
+      org.omg.CosNaming.NamingContextPackage
+    
+    
+      org.omg.Dynamic
+    
+    
+      org.omg.DynamicAny
+    
+    
+      org.omg.DynamicAny.DynAnyFactoryPackage
+    
+    
+      org.omg.DynamicAny.DynAnyPackage
+    
+    
+      org.omg.IOP
+    
+    
+      org.omg.IOP.CodecFactoryPackage
+    
+    
+      org.omg.IOP.CodecPackage
+    
+    
+      org.omg.Messaging
+    
+    
+      org.omg.PortableInterceptor
+    
+    
+      org.omg.PortableInterceptor.ORBInitInfoPackage
+    
+    
+      org.omg.PortableServer
+    
+    
+      org.omg.PortableServer.CurrentPackage
+    
+    
+      org.omg.PortableServer.POAManagerPackage
+    
+    
+      org.omg.PortableServer.POAPackage
+    
+    
+      org.omg.PortableServer.ServantLocatorPackage
+    
+    
+      org.omg.PortableServer.portable
+    
+    
+      org.omg.SendingContext
+    
+    
+      org.omg.stub.java.rmi
+    
+    
+      com.sun.corba.se.impl.util
+      jdk.rmic
+    
+  
+  
+    java.desktop
+    java.base
+    java.logging
+    java.prefs
+    java.xml
+    jdk.charsets
+    
+      java.applet
+    
+    
+      java.awt
+    
+    
+      java.awt.color
+    
+    
+      java.awt.datatransfer
+    
+    
+      java.awt.dnd
+    
+    
+      java.awt.event
+    
+    
+      java.awt.font
+    
+    
+      java.awt.geom
+    
+    
+      java.awt.im
+    
+    
+      java.awt.im.spi
+    
+    
+      java.awt.image
+    
+    
+      java.awt.image.renderable
+    
+    
+      java.awt.print
+    
+    
+      java.beans
+    
+    
+      java.beans.beancontext
+    
+    
+      javax.accessibility
+    
+    
+      javax.imageio
+    
+    
+      javax.imageio.event
+    
+    
+      javax.imageio.metadata
+    
+    
+      javax.imageio.plugins.bmp
+    
+    
+      javax.imageio.plugins.jpeg
+    
+    
+      javax.imageio.spi
+    
+    
+      javax.imageio.stream
+    
+    
+      javax.print
+    
+    
+      javax.print.attribute
+    
+    
+      javax.print.attribute.standard
+    
+    
+      javax.print.event
+    
+    
+      javax.sound.midi
+    
+    
+      javax.sound.midi.spi
+    
+    
+      javax.sound.sampled
+    
+    
+      javax.sound.sampled.spi
+    
+    
+      javax.swing
+    
+    
+      javax.swing.border
+    
+    
+      javax.swing.colorchooser
+    
+    
+      javax.swing.event
+    
+    
+      javax.swing.filechooser
+    
+    
+      javax.swing.plaf
+    
+    
+      javax.swing.plaf.basic
+    
+    
+      javax.swing.plaf.metal
+    
+    
+      javax.swing.plaf.multi
+    
+    
+      javax.swing.plaf.nimbus
+    
+    
+      javax.swing.plaf.synth
+    
+    
+      javax.swing.table
+    
+    
+      javax.swing.text
+    
+    
+      javax.swing.text.html
+    
+    
+      javax.swing.text.html.parser
+    
+    
+      javax.swing.text.rtf
+    
+    
+      javax.swing.tree
+    
+    
+      javax.swing.undo
+    
+  
+  
+    java.instrument
+    java.base
+    
+      java.lang.instrument
+    
+  
+  
+    java.logging
+    java.base
+    
+      java.util.logging
+    
+  
+  
+    java.management
+    java.base
+    java.logging
+    java.naming
+    java.rmi
+    
+      com.sun.management
+    
+    
+      java.lang.management
+    
+    
+      javax.management
+    
+    
+      javax.management.loading
+    
+    
+      javax.management.modelmbean
+    
+    
+      javax.management.monitor
+    
+    
+      javax.management.openmbean
+    
+    
+      javax.management.relation
+    
+    
+      javax.management.remote
+    
+    
+      javax.management.remote.rmi
+    
+    
+      javax.management.timer
+    
+    
+      com.sun.jmx.defaults
+      jdk.snmp
+    
+    
+      com.sun.jmx.mbeanserver
+      jdk.snmp
+    
+    
+      sun.management
+      jdk.jconsole
+      jdk.snmp
+    
+  
+  
+    java.naming
+    java.base
+    java.security.sasl
+    
+      javax.naming
+    
+    
+      javax.naming.directory
+    
+    
+      javax.naming.event
+    
+    
+      javax.naming.ldap
+    
+    
+      javax.naming.spi
+    
+    
+      com.sun.jndi.toolkit.ctx
+      jdk.naming.dns
+    
+    
+      com.sun.jndi.toolkit.url
+      java.corba
+      jdk.naming.dns
+      jdk.naming.rmi
+    
+  
+  
+    java.prefs
+    java.base
+    java.xml
+    
+      java.util.prefs
+    
+  
+  
+    java.rmi
+    java.base
+    java.logging
+    
+      java.rmi
+    
+    
+      java.rmi.activation
+    
+    
+      java.rmi.dgc
+    
+    
+      java.rmi.registry
+    
+    
+      java.rmi.server
+    
+    
+      javax.rmi.ssl
+    
+    
+      sun.rmi.registry
+      java.management
+    
+    
+      sun.rmi.server
+      java.management
+      jdk.jconsole
+    
+    
+      sun.rmi.transport
+      java.management
+      jdk.jconsole
+    
+  
+  
+    java.scripting
+    java.base
+    
+      javax.script
+    
+  
+  
+    java.se
+    java.activation
+    java.compact3
+    java.corba
+    java.desktop
+    java.xml.bind
+    java.xml.soap
+    java.xml.ws
+  
+  
+    java.security.acl
+    java.base
+    
+      java.security.acl
+    
+  
+  
+    java.security.jgss
+    java.base
+    java.logging
+    java.naming
+    java.security.sasl
+    
+      com.sun.security.jgss
+    
+    
+      javax.security.auth.kerberos
+    
+    
+      org.ietf.jgss
+    
+    
+      sun.security.jgss.krb5
+      jdk.security.auth
+    
+    
+      sun.security.krb5
+      jdk.security.auth
+    
+    
+      sun.security.krb5.internal.ktab
+      jdk.security.auth
+    
+  
+  
+    java.security.sasl
+    java.base
+    java.logging
+    
+      javax.security.sasl
+    
+    
+      com.sun.security.sasl.util
+      java.security.jgss
+    
+  
+  
+    java.smartcardio
+    java.base
+    
+      javax.smartcardio
+    
+  
+  
+    java.sql
+    java.base
+    java.logging
+    java.xml
+    
+      java.sql
+    
+    
+      javax.sql
+    
+    
+      javax.transaction.xa
+    
+  
+  
+    java.sql.rowset
+    java.base
+    java.logging
+    java.naming
+    java.sql
+    java.xml
+    
+      javax.sql.rowset
+    
+    
+      javax.sql.rowset.serial
+    
+    
+      javax.sql.rowset.spi
+    
+  
+  
+    java.xml
+    java.base
+    
+      javax.xml
+    
+    
+      javax.xml.datatype
+    
+    
+      javax.xml.namespace
+    
+    
+      javax.xml.parsers
+    
+    
+      javax.xml.stream
+    
+    
+      javax.xml.stream.events
+    
+    
+      javax.xml.stream.util
+    
+    
+      javax.xml.transform
+    
+    
+      javax.xml.transform.dom
+    
+    
+      javax.xml.transform.sax
+    
+    
+      javax.xml.transform.stax
+    
+    
+      javax.xml.transform.stream
+    
+    
+      javax.xml.validation
+    
+    
+      javax.xml.xpath
+    
+    
+      org.w3c.dom
+    
+    
+      org.w3c.dom.bootstrap
+    
+    
+      org.w3c.dom.events
+    
+    
+      org.w3c.dom.ls
+    
+    
+      org.w3c.dom.views
+    
+    
+      org.xml.sax
+    
+    
+      org.xml.sax.ext
+    
+    
+      org.xml.sax.helpers
+    
+    
+      com.sun.org.apache.xerces.internal.dom
+      java.xml.soap
+    
+    
+      com.sun.org.apache.xerces.internal.jaxp
+      java.xml.soap
+    
+    
+      com.sun.org.apache.xerces.internal.util
+      java.xml.soap
+    
+    
+      com.sun.org.apache.xml.internal.dtm
+      java.xml.crypto
+    
+    
+      com.sun.org.apache.xml.internal.resolver
+      java.xml.ws
+      jdk.xml.bind
+    
+    
+      com.sun.org.apache.xml.internal.resolver.tools
+      java.xml.ws
+      jdk.xml.bind
+    
+    
+      com.sun.org.apache.xml.internal.utils
+      java.xml.crypto
+    
+    
+      com.sun.org.apache.xpath.internal
+      java.xml.crypto
+    
+    
+      com.sun.org.apache.xpath.internal.compiler
+      java.xml.crypto
+    
+    
+      com.sun.org.apache.xpath.internal.functions
+      java.xml.crypto
+    
+    
+      com.sun.org.apache.xpath.internal.objects
+      java.xml.crypto
+    
+    
+      com.sun.org.apache.xpath.internal.res
+      java.xml.crypto
+    
+  
+  
+    java.xml.bind
+    java.activation
+    java.base
+    java.compiler
+    java.desktop
+    java.logging
+    java.xml
+    
+      javax.xml.bind
+    
+    
+      javax.xml.bind.annotation
+    
+    
+      javax.xml.bind.annotation.adapters
+    
+    
+      javax.xml.bind.attachment
+    
+    
+      javax.xml.bind.helpers
+    
+    
+      javax.xml.bind.util
+    
+    
+      com.sun.istack.internal
+      java.xml.ws
+      jdk.xml.bind
+      jdk.xml.ws
+    
+    
+      com.sun.istack.internal.localization
+      java.xml.ws
+      jdk.xml.ws
+    
+    
+      com.sun.istack.internal.logging
+      java.xml.ws
+      jdk.xml.ws
+    
+    
+      com.sun.xml.internal.bind
+      java.xml.ws
+      jdk.xml.bind
+      jdk.xml.ws
+    
+    
+      com.sun.xml.internal.bind.annotation
+      jdk.xml.bind
+    
+    
+      com.sun.xml.internal.bind.api
+      java.xml.ws
+      jdk.xml.bind
+    
+    
+      com.sun.xml.internal.bind.api.impl
+      java.xml.ws
+      jdk.xml.bind
+    
+    
+      com.sun.xml.internal.bind.marshaller
+      java.xml.ws
+      jdk.xml.bind
+      jdk.xml.ws
+    
+    
+      com.sun.xml.internal.bind.unmarshaller
+      java.xml.ws
+      jdk.xml.bind
+      jdk.xml.ws
+    
+    
+      com.sun.xml.internal.bind.util
+      java.xml.ws
+      jdk.xml.bind
+      jdk.xml.ws
+    
+    
+      com.sun.xml.internal.bind.v2
+      java.xml.ws
+      jdk.xml.bind
+      jdk.xml.ws
+    
+    
+      com.sun.xml.internal.bind.v2.model.annotation
+      java.xml.ws
+      jdk.xml.bind
+      jdk.xml.ws
+    
+    
+      com.sun.xml.internal.bind.v2.model.core
+      jdk.xml.bind
+    
+    
+      com.sun.xml.internal.bind.v2.model.impl
+      jdk.xml.bind
+    
+    
+      com.sun.xml.internal.bind.v2.model.nav
+      java.xml.ws
+      jdk.xml.bind
+      jdk.xml.ws
+    
+    
+      com.sun.xml.internal.bind.v2.model.runtime
+      java.xml.ws
+    
+    
+      com.sun.xml.internal.bind.v2.model.util
+      jdk.xml.bind
+    
+    
+      com.sun.xml.internal.bind.v2.runtime
+      java.xml.ws
+      jdk.xml.bind
+    
+    
+      com.sun.xml.internal.bind.v2.runtime.unmarshaller
+      java.xml.ws
+    
+    
+      com.sun.xml.internal.bind.v2.schemagen
+      java.xml.ws
+      jdk.xml.bind
+    
+    
+      com.sun.xml.internal.bind.v2.schemagen.episode
+      jdk.xml.bind
+    
+    
+      com.sun.xml.internal.bind.v2.schemagen.xmlschema
+      java.xml.ws
+    
+    
+      com.sun.xml.internal.bind.v2.util
+      jdk.xml.bind
+      jdk.xml.ws
+    
+    
+      com.sun.xml.internal.fastinfoset.stax
+      java.xml.ws
+    
+    
+      com.sun.xml.internal.fastinfoset.vocab
+      java.xml.ws
+    
+    
+      com.sun.xml.internal.org.jvnet.fastinfoset
+      java.xml.ws
+    
+    
+      com.sun.xml.internal.org.jvnet.mimepull
+      java.xml.soap
+      java.xml.ws
+    
+    
+      com.sun.xml.internal.org.jvnet.staxex
+      java.xml.soap
+      java.xml.ws
+    
+    
+      com.sun.xml.internal.org.jvnet.staxex.util
+      java.xml.soap
+      java.xml.ws
+    
+    
+      com.sun.xml.internal.txw2
+      java.xml.ws
+      jdk.xml.bind
+      jdk.xml.ws
+    
+    
+      com.sun.xml.internal.txw2.annotation
+      java.xml.ws
+      jdk.xml.bind
+      jdk.xml.ws
+    
+    
+      com.sun.xml.internal.txw2.output
+      java.xml.ws
+      jdk.xml.bind
+      jdk.xml.ws
+    
+  
+  
+    java.xml.crypto
+    java.base
+    java.logging
+    java.xml
+    
+      javax.xml.crypto
+    
+    
+      javax.xml.crypto.dom
+    
+    
+      javax.xml.crypto.dsig
+    
+    
+      javax.xml.crypto.dsig.dom
+    
+    
+      javax.xml.crypto.dsig.keyinfo
+    
+    
+      javax.xml.crypto.dsig.spec
+    
+  
+  
+    java.xml.soap
+    java.activation
+    java.base
+    java.desktop
+    java.logging
+    java.xml
+    java.xml.bind
+    
+      javax.xml.soap
+    
+  
+  
+    java.xml.ws
+    java.activation
+    java.annotations.common
+    java.base
+    java.desktop
+    java.logging
+    java.management
+    java.rmi
+    java.xml
+    java.xml.bind
+    java.xml.soap
+    jdk.httpserver
+    
+      javax.jws
+    
+    
+      javax.jws.soap
+    
+    
+      javax.xml.ws
+    
+    
+      javax.xml.ws.handler
+    
+    
+      javax.xml.ws.handler.soap
+    
+    
+      javax.xml.ws.http
+    
+    
+      javax.xml.ws.soap
+    
+    
+      javax.xml.ws.spi
+    
+    
+      javax.xml.ws.spi.http
+    
+    
+      javax.xml.ws.wsaddressing
+    
+    
+      com.oracle.webservices.internal.api.databinding
+      jdk.xml.ws
+    
+    
+      com.sun.xml.internal.ws.addressing
+      jdk.xml.ws
+    
+    
+      com.sun.xml.internal.ws.addressing.v200408
+      jdk.xml.ws
+    
+    
+      com.sun.xml.internal.ws.api
+      jdk.xml.ws
+    
+    
+      com.sun.xml.internal.ws.api.addressing
+      jdk.xml.ws
+    
+    
+      com.sun.xml.internal.ws.api.databinding
+      jdk.xml.ws
+    
+    
+      com.sun.xml.internal.ws.api.model
+      jdk.xml.ws
+    
+    
+      com.sun.xml.internal.ws.api.server
+      jdk.xml.ws
+    
+    
+      com.sun.xml.internal.ws.api.streaming
+      jdk.xml.ws
+    
+    
+      com.sun.xml.internal.ws.api.wsdl.parser
+      jdk.xml.ws
+    
+    
+      com.sun.xml.internal.ws.api.wsdl.writer
+      jdk.xml.ws
+    
+    
+      com.sun.xml.internal.ws.binding
+      jdk.xml.ws
+    
+    
+      com.sun.xml.internal.ws.db
+      jdk.xml.ws
+    
+    
+      com.sun.xml.internal.ws.model
+      jdk.xml.ws
+    
+    
+      com.sun.xml.internal.ws.policy.sourcemodel.wspolicy
+      jdk.xml.ws
+    
+    
+      com.sun.xml.internal.ws.spi.db
+      jdk.xml.ws
+    
+    
+      com.sun.xml.internal.ws.streaming
+      jdk.xml.ws
+    
+    
+      com.sun.xml.internal.ws.util
+      jdk.xml.ws
+    
+    
+      com.sun.xml.internal.ws.util.exception
+      jdk.xml.ws
+    
+    
+      com.sun.xml.internal.ws.util.xml
+      jdk.xml.ws
+    
+    
+      com.sun.xml.internal.ws.wsdl.parser
+      jdk.xml.ws
+    
+    
+      com.sun.xml.internal.ws.wsdl.writer
+      jdk.xml.ws
+    
+  
+  
+    jdk.attach
+    java.base
+    jdk.jvmstat
+    
+      com.sun.tools.attach
+    
+    
+      com.sun.tools.attach.spi
+    
+    
+      sun.tools.attach
+      jdk.jcmd
+    
+  
+  
+    jdk.charsets
+    java.base
+    
+      sun.nio.cs.ext
+      java.desktop
+    
+  
+  
+    jdk.compact3
+    java.compact3
+    java.smartcardio
+    jdk.httpserver
+    jdk.naming.dns
+    jdk.naming.rmi
+    jdk.sctp
+    jdk.security.auth
+  
+  
+    jdk.compiler
+    java.base
+    java.compiler
+    
+      com.sun.source.doctree
+    
+    
+      com.sun.source.tree
+    
+    
+      com.sun.source.util
+    
+    
+      com.sun.tools.javac
+    
+    
+      com.sun.tools.javah
+    
+    
+      com.sun.tools.javap
+    
+    
+      com.sun.tools.classfile
+      jdk.dev
+    
+    
+      com.sun.tools.doclint
+      jdk.javadoc
+    
+    
+      com.sun.tools.javac.api
+      jdk.javadoc
+    
+    
+      com.sun.tools.javac.code
+      jdk.javadoc
+    
+    
+      com.sun.tools.javac.comp
+      jdk.javadoc
+    
+    
+      com.sun.tools.javac.file
+      jdk.javadoc
+    
+    
+      com.sun.tools.javac.jvm
+      jdk.javadoc
+    
+    
+      com.sun.tools.javac.main
+      jdk.javadoc
+    
+    
+      com.sun.tools.javac.nio
+      jdk.javadoc
+    
+    
+      com.sun.tools.javac.sym
+      jdk.javadoc
+    
+    
+      com.sun.tools.javac.tree
+      jdk.javadoc
+    
+    
+      com.sun.tools.javac.util
+      jdk.javadoc
+    
+  
+  
+    jdk.crypto.ec
+    java.base
+    
+      sun.security.ec
+      jdk.crypto.pkcs11
+    
+  
+  
+    jdk.crypto.pkcs11
+    java.base
+    jdk.crypto.ec
+  
+  
+    jdk.dev
+    java.base
+    java.scripting
+    java.xml
+    jdk.compiler
+    jdk.rmic
+    jdk.xml.bind
+    jdk.xml.ws
+  
+  
+    jdk.hotspot.agent
+    java.base
+    java.desktop
+    java.rmi
+    java.scripting
+    jdk.jdi
+  
+  
+    jdk.hprof.agent
+    java.base
+  
+  
+    jdk.httpserver
+    java.base
+    java.logging
+    
+      com.sun.net.httpserver
+    
+    
+      com.sun.net.httpserver.spi
+    
+  
+  
+    jdk.javadoc
+    java.base
+    java.compiler
+    java.xml
+    jdk.compiler
+    
+      com.sun.javadoc
+    
+    
+      com.sun.tools.doclets
+    
+    
+      com.sun.tools.javadoc
+    
+  
+  
+    jdk.jcmd
+    java.base
+    jdk.attach
+    jdk.jvmstat
+  
+  
+    jdk.jconsole
+    java.base
+    java.desktop
+    java.logging
+    java.management
+    java.rmi
+    jdk.attach
+    jdk.jvmstat
+    
+      com.sun.tools.jconsole
+    
+  
+  
+    jdk.jdi
+    java.base
+    jdk.attach
+    
+      com.sun.jdi
+    
+    
+      com.sun.jdi.connect
+    
+    
+      com.sun.jdi.connect.spi
+    
+    
+      com.sun.jdi.event
+    
+    
+      com.sun.jdi.request
+    
+    
+      com.sun.tools.jdi
+      jdk.hotspot.agent
+    
+  
+  
+    jdk.jdwp.agent
+    java.base
+  
+  
+    jdk.jvmstat
+    java.base
+    java.rmi
+    
+      sun.jvmstat.monitor
+      jdk.attach
+      jdk.jcmd
+      jdk.jconsole
+    
+    
+      sun.jvmstat.monitor.event
+      jdk.jcmd
+    
+  
+  
+    jdk.localedata
+    java.base
+  
+  
+    jdk.naming.dns
+    java.base
+    java.naming
+  
+  
+    jdk.naming.rmi
+    java.base
+    java.naming
+    java.rmi
+  
+  
+    jdk.rmic
+    java.base
+    java.corba
+    jdk.compiler
+    jdk.javadoc
+  
+  
+    jdk.runtime
+    java.base
+    java.desktop
+    java.se
+    jdk.compact3
+  
+  
+    jdk.scripting.nashorn
+    java.base
+    java.logging
+    java.scripting
+  
+  
+    jdk.sctp
+    java.base
+    
+      com.sun.nio.sctp
+    
+  
+  
+    jdk.security.auth
+    java.base
+    java.naming
+    java.security.jgss
+    
+      com.sun.security.auth
+    
+    
+      com.sun.security.auth.callback
+    
+    
+      com.sun.security.auth.login
+    
+    
+      com.sun.security.auth.module
+    
+  
+  
+    jdk.xml.bind
+    java.activation
+    java.base
+    java.compiler
+    java.desktop
+    java.logging
+    java.xml
+    java.xml.bind
+    jdk.compiler
+    
+      com.sun.codemodel.internal
+      jdk.xml.ws
+    
+    
+      com.sun.codemodel.internal.writer
+      jdk.xml.ws
+    
+    
+      com.sun.istack.internal.tools
+      jdk.xml.ws
+    
+    
+      com.sun.tools.internal.jxc.ap
+      jdk.xml.ws
+    
+    
+      com.sun.tools.internal.jxc.model.nav
+      jdk.xml.ws
+    
+    
+      com.sun.tools.internal.xjc
+      jdk.xml.ws
+    
+    
+      com.sun.tools.internal.xjc.api
+      jdk.xml.ws
+    
+    
+      com.sun.tools.internal.xjc.api.util
+      jdk.xml.ws
+    
+    
+      com.sun.tools.internal.xjc.reader
+      jdk.xml.ws
+    
+    
+      com.sun.tools.internal.xjc.reader.internalizer
+      jdk.xml.ws
+    
+    
+      com.sun.tools.internal.xjc.util
+      jdk.xml.ws
+    
+    
+      com.sun.xml.internal.xsom.parser
+      jdk.xml.ws
+    
+  
+  
+    jdk.xml.ws
+    java.base
+    java.compiler
+    java.logging
+    java.rmi
+    java.xml
+    java.xml.bind
+    java.xml.ws
+    jdk.xml.bind
+  
+  
+    jdk.zipfs
+    java.base
+  
+
diff --git a/nashorn/.hgtags b/nashorn/.hgtags
index f529a5ef4ec..3671e4d8923 100644
--- a/nashorn/.hgtags
+++ b/nashorn/.hgtags
@@ -259,3 +259,4 @@ a9d39bcfeb1bb3f7de929c56a2ecbea10a554ca1 jdk9-b22
 aa3fda2d2967847dbd264aa962d624c07fc6c29f jdk9-b23
 49d7a2a66ae6b70fee367e2ceb29d0c20f8be01b jdk9-b24
 b33633fc10c5bffd39d3492ed2602dadd8d44642 jdk9-b25
+ed60a4e9dd35dcabb9b24e90434f5f615d988981 jdk9-b26
diff --git a/nashorn/make/BuildNashorn.gmk b/nashorn/make/BuildNashorn.gmk
index a987874c7ea..e7838e00d13 100644
--- a/nashorn/make/BuildNashorn.gmk
+++ b/nashorn/make/BuildNashorn.gmk
@@ -30,7 +30,8 @@ default: all
 include MakeBase.gmk
 include JavaCompilation.gmk
 
-JDK_CLASSES := $(JDK_OUTPUTDIR)/classes
+JDK_CLASSES := $(subst $(SPACE),$(PATH_SEP),$(strip $(addprefix $(JDK_OUTPUTDIR)/modules/, \
+      java.base java.logging java.scripting)))
 
 NASHORN_JAR := $(NASHORN_DIST)/nashorn.jar
 NASHORN_VERSION := $(JDK_VERSION)
@@ -46,19 +47,19 @@ endif
 $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG, \
     JVM := $(JAVA), \
     JAVAC := $(NEW_JAVAC), \
-    FLAGS := -g -source 7 -target 7 -bootclasspath $(JDK_CLASSES), \
+    FLAGS := -g -source 7 -target 7 -bootclasspath "$(JDK_CLASSES)", \
     SERVER_DIR := $(SJAVAC_SERVER_DIR), \
     SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
 
 # Build nashorn into intermediate directory
 $(eval $(call SetupJavaCompilation,BUILD_NASHORN, \
     SETUP := GENERATE_NEWBYTECODE_DEBUG, \
-    SRC := $(NASHORN_TOPDIR)/src, \
+    SRC := $(NASHORN_TOPDIR)/src/jdk.scripting.nashorn/share/classes, \
     COPY := .properties .js, \
     BIN := $(NASHORN_OUTPUTDIR)/nashorn_classes))
 
 NASGEN_SRC := $(NASHORN_TOPDIR)/buildtools/nasgen/src
-ASM_SRC := $(JDK_TOPDIR)/src/share/classes/jdk/internal/org/objectweb/asm
+ASM_SRC := $(JDK_TOPDIR)/src/java.base/share/classes/jdk/internal/org/objectweb/asm
 
 # Build nasgen
 $(eval $(call SetupJavaCompilation,BUILD_NASGEN, \
@@ -70,8 +71,11 @@ $(eval $(call SetupJavaCompilation,BUILD_NASGEN, \
 # Nasgen needs nashorn classes
 $(BUILD_NASGEN): $(BUILD_NASHORN)
 
+NASHORN_CLASSES_DIR := $(JDK_OUTPUTDIR)/modules/jdk.scripting.nashorn
+NASGEN_RUN_FILE := $(NASHORN_CLASSES_DIR)/_the.nasgen.run
+
 # Copy classes to final classes dir and run nasgen to modify classes in jdk.nashorn.internal.objects package
-$(NASHORN_OUTPUTDIR)/classes/_the.nasgen.run: $(BUILD_NASGEN)
+$(NASGEN_RUN_FILE): $(BUILD_NASGEN)
 	$(ECHO) Running nasgen
 	$(MKDIR) -p $(@D)
 	$(RM) -rf $(@D)/jdk $(@D)/netscape
@@ -82,11 +86,12 @@ $(NASHORN_OUTPUTDIR)/classes/_the.nasgen.run: $(BUILD_NASGEN)
 	$(TOUCH) $@
 
 # Version file needs to be processed with version numbers
-VERSION_FILE := $(NASHORN_OUTPUTDIR)/classes/jdk/nashorn/internal/runtime/resources/version.properties
+VERSION_FILE := $(JDK_OUTPUTDIR)/modules/jdk.scripting.nashorn/jdk/nashorn/internal/runtime/resources/version.properties
+VERSION_SRC := $(NASHORN_TOPDIR)/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/version.properties-template
 
 # Needs to happen after nasgen run since nasgen run deletes it
-$(VERSION_FILE): $(NASHORN_OUTPUTDIR)/classes/_the.nasgen.run
-$(VERSION_FILE): $(NASHORN_TOPDIR)/src/jdk/nashorn/internal/runtime/resources/version.properties-template
+$(VERSION_FILE): $(NASGEN_RUN_FILE)
+$(VERSION_FILE): $(VERSION_SRC)
 	$(ECHO) Creating version.properties
 	$(MKDIR) -p $(@D)
 	$(CAT) $< | $(SED) -e 's/$$(FULL_VERSION)/$(NASHORN_FULL_VERSION)/g' \
@@ -98,15 +103,16 @@ MANIFEST_ATTRIBUTES := Name: jdk/nashorn/\nImplementation-Title: Oracle Nashorn\
 
 # Create nashorn.jar from the final classes dir
 $(eval $(call SetupArchive,BUILD_NASHORN_JAR, \
-    $(NASHORN_OUTPUTDIR)/classes/_the.nasgen.run \
+    $(NASGEN_RUN_FILE) \
     $(VERSION_FILE), \
-    SRCS := $(NASHORN_OUTPUTDIR)/classes, \
+    SRCS := $(NASHORN_CLASSES_DIR), \
     SUFFIXES := .class .js .properties Factory, \
-    MANIFEST := $(NASHORN_TOPDIR)/src/META-INF/MANIFEST.MF, \
+    MANIFEST := $(NASHORN_TOPDIR)/src/jdk.scripting.nashorn/share/classes/META-INF/MANIFEST.MF, \
     EXTRA_MANIFEST_ATTR := $(MANIFEST_ATTRIBUTES), \
     SKIP_METAINF := true, \
     JAR := $(NASHORN_JAR)))
 
+compile: $(NASHORN_RUN_FILE) $(VERSION_FILE)
 all: $(NASHORN_JAR)
 
-.PHONY: all
+.PHONY: compile all
diff --git a/nashorn/src/META-INF/MANIFEST.MF b/nashorn/src/jdk.scripting.nashorn/share/classes/META-INF/MANIFEST.MF
similarity index 100%
rename from nashorn/src/META-INF/MANIFEST.MF
rename to nashorn/src/jdk.scripting.nashorn/share/classes/META-INF/MANIFEST.MF
diff --git a/nashorn/src/META-INF/services/javax.script.ScriptEngineFactory b/nashorn/src/jdk.scripting.nashorn/share/classes/META-INF/services/javax.script.ScriptEngineFactory
similarity index 100%
rename from nashorn/src/META-INF/services/javax.script.ScriptEngineFactory
rename to nashorn/src/jdk.scripting.nashorn/share/classes/META-INF/services/javax.script.ScriptEngineFactory
diff --git a/nashorn/src/jdk/internal/dynalink/CallSiteDescriptor.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/CallSiteDescriptor.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/CallSiteDescriptor.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/CallSiteDescriptor.java
diff --git a/nashorn/src/jdk/internal/dynalink/ChainedCallSite.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/ChainedCallSite.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/ChainedCallSite.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/ChainedCallSite.java
diff --git a/nashorn/src/jdk/internal/dynalink/DefaultBootstrapper.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/DefaultBootstrapper.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/DefaultBootstrapper.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/DefaultBootstrapper.java
diff --git a/nashorn/src/jdk/internal/dynalink/DynamicLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/DynamicLinker.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/DynamicLinker.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/DynamicLinker.java
diff --git a/nashorn/src/jdk/internal/dynalink/DynamicLinkerFactory.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/DynamicLinkerFactory.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/DynamicLinkerFactory.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/DynamicLinkerFactory.java
diff --git a/nashorn/src/jdk/internal/dynalink/GuardedInvocationFilter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/GuardedInvocationFilter.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/GuardedInvocationFilter.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/GuardedInvocationFilter.java
diff --git a/nashorn/src/jdk/internal/dynalink/MonomorphicCallSite.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/MonomorphicCallSite.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/MonomorphicCallSite.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/MonomorphicCallSite.java
diff --git a/nashorn/src/jdk/internal/dynalink/NoSuchDynamicMethodException.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/NoSuchDynamicMethodException.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/NoSuchDynamicMethodException.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/NoSuchDynamicMethodException.java
diff --git a/nashorn/src/jdk/internal/dynalink/RelinkableCallSite.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/RelinkableCallSite.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/RelinkableCallSite.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/RelinkableCallSite.java
diff --git a/nashorn/src/jdk/internal/dynalink/beans/AbstractJavaLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/AbstractJavaLinker.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/beans/AbstractJavaLinker.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/AbstractJavaLinker.java
diff --git a/nashorn/src/jdk/internal/dynalink/beans/AccessibleMembersLookup.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/AccessibleMembersLookup.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/beans/AccessibleMembersLookup.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/AccessibleMembersLookup.java
diff --git a/nashorn/src/jdk/internal/dynalink/beans/ApplicableOverloadedMethods.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/ApplicableOverloadedMethods.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/beans/ApplicableOverloadedMethods.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/ApplicableOverloadedMethods.java
diff --git a/nashorn/src/jdk/internal/dynalink/beans/BeanIntrospector.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/BeanIntrospector.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/beans/BeanIntrospector.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/BeanIntrospector.java
diff --git a/nashorn/src/jdk/internal/dynalink/beans/BeanLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/BeanLinker.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/beans/BeanLinker.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/BeanLinker.java
diff --git a/nashorn/src/jdk/internal/dynalink/beans/BeansLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/BeansLinker.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/beans/BeansLinker.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/BeansLinker.java
diff --git a/nashorn/src/jdk/internal/dynalink/beans/CallerSensitiveDetector.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/CallerSensitiveDetector.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/beans/CallerSensitiveDetector.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/CallerSensitiveDetector.java
diff --git a/nashorn/src/jdk/internal/dynalink/beans/CallerSensitiveDynamicMethod.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/CallerSensitiveDynamicMethod.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/beans/CallerSensitiveDynamicMethod.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/CallerSensitiveDynamicMethod.java
diff --git a/nashorn/src/jdk/internal/dynalink/beans/CheckRestrictedPackage.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/CheckRestrictedPackage.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/beans/CheckRestrictedPackage.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/CheckRestrictedPackage.java
diff --git a/nashorn/src/jdk/internal/dynalink/beans/ClassLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/ClassLinker.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/beans/ClassLinker.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/ClassLinker.java
diff --git a/nashorn/src/jdk/internal/dynalink/beans/ClassString.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/ClassString.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/beans/ClassString.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/ClassString.java
diff --git a/nashorn/src/jdk/internal/dynalink/beans/DynamicMethod.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/DynamicMethod.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/beans/DynamicMethod.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/DynamicMethod.java
diff --git a/nashorn/src/jdk/internal/dynalink/beans/DynamicMethodLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/DynamicMethodLinker.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/beans/DynamicMethodLinker.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/DynamicMethodLinker.java
diff --git a/nashorn/src/jdk/internal/dynalink/beans/FacetIntrospector.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/FacetIntrospector.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/beans/FacetIntrospector.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/FacetIntrospector.java
diff --git a/nashorn/src/jdk/internal/dynalink/beans/GuardedInvocationComponent.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/GuardedInvocationComponent.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/beans/GuardedInvocationComponent.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/GuardedInvocationComponent.java
diff --git a/nashorn/src/jdk/internal/dynalink/beans/MaximallySpecific.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/MaximallySpecific.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/beans/MaximallySpecific.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/MaximallySpecific.java
diff --git a/nashorn/src/jdk/internal/dynalink/beans/OverloadedDynamicMethod.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/OverloadedDynamicMethod.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/beans/OverloadedDynamicMethod.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/OverloadedDynamicMethod.java
diff --git a/nashorn/src/jdk/internal/dynalink/beans/OverloadedMethod.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/OverloadedMethod.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/beans/OverloadedMethod.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/OverloadedMethod.java
diff --git a/nashorn/src/jdk/internal/dynalink/beans/SimpleDynamicMethod.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/SimpleDynamicMethod.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/beans/SimpleDynamicMethod.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/SimpleDynamicMethod.java
diff --git a/nashorn/src/jdk/internal/dynalink/beans/SingleDynamicMethod.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/SingleDynamicMethod.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/beans/SingleDynamicMethod.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/SingleDynamicMethod.java
diff --git a/nashorn/src/jdk/internal/dynalink/beans/StaticClass.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/StaticClass.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/beans/StaticClass.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/StaticClass.java
diff --git a/nashorn/src/jdk/internal/dynalink/beans/StaticClassIntrospector.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/StaticClassIntrospector.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/beans/StaticClassIntrospector.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/StaticClassIntrospector.java
diff --git a/nashorn/src/jdk/internal/dynalink/beans/StaticClassLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/StaticClassLinker.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/beans/StaticClassLinker.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/StaticClassLinker.java
diff --git a/nashorn/src/jdk/internal/dynalink/beans/messages.properties b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/messages.properties
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/beans/messages.properties
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/messages.properties
diff --git a/nashorn/src/jdk/internal/dynalink/beans/package.html b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/package.html
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/beans/package.html
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/package.html
diff --git a/nashorn/src/jdk/internal/dynalink/linker/ConversionComparator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/ConversionComparator.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/linker/ConversionComparator.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/ConversionComparator.java
diff --git a/nashorn/src/jdk/internal/dynalink/linker/GuardedInvocation.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/GuardedInvocation.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/linker/GuardedInvocation.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/GuardedInvocation.java
diff --git a/nashorn/src/jdk/internal/dynalink/linker/GuardedTypeConversion.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/GuardedTypeConversion.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/linker/GuardedTypeConversion.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/GuardedTypeConversion.java
diff --git a/nashorn/src/jdk/internal/dynalink/linker/GuardingDynamicLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/GuardingDynamicLinker.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/linker/GuardingDynamicLinker.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/GuardingDynamicLinker.java
diff --git a/nashorn/src/jdk/internal/dynalink/linker/GuardingTypeConverterFactory.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/GuardingTypeConverterFactory.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/linker/GuardingTypeConverterFactory.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/GuardingTypeConverterFactory.java
diff --git a/nashorn/src/jdk/internal/dynalink/linker/LinkRequest.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/LinkRequest.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/linker/LinkRequest.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/LinkRequest.java
diff --git a/nashorn/src/jdk/internal/dynalink/linker/LinkerServices.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/LinkerServices.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/linker/LinkerServices.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/LinkerServices.java
diff --git a/nashorn/src/jdk/internal/dynalink/linker/TypeBasedGuardingDynamicLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/TypeBasedGuardingDynamicLinker.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/linker/TypeBasedGuardingDynamicLinker.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/TypeBasedGuardingDynamicLinker.java
diff --git a/nashorn/src/jdk/internal/dynalink/linker/package.html b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/package.html
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/linker/package.html
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/package.html
diff --git a/nashorn/src/jdk/internal/dynalink/package.html b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/package.html
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/package.html
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/package.html
diff --git a/nashorn/src/jdk/internal/dynalink/support/AbstractCallSiteDescriptor.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/AbstractCallSiteDescriptor.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/support/AbstractCallSiteDescriptor.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/AbstractCallSiteDescriptor.java
diff --git a/nashorn/src/jdk/internal/dynalink/support/AbstractRelinkableCallSite.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/AbstractRelinkableCallSite.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/support/AbstractRelinkableCallSite.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/AbstractRelinkableCallSite.java
diff --git a/nashorn/src/jdk/internal/dynalink/support/AutoDiscovery.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/AutoDiscovery.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/support/AutoDiscovery.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/AutoDiscovery.java
diff --git a/nashorn/src/jdk/internal/dynalink/support/BottomGuardingDynamicLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/BottomGuardingDynamicLinker.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/support/BottomGuardingDynamicLinker.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/BottomGuardingDynamicLinker.java
diff --git a/nashorn/src/jdk/internal/dynalink/support/CallSiteDescriptorFactory.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/CallSiteDescriptorFactory.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/support/CallSiteDescriptorFactory.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/CallSiteDescriptorFactory.java
diff --git a/nashorn/src/jdk/internal/dynalink/support/ClassLoaderGetterContextProvider.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/ClassLoaderGetterContextProvider.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/support/ClassLoaderGetterContextProvider.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/ClassLoaderGetterContextProvider.java
diff --git a/nashorn/src/jdk/internal/dynalink/support/ClassMap.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/ClassMap.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/support/ClassMap.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/ClassMap.java
diff --git a/nashorn/src/jdk/internal/dynalink/support/CompositeGuardingDynamicLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/CompositeGuardingDynamicLinker.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/support/CompositeGuardingDynamicLinker.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/CompositeGuardingDynamicLinker.java
diff --git a/nashorn/src/jdk/internal/dynalink/support/CompositeTypeBasedGuardingDynamicLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/CompositeTypeBasedGuardingDynamicLinker.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/support/CompositeTypeBasedGuardingDynamicLinker.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/CompositeTypeBasedGuardingDynamicLinker.java
diff --git a/nashorn/src/jdk/internal/dynalink/support/DefaultCallSiteDescriptor.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/DefaultCallSiteDescriptor.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/support/DefaultCallSiteDescriptor.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/DefaultCallSiteDescriptor.java
diff --git a/nashorn/src/jdk/internal/dynalink/support/DefaultPrelinkFilter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/DefaultPrelinkFilter.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/support/DefaultPrelinkFilter.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/DefaultPrelinkFilter.java
diff --git a/nashorn/src/jdk/internal/dynalink/support/Guards.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/Guards.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/support/Guards.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/Guards.java
diff --git a/nashorn/src/jdk/internal/dynalink/support/LinkRequestImpl.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/LinkRequestImpl.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/support/LinkRequestImpl.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/LinkRequestImpl.java
diff --git a/nashorn/src/jdk/internal/dynalink/support/LinkerServicesImpl.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/LinkerServicesImpl.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/support/LinkerServicesImpl.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/LinkerServicesImpl.java
diff --git a/nashorn/src/jdk/internal/dynalink/support/Lookup.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/Lookup.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/support/Lookup.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/Lookup.java
diff --git a/nashorn/src/jdk/internal/dynalink/support/LookupCallSiteDescriptor.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/LookupCallSiteDescriptor.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/support/LookupCallSiteDescriptor.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/LookupCallSiteDescriptor.java
diff --git a/nashorn/src/jdk/internal/dynalink/support/NameCodec.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/NameCodec.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/support/NameCodec.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/NameCodec.java
diff --git a/nashorn/src/jdk/internal/dynalink/support/NamedDynCallSiteDescriptor.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/NamedDynCallSiteDescriptor.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/support/NamedDynCallSiteDescriptor.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/NamedDynCallSiteDescriptor.java
diff --git a/nashorn/src/jdk/internal/dynalink/support/RuntimeContextLinkRequestImpl.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/RuntimeContextLinkRequestImpl.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/support/RuntimeContextLinkRequestImpl.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/RuntimeContextLinkRequestImpl.java
diff --git a/nashorn/src/jdk/internal/dynalink/support/TypeConverterFactory.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/TypeConverterFactory.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/support/TypeConverterFactory.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/TypeConverterFactory.java
diff --git a/nashorn/src/jdk/internal/dynalink/support/TypeUtilities.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/TypeUtilities.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/support/TypeUtilities.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/TypeUtilities.java
diff --git a/nashorn/src/jdk/internal/dynalink/support/UnnamedDynCallSiteDescriptor.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/UnnamedDynCallSiteDescriptor.java
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/support/UnnamedDynCallSiteDescriptor.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/UnnamedDynCallSiteDescriptor.java
diff --git a/nashorn/src/jdk/internal/dynalink/support/messages.properties b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/messages.properties
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/support/messages.properties
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/messages.properties
diff --git a/nashorn/src/jdk/internal/dynalink/support/package.html b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/package.html
similarity index 100%
rename from nashorn/src/jdk/internal/dynalink/support/package.html
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/package.html
diff --git a/nashorn/src/jdk/nashorn/api/scripting/AbstractJSObject.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/AbstractJSObject.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/api/scripting/AbstractJSObject.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/AbstractJSObject.java
diff --git a/nashorn/src/jdk/nashorn/api/scripting/Formatter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/Formatter.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/api/scripting/Formatter.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/Formatter.java
diff --git a/nashorn/src/jdk/nashorn/api/scripting/JSObject.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/JSObject.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/api/scripting/JSObject.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/JSObject.java
diff --git a/nashorn/src/jdk/nashorn/api/scripting/NashornException.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornException.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/api/scripting/NashornException.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornException.java
diff --git a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngine.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngine.java
diff --git a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java
diff --git a/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptObjectMirror.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptObjectMirror.java
diff --git a/nashorn/src/jdk/nashorn/api/scripting/ScriptUtils.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptUtils.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/api/scripting/ScriptUtils.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptUtils.java
diff --git a/nashorn/src/jdk/nashorn/api/scripting/URLReader.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/URLReader.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/api/scripting/URLReader.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/URLReader.java
diff --git a/nashorn/src/jdk/nashorn/api/scripting/package-info.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/package-info.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/api/scripting/package-info.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/package-info.java
diff --git a/nashorn/src/jdk/nashorn/api/scripting/resources/Messages.properties b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/resources/Messages.properties
similarity index 100%
rename from nashorn/src/jdk/nashorn/api/scripting/resources/Messages.properties
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/resources/Messages.properties
diff --git a/nashorn/src/jdk/nashorn/internal/IntDeque.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/IntDeque.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/IntDeque.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/IntDeque.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/ApplySpecialization.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ApplySpecialization.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/ApplySpecialization.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ApplySpecialization.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/AssignSymbols.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/AssignSymbols.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/AssignSymbols.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/AssignSymbols.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/BranchOptimizer.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/BranchOptimizer.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/BranchOptimizer.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/BranchOptimizer.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ClassEmitter.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ClassEmitter.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CodeGeneratorLexicalContext.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGeneratorLexicalContext.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/CodeGeneratorLexicalContext.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGeneratorLexicalContext.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CompilationException.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilationException.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/CompilationException.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilationException.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CompilationPhase.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilationPhase.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/CompilationPhase.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilationPhase.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CompileUnit.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompileUnit.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/CompileUnit.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompileUnit.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Compiler.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Compiler.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CompilerConstants.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilerConstants.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/CompilerConstants.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilerConstants.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Condition.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Condition.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/Condition.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Condition.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/ConstantData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ConstantData.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/ConstantData.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ConstantData.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/DumpBytecode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/DumpBytecode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/DumpBytecode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/DumpBytecode.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Emitter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Emitter.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/Emitter.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Emitter.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/FieldObjectCreator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FieldObjectCreator.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/FieldObjectCreator.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FieldObjectCreator.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/FindScopeDepths.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FindScopeDepths.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/FindScopeDepths.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FindScopeDepths.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/FoldConstants.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FoldConstants.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/FoldConstants.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FoldConstants.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FunctionSignature.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FunctionSignature.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Label.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Label.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/Label.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Label.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/LocalStateRestorationInfo.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/LocalStateRestorationInfo.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/LocalStateRestorationInfo.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/LocalStateRestorationInfo.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/LocalVariableTypesCalculator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/LocalVariableTypesCalculator.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/LocalVariableTypesCalculator.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/LocalVariableTypesCalculator.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Lower.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Lower.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/Lower.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Lower.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/MapCreator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MapCreator.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/MapCreator.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MapCreator.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/MapTuple.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MapTuple.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/MapTuple.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MapTuple.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MethodEmitter.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MethodEmitter.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Namespace.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Namespace.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/Namespace.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Namespace.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/ObjectClassGenerator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ObjectClassGenerator.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/ObjectClassGenerator.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ObjectClassGenerator.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/ObjectCreator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ObjectCreator.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/ObjectCreator.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ObjectCreator.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/OptimisticTypesCalculator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesCalculator.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/OptimisticTypesCalculator.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesCalculator.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/OptimisticTypesPersistence.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesPersistence.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/OptimisticTypesPersistence.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesPersistence.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/ProgramPoints.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ProgramPoints.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/ProgramPoints.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ProgramPoints.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/RuntimeCallSite.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/RuntimeCallSite.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/SharedScopeCall.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/SharedScopeCall.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/SharedScopeCall.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/SharedScopeCall.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/SpillObjectCreator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/SpillObjectCreator.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/SpillObjectCreator.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/SpillObjectCreator.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/SplitMethodEmitter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/SplitMethodEmitter.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/SplitMethodEmitter.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/SplitMethodEmitter.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Splitter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Splitter.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/Splitter.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Splitter.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/TypeEvaluator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/TypeEvaluator.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/TypeEvaluator.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/TypeEvaluator.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/TypeMap.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/TypeMap.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/TypeMap.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/TypeMap.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/WeighNodes.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/WeighNodes.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/WeighNodes.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/WeighNodes.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/ArrayType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/ArrayType.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/types/ArrayType.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/ArrayType.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/BitwiseType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BitwiseType.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/types/BitwiseType.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BitwiseType.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/BooleanType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BooleanType.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/types/BooleanType.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BooleanType.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeArrayOps.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeArrayOps.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeArrayOps.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeArrayOps.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeBitwiseOps.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeBitwiseOps.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeBitwiseOps.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeBitwiseOps.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeNumericOps.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeNumericOps.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeNumericOps.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeNumericOps.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeOps.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeOps.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeOps.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeOps.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/IntType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/IntType.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/types/IntType.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/IntType.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/LongType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/LongType.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/types/LongType.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/LongType.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/NumberType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/NumberType.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/types/NumberType.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/NumberType.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/NumericType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/NumericType.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/types/NumericType.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/NumericType.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/ObjectType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/ObjectType.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/types/ObjectType.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/ObjectType.java
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/Type.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/Type.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/codegen/types/Type.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/Type.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/AccessNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/AccessNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/AccessNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/AccessNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Assignment.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Assignment.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/Assignment.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Assignment.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/BaseNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BaseNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/BaseNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BaseNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/BinaryNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BinaryNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/BinaryNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BinaryNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Block.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Block.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/Block.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Block.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/BlockLexicalContext.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BlockLexicalContext.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/BlockLexicalContext.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BlockLexicalContext.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/BlockStatement.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BlockStatement.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/BlockStatement.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BlockStatement.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/BreakNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BreakNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/BreakNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BreakNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/BreakableNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BreakableNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/BreakableNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BreakableNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/BreakableStatement.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BreakableStatement.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/BreakableStatement.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BreakableStatement.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/CallNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CallNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/CallNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CallNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/CaseNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CaseNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/CaseNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CaseNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/CatchNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CatchNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/CatchNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CatchNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/ContinueNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ContinueNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/ContinueNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ContinueNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/EmptyNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/EmptyNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/EmptyNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/EmptyNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Expression.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Expression.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/Expression.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Expression.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/ExpressionStatement.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ExpressionStatement.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/ExpressionStatement.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ExpressionStatement.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Flags.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Flags.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/Flags.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Flags.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/ForNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ForNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/ForNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ForNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/FunctionCall.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/FunctionCall.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/FunctionCall.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/FunctionCall.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/FunctionNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/FunctionNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/IdentNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/IdentNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/IdentNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/IdentNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/IfNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/IfNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/IfNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/IfNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/IndexNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/IndexNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/IndexNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/IndexNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/JoinPredecessor.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JoinPredecessor.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/JoinPredecessor.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JoinPredecessor.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/JoinPredecessorExpression.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JoinPredecessorExpression.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/JoinPredecessorExpression.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JoinPredecessorExpression.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/JumpStatement.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JumpStatement.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/JumpStatement.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JumpStatement.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/LabelNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LabelNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/LabelNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LabelNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Labels.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Labels.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/Labels.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Labels.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/LexicalContext.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContext.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/LexicalContext.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContext.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/LexicalContextExpression.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContextExpression.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/LexicalContextExpression.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContextExpression.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/LexicalContextNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContextNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/LexicalContextNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContextNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/LexicalContextStatement.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContextStatement.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/LexicalContextStatement.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContextStatement.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/LiteralNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LiteralNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/LiteralNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LiteralNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/LocalVariableConversion.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LocalVariableConversion.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/LocalVariableConversion.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LocalVariableConversion.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/LoopNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LoopNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/LoopNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LoopNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Node.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Node.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/Node.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Node.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/ObjectNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ObjectNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/ObjectNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ObjectNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Optimistic.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Optimistic.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/Optimistic.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Optimistic.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/OptimisticLexicalContext.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/OptimisticLexicalContext.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/OptimisticLexicalContext.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/OptimisticLexicalContext.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/PropertyKey.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/PropertyKey.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/PropertyKey.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/PropertyKey.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/PropertyNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/PropertyNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/PropertyNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/PropertyNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/ReturnNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ReturnNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/ReturnNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ReturnNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/RuntimeNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/RuntimeNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/RuntimeNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/RuntimeNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/SplitNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SplitNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/SplitNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SplitNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Statement.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Statement.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/Statement.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Statement.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/SwitchNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SwitchNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/SwitchNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SwitchNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Symbol.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Symbol.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/Symbol.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Symbol.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Terminal.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Terminal.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/Terminal.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Terminal.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/TernaryNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/TernaryNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/TernaryNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/TernaryNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/ThrowNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ThrowNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/ThrowNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ThrowNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/TryNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/TryNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/TryNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/TryNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/UnaryNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/UnaryNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/UnaryNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/UnaryNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/VarNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/VarNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/VarNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/VarNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/WhileNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/WhileNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/WhileNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/WhileNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/WithNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/WithNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/WithNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/WithNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/annotations/Ignore.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/annotations/Ignore.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/annotations/Ignore.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/annotations/Ignore.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/annotations/Immutable.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/annotations/Immutable.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/annotations/Immutable.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/annotations/Immutable.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/annotations/Reference.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/annotations/Reference.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/annotations/Reference.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/annotations/Reference.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/debug/ASTWriter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/ASTWriter.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/debug/ASTWriter.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/ASTWriter.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/debug/ClassHistogramElement.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/ClassHistogramElement.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/debug/ClassHistogramElement.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/ClassHistogramElement.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/JSONWriter.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/JSONWriter.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/debug/NashornClassReader.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/NashornClassReader.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/debug/NashornClassReader.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/NashornClassReader.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/debug/NashornTextifier.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/NashornTextifier.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/debug/NashornTextifier.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/NashornTextifier.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/debug/ObjectSizeCalculator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/ObjectSizeCalculator.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/debug/ObjectSizeCalculator.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/ObjectSizeCalculator.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/debug/PrintVisitor.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/PrintVisitor.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/debug/PrintVisitor.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/PrintVisitor.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java
diff --git a/nashorn/src/jdk/nashorn/internal/ir/visitor/NodeVisitor.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/visitor/NodeVisitor.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/ir/visitor/NodeVisitor.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/visitor/NodeVisitor.java
diff --git a/nashorn/src/jdk/nashorn/internal/lookup/Lookup.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/lookup/Lookup.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/lookup/Lookup.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/lookup/Lookup.java
diff --git a/nashorn/src/jdk/nashorn/internal/lookup/MethodHandleFactory.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/lookup/MethodHandleFactory.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/lookup/MethodHandleFactory.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/lookup/MethodHandleFactory.java
diff --git a/nashorn/src/jdk/nashorn/internal/lookup/MethodHandleFunctionality.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/lookup/MethodHandleFunctionality.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/lookup/MethodHandleFunctionality.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/lookup/MethodHandleFunctionality.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/ArrayBufferView.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/ArrayBufferView.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/ArrayBufferView.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/ArrayBufferView.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/BoundScriptFunctionImpl.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/BoundScriptFunctionImpl.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/BoundScriptFunctionImpl.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/BoundScriptFunctionImpl.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/DataPropertyDescriptor.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/DataPropertyDescriptor.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/DataPropertyDescriptor.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/DataPropertyDescriptor.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/Global.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/Global.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/Global.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/Global.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArguments.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArguments.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArray.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/NativeArray.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArray.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeArrayBuffer.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArrayBuffer.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/NativeArrayBuffer.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArrayBuffer.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeBoolean.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeBoolean.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeDataView.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDataView.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/NativeDataView.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDataView.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeDate.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDate.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/NativeDate.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDate.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeDebug.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDebug.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/NativeDebug.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDebug.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeError.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeError.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/NativeError.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeError.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeEvalError.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeEvalError.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/NativeEvalError.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeEvalError.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeFloat32Array.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFloat32Array.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/NativeFloat32Array.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFloat32Array.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeFloat64Array.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFloat64Array.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/NativeFloat64Array.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFloat64Array.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeFunction.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFunction.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/NativeFunction.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFunction.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeInt16Array.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt16Array.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/NativeInt16Array.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt16Array.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeInt32Array.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt32Array.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/NativeInt32Array.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt32Array.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeInt8Array.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt8Array.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/NativeInt8Array.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt8Array.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJSAdapter.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJSAdapter.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJSON.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJSON.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJava.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJava.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJavaImporter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJavaImporter.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/NativeJavaImporter.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJavaImporter.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeMath.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeMath.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/NativeMath.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeMath.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeNumber.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeNumber.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeObject.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeObject.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/NativeObject.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeObject.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeRangeError.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeRangeError.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/NativeRangeError.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeRangeError.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeReferenceError.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeReferenceError.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/NativeReferenceError.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeReferenceError.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeRegExp.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeRegExp.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeRegExpExecResult.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeRegExpExecResult.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/NativeRegExpExecResult.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeRegExpExecResult.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeStrictArguments.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeStrictArguments.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/NativeStrictArguments.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeStrictArguments.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeString.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeString.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/NativeString.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeString.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeSyntaxError.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeSyntaxError.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/NativeSyntaxError.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeSyntaxError.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeTypeError.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeTypeError.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/NativeTypeError.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeTypeError.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeURIError.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeURIError.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/NativeURIError.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeURIError.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeUint16Array.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint16Array.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/NativeUint16Array.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint16Array.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeUint32Array.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint32Array.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/NativeUint32Array.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint32Array.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeUint8Array.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint8Array.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/NativeUint8Array.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint8Array.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/PrototypeObject.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/PrototypeObject.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/PrototypeObject.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/PrototypeObject.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/Attribute.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Attribute.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/annotations/Attribute.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Attribute.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/Constructor.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Constructor.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/annotations/Constructor.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Constructor.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/Function.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Function.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/annotations/Function.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Function.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/Getter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Getter.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/annotations/Getter.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Getter.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/Optimistic.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Optimistic.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/annotations/Optimistic.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Optimistic.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/Property.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Property.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/annotations/Property.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Property.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/ScriptClass.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/ScriptClass.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/annotations/ScriptClass.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/ScriptClass.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/Setter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Setter.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/annotations/Setter.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Setter.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/SpecializedConstructor.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/SpecializedConstructor.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/annotations/SpecializedConstructor.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/SpecializedConstructor.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/SpecializedFunction.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/SpecializedFunction.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/annotations/SpecializedFunction.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/SpecializedFunction.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/Where.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Where.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/annotations/Where.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Where.java
diff --git a/nashorn/src/jdk/nashorn/internal/objects/package-info.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/package-info.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/objects/package-info.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/package-info.java
diff --git a/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/AbstractParser.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/AbstractParser.java
diff --git a/nashorn/src/jdk/nashorn/internal/parser/DateParser.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/DateParser.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/parser/DateParser.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/DateParser.java
diff --git a/nashorn/src/jdk/nashorn/internal/parser/JSONParser.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/JSONParser.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/parser/JSONParser.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/JSONParser.java
diff --git a/nashorn/src/jdk/nashorn/internal/parser/Lexer.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Lexer.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/parser/Lexer.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Lexer.java
diff --git a/nashorn/src/jdk/nashorn/internal/parser/Parser.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Parser.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/parser/Parser.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Parser.java
diff --git a/nashorn/src/jdk/nashorn/internal/parser/Scanner.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Scanner.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/parser/Scanner.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Scanner.java
diff --git a/nashorn/src/jdk/nashorn/internal/parser/Token.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Token.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/parser/Token.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Token.java
diff --git a/nashorn/src/jdk/nashorn/internal/parser/TokenKind.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenKind.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/parser/TokenKind.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenKind.java
diff --git a/nashorn/src/jdk/nashorn/internal/parser/TokenLookup.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenLookup.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/parser/TokenLookup.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenLookup.java
diff --git a/nashorn/src/jdk/nashorn/internal/parser/TokenStream.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenStream.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/parser/TokenStream.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenStream.java
diff --git a/nashorn/src/jdk/nashorn/internal/parser/TokenType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenType.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/parser/TokenType.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenType.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/AccessorProperty.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AccessorProperty.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/AccessorProperty.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AccessorProperty.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ArgumentSetter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ArgumentSetter.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/ArgumentSetter.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ArgumentSetter.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/BitVector.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/BitVector.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/BitVector.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/BitVector.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/CodeInstaller.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CodeInstaller.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/CodeInstaller.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CodeInstaller.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/CodeStore.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CodeStore.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/CodeStore.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CodeStore.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/CompiledFunction.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CompiledFunction.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/CompiledFunction.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CompiledFunction.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/CompiledFunctions.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CompiledFunctions.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/CompiledFunctions.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CompiledFunctions.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/CompiledScript.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CompiledScript.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/CompiledScript.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CompiledScript.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ConsString.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ConsString.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/ConsString.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ConsString.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Context.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/Context.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Debug.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Debug.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/Debug.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Debug.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/DebuggerSupport.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/DebuggerSupport.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/DebuggerSupport.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/DebuggerSupport.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/DefaultPropertyAccess.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/DefaultPropertyAccess.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/DefaultPropertyAccess.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/DefaultPropertyAccess.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ECMAErrors.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ECMAErrors.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ECMAException.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ECMAException.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ErrorManager.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ErrorManager.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/ErrorManager.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ErrorManager.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/FinalScriptFunctionData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FinalScriptFunctionData.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/FinalScriptFunctionData.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FinalScriptFunctionData.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/FindProperty.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FindProperty.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/FindProperty.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FindProperty.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/FunctionScope.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FunctionScope.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/FunctionScope.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FunctionScope.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/GlobalConstants.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/GlobalConstants.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/GlobalConstants.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/GlobalConstants.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/GlobalFunctions.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/GlobalFunctions.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/GlobalFunctions.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/GlobalFunctions.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/JSErrorType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSErrorType.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/JSErrorType.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSErrorType.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/JSONFunctions.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSONFunctions.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/JSONFunctions.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSONFunctions.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/JSObjectListAdapter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSObjectListAdapter.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/JSObjectListAdapter.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSObjectListAdapter.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/JSType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSType.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/JSType.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSType.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ListAdapter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ListAdapter.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/ListAdapter.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ListAdapter.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/NashornLoader.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NashornLoader.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/NashornLoader.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NashornLoader.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/NativeJavaPackage.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NativeJavaPackage.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/NativeJavaPackage.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NativeJavaPackage.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/NumberToString.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NumberToString.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/NumberToString.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NumberToString.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/OptimisticReturnFilters.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/OptimisticReturnFilters.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/OptimisticReturnFilters.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/OptimisticReturnFilters.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ParserException.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ParserException.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/ParserException.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ParserException.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Property.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Property.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/Property.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Property.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/PropertyAccess.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyAccess.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/PropertyAccess.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyAccess.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/PropertyDescriptor.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyDescriptor.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/PropertyDescriptor.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyDescriptor.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/PropertyHashMap.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyHashMap.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/PropertyHashMap.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyHashMap.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/PropertyListeners.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyListeners.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/PropertyListeners.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyListeners.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyMap.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyMap.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/QuotedStringTokenizer.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/QuotedStringTokenizer.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/QuotedStringTokenizer.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/QuotedStringTokenizer.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/RewriteException.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RewriteException.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/RewriteException.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RewriteException.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Scope.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Scope.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/Scope.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Scope.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptEnvironment.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptEnvironment.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/ScriptEnvironment.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptEnvironment.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunction.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunction.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunctionData.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunctionData.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptLoader.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptLoader.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/ScriptLoader.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptLoader.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptObject.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptObject.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptRuntime.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptRuntime.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptingFunctions.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptingFunctions.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SetMethodCreator.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SetMethodCreator.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Source.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Source.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/Source.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Source.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/SpillProperty.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SpillProperty.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/SpillProperty.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SpillProperty.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/StructureLoader.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/StructureLoader.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/StructureLoader.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/StructureLoader.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Timing.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Timing.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/Timing.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Timing.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/URIUtils.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/URIUtils.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/URIUtils.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/URIUtils.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Undefined.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Undefined.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/Undefined.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Undefined.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/UnwarrantedOptimismException.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/UnwarrantedOptimismException.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/UnwarrantedOptimismException.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/UnwarrantedOptimismException.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/UserAccessorProperty.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/UserAccessorProperty.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/UserAccessorProperty.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/UserAccessorProperty.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Version.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Version.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/Version.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Version.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/WithObject.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/WithObject.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/WithObject.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayData.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayData.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayData.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayFilter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayFilter.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayFilter.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayFilter.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayIndex.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayIndex.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayIndex.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayIndex.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ByteBufferArrayData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ByteBufferArrayData.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/ByteBufferArrayData.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ByteBufferArrayData.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ContinuousArrayData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ContinuousArrayData.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/ContinuousArrayData.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ContinuousArrayData.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/DeletedArrayFilter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/DeletedArrayFilter.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/DeletedArrayFilter.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/DeletedArrayFilter.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/DeletedRangeArrayFilter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/DeletedRangeArrayFilter.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/DeletedRangeArrayFilter.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/DeletedRangeArrayFilter.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/EmptyArrayLikeIterator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/EmptyArrayLikeIterator.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/EmptyArrayLikeIterator.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/EmptyArrayLikeIterator.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/IntArrayData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IntArrayData.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/IntArrayData.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IntArrayData.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/InvalidArrayIndexException.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/InvalidArrayIndexException.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/InvalidArrayIndexException.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/InvalidArrayIndexException.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/IteratorAction.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IteratorAction.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/IteratorAction.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IteratorAction.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/JSObjectIterator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/JSObjectIterator.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/JSObjectIterator.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/JSObjectIterator.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/JavaArrayIterator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/JavaArrayIterator.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/JavaArrayIterator.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/JavaArrayIterator.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/JavaListIterator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/JavaListIterator.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/JavaListIterator.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/JavaListIterator.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/LongArrayData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/LongArrayData.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/LongArrayData.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/LongArrayData.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/NoTypeArrayData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/NoTypeArrayData.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/NoTypeArrayData.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/NoTypeArrayData.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/NumberArrayData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/NumberArrayData.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/NumberArrayData.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/NumberArrayData.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ObjectArrayData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ObjectArrayData.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/ObjectArrayData.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ObjectArrayData.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseJSObjectIterator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseJSObjectIterator.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseJSObjectIterator.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseJSObjectIterator.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseJavaArrayIterator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseJavaArrayIterator.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseJavaArrayIterator.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseJavaArrayIterator.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseJavaListIterator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseJavaListIterator.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseJavaListIterator.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseJavaListIterator.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseScriptArrayIterator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseScriptArrayIterator.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseScriptArrayIterator.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseScriptArrayIterator.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseScriptObjectIterator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseScriptObjectIterator.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseScriptObjectIterator.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseScriptObjectIterator.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ScriptArrayIterator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ScriptArrayIterator.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/ScriptArrayIterator.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ScriptArrayIterator.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ScriptObjectIterator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ScriptObjectIterator.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/ScriptObjectIterator.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ScriptObjectIterator.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/SparseArrayData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/SparseArrayData.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/SparseArrayData.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/SparseArrayData.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/TypedArrayData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/TypedArrayData.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/TypedArrayData.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/TypedArrayData.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/events/RecompilationEvent.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/events/RecompilationEvent.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/events/RecompilationEvent.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/events/RecompilationEvent.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/events/RuntimeEvent.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/events/RuntimeEvent.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/events/RuntimeEvent.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/events/RuntimeEvent.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/AdaptationException.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/AdaptationException.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/linker/AdaptationException.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/AdaptationException.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/AdaptationResult.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/AdaptationResult.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/linker/AdaptationResult.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/AdaptationResult.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/Bootstrap.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/Bootstrap.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/BoundDynamicMethod.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/BoundDynamicMethod.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/linker/BoundDynamicMethod.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/BoundDynamicMethod.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/BoundDynamicMethodLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/BoundDynamicMethodLinker.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/linker/BoundDynamicMethodLinker.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/BoundDynamicMethodLinker.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/ClassAndLoader.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/ClassAndLoader.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/linker/ClassAndLoader.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/ClassAndLoader.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/InvokeByName.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/InvokeByName.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/linker/InvokeByName.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/InvokeByName.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterClassLoader.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterClassLoader.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterClassLoader.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterClassLoader.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterServices.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterServices.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterServices.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterServices.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaSuperAdapter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaSuperAdapter.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/linker/JavaSuperAdapter.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaSuperAdapter.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaSuperAdapterLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaSuperAdapterLinker.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/linker/JavaSuperAdapterLinker.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaSuperAdapterLinker.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBeansLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornBeansLinker.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBeansLinker.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornBeansLinker.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuards.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornGuards.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuards.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornGuards.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornLinker.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornLinker.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/ReflectionCheckLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/ReflectionCheckLinker.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/linker/ReflectionCheckLinker.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/ReflectionCheckLinker.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/logging/DebugLogger.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/logging/DebugLogger.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/logging/DebugLogger.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/logging/DebugLogger.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/logging/Loggable.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/logging/Loggable.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/logging/Loggable.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/logging/Loggable.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/logging/Logger.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/logging/Logger.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/logging/Logger.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/logging/Logger.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/options/KeyValueOption.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/KeyValueOption.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/options/KeyValueOption.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/KeyValueOption.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/options/LoggingOption.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/LoggingOption.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/options/LoggingOption.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/LoggingOption.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/options/Option.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/Option.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/options/Option.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/Option.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/options/OptionTemplate.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/OptionTemplate.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/options/OptionTemplate.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/OptionTemplate.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/options/Options.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/Options.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/options/Options.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/Options.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/JdkRegExp.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/JdkRegExp.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/JdkRegExp.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/JdkRegExp.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExp.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExp.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExp.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExp.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpFactory.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpFactory.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpFactory.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpFactory.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpMatcher.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpMatcher.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpMatcher.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpMatcher.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpResult.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpResult.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpResult.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpResult.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Analyser.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Analyser.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Analyser.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Analyser.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFold.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFold.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFold.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFold.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFoldArg.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFoldArg.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFoldArg.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFoldArg.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ArrayCompiler.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ArrayCompiler.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ArrayCompiler.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ArrayCompiler.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/BitSet.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/BitSet.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/BitSet.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/BitSet.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/BitStatus.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/BitStatus.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/BitStatus.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/BitStatus.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ByteCodePrinter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ByteCodePrinter.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ByteCodePrinter.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ByteCodePrinter.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/CodeRangeBuffer.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/CodeRangeBuffer.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/CodeRangeBuffer.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/CodeRangeBuffer.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Compiler.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Compiler.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Compiler.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Compiler.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Config.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Config.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Config.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Config.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/EncodingHelper.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/EncodingHelper.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/EncodingHelper.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/EncodingHelper.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Lexer.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Lexer.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Lexer.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Lexer.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Matcher.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Matcher.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Matcher.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Matcher.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/MatcherFactory.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/MatcherFactory.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/MatcherFactory.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/MatcherFactory.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/MinMaxLen.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/MinMaxLen.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/MinMaxLen.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/MinMaxLen.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/NodeOptInfo.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/NodeOptInfo.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/NodeOptInfo.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/NodeOptInfo.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptAnchorInfo.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptAnchorInfo.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptAnchorInfo.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptAnchorInfo.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptEnvironment.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptEnvironment.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptEnvironment.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptEnvironment.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptExactInfo.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptExactInfo.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptExactInfo.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptExactInfo.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptMapInfo.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptMapInfo.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptMapInfo.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptMapInfo.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Option.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Option.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Option.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Option.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Parser.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Parser.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Parser.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Parser.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Regex.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Regex.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Regex.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Regex.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Region.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Region.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Region.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Region.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ScanEnvironment.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ScanEnvironment.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ScanEnvironment.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ScanEnvironment.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ScannerSupport.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ScannerSupport.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ScannerSupport.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ScannerSupport.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/SearchAlgorithm.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/SearchAlgorithm.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/SearchAlgorithm.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/SearchAlgorithm.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/StackEntry.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/StackEntry.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/StackEntry.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/StackEntry.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/StackMachine.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/StackMachine.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/StackMachine.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/StackMachine.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Syntax.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Syntax.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Syntax.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Syntax.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Token.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Token.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Token.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Token.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/WarnCallback.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/WarnCallback.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/WarnCallback.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/WarnCallback.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Warnings.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Warnings.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Warnings.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Warnings.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/AnchorNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/AnchorNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/AnchorNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/AnchorNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/AnyCharNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/AnyCharNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/AnyCharNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/AnyCharNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/BackRefNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/BackRefNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/BackRefNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/BackRefNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/CClassNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/CClassNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/CClassNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/CClassNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/ConsAltNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/ConsAltNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/ConsAltNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/ConsAltNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/EncloseNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/EncloseNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/EncloseNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/EncloseNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/Node.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/Node.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/Node.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/Node.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/QuantifierNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/QuantifierNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/QuantifierNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/QuantifierNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/StateNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/StateNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/StateNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/StateNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/StringNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/StringNode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/StringNode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/StringNode.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/AnchorType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/AnchorType.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/AnchorType.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/AnchorType.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/Arguments.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/Arguments.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/Arguments.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/Arguments.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/AsmConstants.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/AsmConstants.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/AsmConstants.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/AsmConstants.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/CCSTATE.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/CCSTATE.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/CCSTATE.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/CCSTATE.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/CCVALTYPE.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/CCVALTYPE.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/CCVALTYPE.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/CCVALTYPE.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/EncloseType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/EncloseType.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/EncloseType.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/EncloseType.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/MetaChar.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/MetaChar.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/MetaChar.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/MetaChar.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeStatus.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeStatus.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeStatus.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeStatus.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeType.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeType.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeType.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/OPCode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/OPCode.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/OPCode.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/OPCode.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/OPSize.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/OPSize.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/OPSize.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/OPSize.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/RegexState.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/RegexState.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/RegexState.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/RegexState.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/StackPopLevel.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/StackPopLevel.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/StackPopLevel.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/StackPopLevel.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/StackType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/StackType.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/StackType.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/StackType.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/StringType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/StringType.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/StringType.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/StringType.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/SyntaxProperties.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/SyntaxProperties.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/SyntaxProperties.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/SyntaxProperties.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/TargetInfo.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/TargetInfo.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/TargetInfo.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/TargetInfo.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/TokenType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/TokenType.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/TokenType.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/TokenType.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/Traverse.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/Traverse.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/Traverse.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/Traverse.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/CharacterType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/encoding/CharacterType.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/CharacterType.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/encoding/CharacterType.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/IntHolder.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/encoding/IntHolder.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/IntHolder.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/encoding/IntHolder.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/ObjPtr.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/encoding/ObjPtr.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/ObjPtr.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/encoding/ObjPtr.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/InternalException.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/InternalException.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/InternalException.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/InternalException.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/JOniException.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/JOniException.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/JOniException.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/JOniException.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/SyntaxException.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/SyntaxException.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/SyntaxException.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/SyntaxException.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/ValueException.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/ValueException.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/ValueException.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/ValueException.java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/Messages.properties b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Messages.properties
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/resources/Messages.properties
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Messages.properties
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/Options.properties b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Options.properties
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/resources/Options.properties
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Options.properties
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/fx/base.js b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/base.js
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/resources/fx/base.js
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/base.js
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/fx/bootstrap.js b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/bootstrap.js
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/resources/fx/bootstrap.js
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/bootstrap.js
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/fx/controls.js b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/controls.js
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/resources/fx/controls.js
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/controls.js
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/fx/fxml.js b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/fxml.js
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/resources/fx/fxml.js
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/fxml.js
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/fx/graphics.js b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/graphics.js
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/resources/fx/graphics.js
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/graphics.js
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/fx/media.js b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/media.js
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/resources/fx/media.js
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/media.js
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/fx/swing.js b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/swing.js
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/resources/fx/swing.js
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/swing.js
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/fx/swt.js b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/swt.js
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/resources/fx/swt.js
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/swt.js
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/fx/web.js b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/web.js
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/resources/fx/web.js
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/web.js
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/mozilla_compat.js
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/mozilla_compat.js
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/parser.js b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/parser.js
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/resources/parser.js
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/parser.js
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/version.properties-template b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/version.properties-template
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/runtime/resources/version.properties-template
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/version.properties-template
diff --git a/nashorn/src/jdk/nashorn/internal/scripts/JO.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/JO.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/scripts/JO.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/JO.java
diff --git a/nashorn/src/jdk/nashorn/internal/scripts/JS.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/JS.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/internal/scripts/JS.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/JS.java
diff --git a/nashorn/src/jdk/nashorn/tools/Shell.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/Shell.java
similarity index 100%
rename from nashorn/src/jdk/nashorn/tools/Shell.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/Shell.java
diff --git a/nashorn/src/jdk/nashorn/tools/resources/Shell.properties b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/resources/Shell.properties
similarity index 100%
rename from nashorn/src/jdk/nashorn/tools/resources/Shell.properties
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/resources/Shell.properties
diff --git a/nashorn/src/jdk/nashorn/tools/resources/shell.js b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/resources/shell.js
similarity index 100%
rename from nashorn/src/jdk/nashorn/tools/resources/shell.js
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/resources/shell.js
diff --git a/nashorn/src/overview.html b/nashorn/src/jdk.scripting.nashorn/share/classes/overview.html
similarity index 100%
rename from nashorn/src/overview.html
rename to nashorn/src/jdk.scripting.nashorn/share/classes/overview.html
diff --git a/test/make/TestJavaCompilation.gmk b/test/make/TestJavaCompilation.gmk
new file mode 100644
index 00000000000..c82d2058be2
--- /dev/null
+++ b/test/make/TestJavaCompilation.gmk
@@ -0,0 +1,218 @@
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+include JavaCompilation.gmk
+
+THIS_FILE := $(SRC_ROOT)/test/make/TestJavaCompilation.gmk
+DEPS := $(THIS_FILE) \
+    $(SRC_ROOT)/make/common/MakeBase.gmk \
+    $(SRC_ROOT)/make/common/JavaCompilation.gmk \
+    #
+
+OUTPUT_DIR := $(TESTMAKE_OUTPUTDIR)/java-compilation
+
+################################################################################
+# Test: jar1
+# Creates a simple jar file and unzips it to verify that the files have not
+# changed.
+
+JAR1_SRC_ROOT := $(OUTPUT_DIR)/jar1src
+JAR1_UNZIP := $(OUTPUT_DIR)/jar1unzip
+JAR1_FILE := $(OUTPUT_DIR)/jar1.jar
+JAR1_MANIFEST := $(OUTPUT_DIR)/jar1_manifest
+
+clean-jar1:
+	$(RM) -r $(OUTPUT_DIR)/_jar1* $(OUTPUT_DIR)/jar1*
+
+$(OUTPUT_DIR)/_jar1_created: $(DEPS)
+	$(RM) -r $(JAR1_SRC_ROOT)
+	$(RM) $(JAR1_FILE)
+	$(RM) -r $(JAR1_UNZIP)
+	$(MKDIR) -p $(JAR1_SRC_ROOT)
+	$(MKDIR) -p $(JAR1_SRC_ROOT)/dir1
+	$(MKDIR) -p $(JAR1_SRC_ROOT)/dir2
+	$(MKDIR) -p $(JAR1_SRC_ROOT)/META-INF
+	$(TOUCH) $(JAR1_SRC_ROOT)/dir1/file1.class
+	$(TOUCH) $(JAR1_SRC_ROOT)/dir2/file2.class
+	$(TOUCH) $(JAR1_SRC_ROOT)/META-INF/metafile
+	$(ECHO) "Test-Attribute: value" > $(JAR1_MANIFEST)
+	$(TOUCH) $@
+
+$(eval $(call SetupArchive,BUILD_JAR1, \
+    $(OUTPUT_DIR)/_jar1_created, \
+    SRCS := $(JAR1_SRC_ROOT), \
+    MANIFEST := $(JAR1_MANIFEST), \
+    JAR := $(JAR1_FILE)))
+
+$(OUTPUT_DIR)/_jar1_verified: $(BUILD_JAR1)
+	$(RM) -r $(JAR1_UNZIP)
+	$(MKDIR) -p $(JAR1_UNZIP)
+	$(CD) $(JAR1_UNZIP) && $(UNZIP) $(JAR1_FILE) $(LOG_DEBUG)
+	$(DIFF) -r $(JAR1_SRC_ROOT)/dir1 $(JAR1_UNZIP)/dir1
+	$(DIFF) -r $(JAR1_SRC_ROOT)/dir2 $(JAR1_UNZIP)/dir2
+	$(DIFF) -r $(JAR1_SRC_ROOT)/META-INF/metafile $(JAR1_UNZIP)/META-INF/metafile
+	if [ "`$(GREP) 'Test-Attribute: value' $(JAR1_MANIFEST)`" = "" ]; then \
+	  $(ECHO) "Could not find Test-Attribute in manifest of $(JAR1_FILE)"; \
+	  exit 1; \
+	fi
+	$(TOUCH) $@
+
+create-jar2: $(OUTPUT_DIR)/_jar1_verified
+TEST_TARGETS += $(OUTPUT_DIR)/_jar1_verified
+
+# Change a source file and call this makefile again to force the jar to be 
+# updated. 
+$(OUTPUT_DIR)_jar1_updated: $(OUTPUT_DIR)/_jar1_verified
+	$(ECHO) updated > $(JAR1_SRC_ROOT)/dir1/file1.class
+	$(ECHO) updated > $(JAR1_SRC_ROOT)/META-INF/metafile
+	$(TOUCH) $(OUTPUT_DIR)/_jar1_created
+	+$(MAKE) -f $(THIS_FILE) $(OUTPUT_DIR)/_jar1_verified
+	$(TOUCH) $@
+
+update-jar1: $(OUTPUT_DIR)_jar1_updated
+TEST_TARGETS += $(OUTPUT_DIR)_jar1_updated
+
+.PHONY: clean-jar1 create-jar1 update-jar1
+
+################################################################################
+# Test: jar2
+# Creates a jar file based on 2 source roots
+
+JAR2_SRC_ROOT1 := $(OUTPUT_DIR)/jar2src1
+JAR2_SRC_ROOT2 := $(OUTPUT_DIR)/jar2src2
+JAR2_UNZIP := $(OUTPUT_DIR)/jar2unzip
+JAR2_FILE := $(OUTPUT_DIR)/jar2.jar
+
+clean-jar2:
+	$(RM) -r $(OUTPUT_DIR)/_jar2* $(OUTPUT_DIR)/jar2*
+
+$(OUTPUT_DIR)/_jar2_created: $(DEPS)
+	$(RM) -r $(JAR2_SRC_ROOT1)
+	$(RM) -r $(JAR2_SRC_ROOT2)
+	$(RM) $(JAR2_FILE)
+	$(RM) -r $(JAR2_UNZIP)
+	$(MKDIR) -p $(JAR2_SRC_ROOT1)/dir1
+	$(MKDIR) -p $(JAR2_SRC_ROOT2)/dir2
+	$(TOUCH) $(JAR2_SRC_ROOT1)/dir1/file1.class
+	$(TOUCH) $(JAR2_SRC_ROOT2)/dir2/file2.class
+	$(TOUCH) $@
+
+$(eval $(call SetupArchive,BUILD_JAR2, \
+    $(OUTPUT_DIR)/_jar2_created, \
+    SRCS := $(JAR2_SRC_ROOT1) $(JAR2_SRC_ROOT2), \
+    JAR := $(JAR2_FILE)))
+
+$(OUTPUT_DIR)/_jar2_verified: $(BUILD_JAR2)
+	$(RM) -r $(JAR2_UNZIP)
+	$(MKDIR) -p $(JAR2_UNZIP)
+	$(CD) $(JAR2_UNZIP) && $(UNZIP) $(JAR2_FILE) $(LOG_DEBUG)
+	$(DIFF) -r $(JAR2_SRC_ROOT1)/dir1 $(JAR2_UNZIP)/dir1
+	$(DIFF) -r $(JAR2_SRC_ROOT2)/dir2 $(JAR2_UNZIP)/dir2
+	$(TOUCH) $@
+
+create-jar2: $(OUTPUT_DIR)/_jar2_verified
+TEST_TARGETS += $(OUTPUT_DIR)/_jar2_verified
+
+$(OUTPUT_DIR)_jar2_updated: $(OUTPUT_DIR)/_jar2_verified
+	$(ECHO) updated > $(JAR2_SRC_ROOT1)/dir1/file1.class
+	$(TOUCH) $(OUTPUT_DIR)/_jar2_created
+	+$(MAKE) -f $(THIS_FILE) $(OUTPUT_DIR)/_jar2_verified
+	$(TOUCH) $@
+
+update-jar2: $(OUTPUT_DIR)_jar2_updated
+TEST_TARGETS += $(OUTPUT_DIR)_jar2_updated
+
+.PHONY: clean-jar2 create-jar2 update-jar2
+
+################################################################################
+# Test: jar3
+# Creates a jar file based on 2 source roots with an extra file
+
+JAR3_SRC_ROOT1 := $(OUTPUT_DIR)/jar3src1
+JAR3_SRC_ROOT2 := $(OUTPUT_DIR)/jar3src2
+JAR3_UNZIP := $(OUTPUT_DIR)/jar3unzip
+JAR3_FILE := $(OUTPUT_DIR)/jar3.jar
+
+clean-jar3:
+	$(RM) -r $(OUTPUT_DIR)/_jar3* $(OUTPUT_DIR)/jar3*
+
+$(OUTPUT_DIR)/_jar3_created: $(DEPS)
+	$(RM) -r $(JAR3_SRC_ROOT1)
+	$(RM) -r $(JAR3_SRC_ROOT2)
+	$(RM) $(JAR3_FILE)
+	$(RM) -r $(JAR3_UNZIP)
+	$(MKDIR) -p $(JAR3_SRC_ROOT1)/dir1
+	$(MKDIR) -p $(JAR3_SRC_ROOT2)/dir2
+	$(TOUCH) $(JAR3_SRC_ROOT1)/dir1/file1\$$foo.class
+	$(TOUCH) $(JAR3_SRC_ROOT2)/dir2/file2.class
+	$(TOUCH) $(JAR3_SRC_ROOT2)/extra-file
+	$(TOUCH) $(JAR3_SRC_ROOT2)/extra-file-abs
+	$(TOUCH) $(JAR3_SRC_ROOT2)/dir2/file\$$foo.dollar
+	$(TOUCH) $@
+
+$(eval $(call SetupArchive,BUILD_JAR3, \
+    $(OUTPUT_DIR)/_jar3_created, \
+    SRCS := $(JAR3_SRC_ROOT1) $(JAR3_SRC_ROOT2), \
+    EXTRA_FILES := extra-file \
+        dir2/file$$$$foo.dollar \
+        $(JAR3_SRC_ROOT2)/extra-file-abs, \
+    EXCLUDE_FILES := dir1/file1$$$$foo.class, \
+    JAR := $(JAR3_FILE)))
+
+$(OUTPUT_DIR)/_jar3_verified: $(BUILD_JAR3)
+	$(RM) -r $(JAR3_UNZIP)
+	$(MKDIR) -p $(JAR3_UNZIP)
+	$(CD) $(JAR3_UNZIP) && $(UNZIP) $(JAR3_FILE) $(LOG_DEBUG)
+	if [ -d "$(JAR3_UNZIP)/dir1" ]; then \
+	  echo Should not be included $(JAR3_UNZIP)/dir1; \
+	  exit 1; \
+        fi
+	$(DIFF) -r $(JAR3_SRC_ROOT2)/dir2 $(JAR3_UNZIP)/dir2
+	$(DIFF) -r $(JAR3_SRC_ROOT2)/extra-file $(JAR3_UNZIP)/extra-file
+	$(TOUCH) $@
+
+create-jar3: $(OUTPUT_DIR)/_jar3_verified
+TEST_TARGETS += $(OUTPUT_DIR)/_jar3_verified
+
+$(OUTPUT_DIR)_jar3_updated: $(OUTPUT_DIR)/_jar3_verified
+	$(ECHO) updated > $(JAR3_SRC_ROOT2)/extra-file
+	$(TOUCH) $(OUTPUT_DIR)/_jar3_created
+	+$(MAKE) -f $(THIS_FILE) $(OUTPUT_DIR)/_jar3_verified
+	$(TOUCH) $@
+
+update-jar3: $(OUTPUT_DIR)_jar3_updated
+TEST_TARGETS += $(OUTPUT_DIR)_jar3_updated
+
+.PHONY: clean-jar3 create-jar3 update-jar3
+
+################################################################################
+
+all: $(TEST_TARGETS)
+
+.PHONY: default all
diff --git a/test/make/TestMake.gmk b/test/make/TestMake.gmk
new file mode 100644
index 00000000000..1f33e1786a7
--- /dev/null
+++ b/test/make/TestMake.gmk
@@ -0,0 +1,39 @@
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+default: all
+
+include $(SPEC)
+
+make-base:
+	+$(MAKE) -f TestMakeBase.gmk $(TEST_SUBTARGET)
+
+java-compilation:
+	+$(MAKE) -f TestJavaCompilation.gmk $(TEST_SUBTARGET)
+
+
+all: make-base java-compilation
+
+.PHONY: default all make-base java-compilation
diff --git a/test/make/TestMakeBase.gmk b/test/make/TestMakeBase.gmk
new file mode 100644
index 00000000000..809115c3815
--- /dev/null
+++ b/test/make/TestMakeBase.gmk
@@ -0,0 +1,60 @@
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+
+THIS_FILE := $(SRC_ROOT)/test/make/TestMakeBase.gmk
+DEPS := $(THIS_FILE) \
+    $(SRC_ROOT)/make/common/MakeBase.gmk \
+    #
+
+OUTPUT_DIR := $(TESTMAKE_OUTPUTDIR)/make-base
+
+################################################################################
+# Escape $
+ifneq ($(call EscapeDollar, foo$$bar), foo\$$bar)
+  $(error EscapeDollar failed $(call EscapeDollar, foo$$bar) foo\$$bar)
+endif
+
+ESCAPE_DOLLAR_DIR := $(OUTPUT_DIR)/escape-dollar
+
+$(ESCAPE_DOLLAR_DIR)/_escape_dollar: $(DEPS)
+	$(RM) -r $(@D)
+	$(MKDIR) -p $(@D)
+	$(ECHO) foo\$$bar > $(@D)/file1
+	$(ECHO) $(call EscapeDollar, foo$$bar) > $(@D)/file2
+	$(ECHO) $(call EscapeDollar, foo\$$bar) > $(@D)/file3
+	$(DIFF) $(@D)/file1 $(@D)/file2
+	$(DIFF) $(@D)/file1 $(@D)/file3
+	$(TOUCH) $@
+
+TEST_TARGETS += $(ESCAPE_DOLLAR_DIR)/_escape_dollar
+
+################################################################################
+
+all: $(TEST_TARGETS)